Clean up makefiles

filter/source/xsltfilter/makefile.mk

@@ -26,7 +26,6 @@
 #*************************************************************************
 PRJ	= ..$/..
 PRJNAME = filter
-#PACKAGE = com$/sun$/star$/documentconversion$/XSLTFilter
 TARGET  =XSLTFilter
 ENABLE_EXCEPTIONS=TRUE
 LIBTARGET=NO
@@ -54,8 +53,6 @@ SHL1STDLIBS= \
 
 .IF "$(SOLAR_JAVA)"!=""
 
-#USE_UDK_EXTENDED_MANIFESTFILE=TRUE
-#USE_EXTENDED_MANIFESTFILE=TRUE
 JARFILES 		= ridl.jar unoil.jar jurt.jar juh.jar
 
 JAVAFILES		= $(subst,$(CLASSDIR)$/, $(subst,.class,.java $(JAVACLASSFILES)))

filter/source/xsltvalidate/makefile.mk

@@ -24,18 +24,18 @@
 # for a copy of the LGPLv3 License.
 #
 #*************************************************************************  
+
 PRJ	= ..$/.. 
 PRJNAME = filter 
-#PACKAGE = com$/sun$/star$/documentconversion$/XSLTValidate
 TARGET  =XSLTValidate 
+
 # --- Settings ----------------------------------------------------- 
+
 .IF "$(XML_CLASSPATH)" != ""
 XCLASSPATH+=":$(XML_CLASSPATH)"
 .ENDIF
 .INCLUDE: settings.mk  
 CLASSDIR!:=$(CLASSDIR)$/$(TARGET)
-#USE_UDK_EXTENDED_MANIFESTFILE=TRUE
-#USE_EXTENDED_MANIFESTFILE=TRUE
 JARFILES 		= ridl.jar unoil.jar jurt.jar juh.jar crimson.jar
 
 .IF "$(SYSTEM_XALAN)" == "YES"
@@ -52,18 +52,17 @@ JARFILES += xml-apis.jar
 
 JAVAFILES		= $(subst,$(CLASSDIR)$/, $(subst,.class,.java $(JAVACLASSFILES))) 
 CUSTOMMANIFESTFILE = Manifest  
-#JARMANIFEST = Manifest
 JARCOMPRESS		= TRUE  
 JARCLASSDIRS	= XSLTValidate*.class
 JARTARGET		= $(TARGET).jar
 
 
 # --- Files --------------------------------------------------------  
+
 JAVACLASSFILES=$(CLASSDIR)$/XSLTValidate.class  
-#---Manifest -------------------------------------------------------
-#$(OUT)$/class$/$(TARGET)$/META-INF: META-INF
-#        + $(COPY) $(COPYRECURSE) META-INF $(OUT)$/class$/META-INF
+
 # --- Targets ------------------------------------------------------  
+
 .IF "$(SOLAR_JAVA)"!=""
 .INCLUDE :  target.mk 
 $(JAVACLASSFILES) : $(CLASSDIR)

writerfilter/source/doctok/makefile.mk

@@ -28,20 +28,13 @@
 PRJ=..$/..
 PRJNAME=writerfilter
 TARGET=doctok
-#LIBTARGET=NO
 ENABLE_EXCEPTIONS=TRUE
-#USE_DEFFILE=TRUE
-#EXTERNAL_WARNINGS_NOT_ERRORS=TRUE
+
 # --- Settings -----------------------------------------------------
 
 .INCLUDE :  settings.mk
 .INCLUDE :  $(PRJ)$/inc$/writerfilter.mk
 
-#CFLAGS+=-DISOLATION_AWARE_ENABLED -DWIN32_LEAN_AND_MEAN -DXML_UNICODE -D_NTSDK -DUNICODE -D_UNICODE -D_WIN32_WINNT=0x0501
-#CFLAGS+=-wd4710 -wd4711 -wd4514 -wd4619 -wd4217 -wd4820
-#CDEFS+=-DDEBUG_DOCTOK_DUMP
-
-
 # --- Files --------------------------------------------------------
 
 SLOFILES= \

writerfilter/source/ooxml/makefile.mk

@@ -28,8 +28,6 @@
 PRJ=..$/..
 PRJNAME=writerfilter
 TARGET=ooxml
-#LIBTARGET=NO
-#USE_DEFFILE=TRUE
 ENABLE_EXCEPTIONS=TRUE
 
 # --- Settings -----------------------------------------------------
@@ -37,9 +35,6 @@ ENABLE_EXCEPTIONS=TRUE
 .INCLUDE :  settings.mk
 .INCLUDE :  $(PRJ)$/inc$/writerfilter.mk
 
-#CFLAGS+=-DISOLATION_AWARE_ENABLED -DWIN32_LEAN_AND_MEAN -DXML_UNICODE -D_NTSDK -DUNICODE -D_UNICODE -D_WIN32_WINNT=0x0501
-#CFLAGS+=-wd4710 -wd4711 -wd4514 -wd4619 -wd4217 -wd4820
-
 NAMESPACES= \
     wml \
     dml-stylesheet \

writerfilter/source/resourcemodel/makefile.mk

@@ -28,8 +28,6 @@
 PRJ=..$/..
 PRJNAME=writerfilter
 TARGET=resourcemodel
-#LIBTARGET=NO
-#USE_DEFFILE=TRUE
 ENABLE_EXCEPTIONS=TRUE
 
 # --- Settings -----------------------------------------------------
@@ -37,11 +35,8 @@ ENABLE_EXCEPTIONS=TRUE
 .INCLUDE :  settings.mk
 .INCLUDE :  $(PRJ)$/inc$/writerfilter.mk
 
-#CFLAGS+=-DISOLATION_AWARE_ENABLED -DWIN32_LEAN_AND_MEAN -DXML_UNICODE -D_NTSDK -DUNICODE -D_UNICODE -D_WIN32_WINNT=0x0501
-#CFLAGS+=-wd4710 -wd4711 -wd4514 -wd4619 -wd4217 -wd4820
 CDEFS+=-DWRITERFILTER_DLLIMPLEMENTATION
 
-
 # --- Files --------------------------------------------------------
 
 # work around gcc taking hours and/or OOM'ing on this file

writerfilter/source/rtftok/makefile.mk

@@ -28,9 +28,7 @@
 PRJ=..$/..
 PRJNAME=writerfilter
 TARGET=rtftok
-#LIBTARGET=NO
 ENABLE_EXCEPTIONS=TRUE
-#USE_DEFFILE=TRUE
 EXTERNAL_WARNINGS_NOT_ERRORS=TRUE
 
 # --- Settings -----------------------------------------------------
@@ -38,10 +36,6 @@ EXTERNAL_WARNINGS_NOT_ERRORS=TRUE
 .INCLUDE :  settings.mk
 .INCLUDE :  $(PRJ)$/inc$/writerfilter.mk
 
-#CFLAGS+=-DISOLATION_AWARE_ENABLED -DWIN32_LEAN_AND_MEAN -DXML_UNICODE -D_NTSDK -DUNICODE -D_UNICODE -D_WIN32_WINNT=0x0501 
-#CFLAGS+=-wd4710 -wd4711 -wd4514 -wd4619 -wd4217 -wd4820
-
-
 # --- Files --------------------------------------------------------
 
 SLOFILES=$(SLO)$/RTFScanner.obj $(SLO)$/RTFParseException.obj