[Libreoffice-commits] .: starmath/source sw/inc sw/qa sw/sdi sw/source

[Thomas Arnhold]

 starmath/source/makefile.mk             |    2 --
 sw/inc/sw.mk                            |    3 ---
 sw/qa/complex/accessibility/makefile.mk |    2 +-
 sw/sdi/makefile.mk                      |    1 -
 sw/source/core/access/makefile.mk       |    3 ---
 sw/source/core/swg/makefile.mk          |    2 --
 sw/source/core/unocore/makefile.mk      |    4 +---
 7 files changed, 2 insertions(+), 15 deletions(-)

New commits:
commit 26b81076e14878e6d9a6835a9f992f31f13a2890
Author: Thomas Arnhold <thomas at arnhold.org>
Date:   Tue Feb 1 18:25:06 2011 +0100

    Clean up makefiles

diff --git a/starmath/source/makefile.mk b/starmath/source/makefile.mk
index b211903..b916917 100644
--- a/starmath/source/makefile.mk
+++ b/starmath/source/makefile.mk
@@ -25,8 +25,6 @@
 #
 #*************************************************************************
 
-#MKDEPENDSOLVER=YES
-
 PRJ=..
 
 PRJNAME=starmath
diff --git a/sw/inc/sw.mk b/sw/inc/sw.mk
index 237e4c9..c7ba123 100644
--- a/sw/inc/sw.mk
+++ b/sw/inc/sw.mk
@@ -25,11 +25,8 @@
 #
 #*************************************************************************
 
-# CDEFS=$(CDEFS) -DXXX
-
 # Bereiche aktivieren
 
-#CDEFS+=-DXML_CORE_API
 CDEFS+=-DACCESSIBLE_LAYOUT
 
 # define SW_DLLIMPLEMENTATION (see @ swdllapi.h)
diff --git a/sw/qa/complex/accessibility/makefile.mk b/sw/qa/complex/accessibility/makefile.mk
index e409682..937f023 100644
--- a/sw/qa/complex/accessibility/makefile.mk
+++ b/sw/qa/complex/accessibility/makefile.mk
@@ -31,8 +31,8 @@ PRJNAME = sw
 PACKAGE = complex$/accessibility
 
 # --- Settings -----------------------------------------------------
-.INCLUDE: settings.mk
 
+.INCLUDE: settings.mk
 
 #----- compile .java files -----------------------------------------
 
diff --git a/sw/sdi/makefile.mk b/sw/sdi/makefile.mk
index 0cf3813..cf87ea1 100644
--- a/sw/sdi/makefile.mk
+++ b/sw/sdi/makefile.mk
@@ -45,7 +45,6 @@ SVSDIINC=$(PRJ)$/source$/ui$/inc
 .IF "$(L10N_framework)"==""
 SDI1NAME=$(TARGET)
 SDI1EXPORT=swriter
-#SIDHRCNAME=swslots.hrc
 
 # --- Files --------------------------------------------------------
 SVSDI1DEPEND= \
diff --git a/sw/source/core/access/makefile.mk b/sw/source/core/access/makefile.mk
index 7287131..3a3802d 100644
--- a/sw/source/core/access/makefile.mk
+++ b/sw/source/core/access/makefile.mk
@@ -31,7 +31,6 @@ PRJNAME=sw
 TARGET=access
 
 # --- Settings -----------------------------------------------------
-#ENABLE_EXCEPTIONS=TRUE
 
 .INCLUDE :	$(PRJ)$/inc$/swpre.mk
 .INCLUDE :	settings.mk
@@ -95,6 +94,4 @@ EXCEPTIONSFILES=	\
 
 # --- Targets -------------------------------------------------------
 
-
 .INCLUDE :	target.mk
-
diff --git a/sw/source/core/swg/makefile.mk b/sw/source/core/swg/makefile.mk
index 4c838b4..925eef3 100644
--- a/sw/source/core/swg/makefile.mk
+++ b/sw/source/core/swg/makefile.mk
@@ -30,8 +30,6 @@ PRJ=..$/..$/..
 PRJNAME=sw
 TARGET=swg
 
-#ENABLE_EXCEPTIONS=TRUE
-
 # --- Settings -----------------------------------------------------
 
 .INCLUDE :  $(PRJ)$/inc$/swpre.mk
diff --git a/sw/source/core/unocore/makefile.mk b/sw/source/core/unocore/makefile.mk
index 09e6371..305075f 100644
--- a/sw/source/core/unocore/makefile.mk
+++ b/sw/source/core/unocore/makefile.mk
@@ -31,13 +31,13 @@ PRJNAME=sw
 TARGET=unocore
 
 # --- Settings -----------------------------------------------------
-#ENABLE_EXCEPTIONS=TRUE
 
 .INCLUDE :	$(PRJ)$/inc$/swpre.mk
 .INCLUDE :	settings.mk
 .INCLUDE :	$(PRJ)$/inc$/sw.mk
 
 # --- Files --------------------------------------------------------
+
 EXCEPTIONSFILES=	\
     $(SLO)$/swunohelper.obj\
     $(SLO)$/SwXTextDefaults.obj\
@@ -119,6 +119,4 @@ SLOFILES =	\
 
 # --- Targets -------------------------------------------------------
 
-
 .INCLUDE :	target.mk
-