[Libreoffice-commits] .: binfilter/bf_basic binfilter/bf_forms binfilter/bf_goodies binfilter/bf_sc binfilter/bf_sch binfilter/bf_sd binfilter/bf_sfx2 binfilter/bf_starmath binfilter/bf_sw binfilter/filter filter/source writerfilter/source

Thomas Arnhold tarnhold at kemper.freedesktop.org
Wed Feb 2 03:10:31 PST 2011 

 binfilter/bf_basic/source/runtime/makefile.mk    |   22 ----------------------
 binfilter/bf_forms/source/component/makefile.mk  |    3 +--
 binfilter/bf_forms/source/misc/makefile.mk       |    4 +---
 binfilter/bf_forms/source/resource/makefile.mk   |    3 +--
 binfilter/bf_goodies/source/base2d/makefile.mk   |    2 --
 binfilter/bf_goodies/source/base3d/makefile.mk   |    2 --
 binfilter/bf_goodies/util/makefile.mk            |    3 ---
 binfilter/bf_sc/source/ui/src/makefile.mk        |    6 +-----
 binfilter/bf_sch/source/makefile.mk              |    3 +--
 binfilter/bf_sch/source/ui/docshell/makefile.mk  |    4 ++--
 binfilter/bf_sd/source/core/makefile.mk          |    2 --
 binfilter/bf_sd/source/filter/bin/makefile.mk    |    3 +--
 binfilter/bf_sd/source/filter/xml/makefile.mk    |    3 +--
 binfilter/bf_sd/source/ui/unoidl/makefile.mk     |    4 ++--
 binfilter/bf_sfx2/source/bastyp/makefile.mk      |    2 --
 binfilter/bf_starmath/util/makefile.mk           |    3 +--
 binfilter/bf_sw/source/core/except/makefile.mk   |    6 ++----
 binfilter/bf_sw/source/filter/basflt/makefile.mk |    4 ----
 binfilter/bf_sw/source/filter/excel/makefile.mk  |    4 ----
 binfilter/bf_sw/source/filter/lotus/makefile.mk  |    4 ----
 binfilter/bf_sw/source/filter/sw6/makefile.mk    |    4 ----
 binfilter/bf_sw/source/filter/w4w/makefile.mk    |    4 ----
 binfilter/bf_sw/source/filter/writer/makefile.mk |    4 ----
 binfilter/bf_sw/source/filter/xml/makefile.mk    |    4 ----
 binfilter/bf_sw/source/ui/app/makefile.mk        |    4 ----
 binfilter/bf_sw/source/ui/makefile.mk            |    5 -----
 binfilter/bf_sw/source/ui/uno/makefile.mk        |    6 ++----
 binfilter/bf_sw/source/ui/web/makefile.mk        |    5 +----
 binfilter/filter/source/bf_migrate/makefile.mk   |    3 ---
 filter/source/xsltfilter/makefile.mk             |    3 ---
 filter/source/xsltvalidate/makefile.mk           |   13 ++++++-------
 writerfilter/source/doctok/makefile.mk           |    9 +--------
 writerfilter/source/ooxml/makefile.mk            |    5 -----
 writerfilter/source/resourcemodel/makefile.mk    |    5 -----
 writerfilter/source/rtftok/makefile.mk           |    6 ------
 35 files changed, 24 insertions(+), 143 deletions(-)

New commits:
commit f89498f44c9f28e3eeb7e5be3b10d3d02e187f07
Author: Thomas Arnhold <thomas at arnhold.org>
Date:   Wed Feb 2 11:47:46 2011 +0100

    Clean up makefiles

diff --git a/binfilter/bf_basic/source/runtime/makefile.mk b/binfilter/bf_basic/source/runtime/makefile.mk
index f2553b1..42ac51d 100644
--- a/binfilter/bf_basic/source/runtime/makefile.mk
+++ b/binfilter/bf_basic/source/runtime/makefile.mk
@@ -42,8 +42,6 @@ INC+= -I$(PRJ)$/inc$/bf_basic
 
 SLOFILES=	\
     $(SLO)$/basrdll.obj	\
-
-#	$(SLO)$/inputbox.obj	\
     $(SLO)$/runtime.obj	\
     $(SLO)$/step0.obj	\
     $(SLO)$/step1.obj	\
@@ -57,26 +55,6 @@ SLOFILES=	\
     $(SLO)$/ddectrl.obj	\
     $(SLO)$/dllmgr.obj
 
-.IF "$(GUI)$(CPU)" == "WINI"
-#SLOFILES+=	$(SLO)$/win.obj
-.ENDIF
-
-.IF "$(GUI)$(CPU)" == "WNTI"
-#SLOFILES+=	$(SLO)$/wnt.obj
-.ENDIF
-
-.IF "$(GUI)$(CPU)" == "OS2I"
-#SLOFILES+= $(SLO)$/os2.obj
-.ENDIF
-
-#EXCEPTIONSFILES=$(SLO)$/step0.obj	\
-        $(SLO)$/step2.obj	\
-        $(SLO)$/methods.obj	\
-        $(SLO)$/methods1.obj	\
-        $(SLO)$/iosys.obj	\
-        $(SLO)$/runtime.obj
-
 # --- Targets -------------------------------------------------------------
 
 .INCLUDE :  target.mk
-
diff --git a/binfilter/bf_forms/source/component/makefile.mk b/binfilter/bf_forms/source/component/makefile.mk
index 31c6524..11bf26c 100644
--- a/binfilter/bf_forms/source/component/makefile.mk
+++ b/binfilter/bf_forms/source/component/makefile.mk
@@ -31,8 +31,6 @@ BFPRJ=..$/..
 PRJNAME=binfilter
 TARGET=forms_component
 
-#GEN_HID=TRUE
-#GEN_HID_OTHER=TRUE
 NO_HIDS=TRUE
 
 ENABLE_EXCEPTIONS=TRUE
@@ -41,6 +39,7 @@ ENABLE_EXCEPTIONS=TRUE
 
 .INCLUDE : settings.mk
 INC+= -I$(PRJ)$/inc$/bf_forms
+
 # --- Types -------------------------------------
 
 INCPRE+=$(SOLARINCDIR)$/offuh
diff --git a/binfilter/bf_forms/source/misc/makefile.mk b/binfilter/bf_forms/source/misc/makefile.mk
index 8ca0a98..e91273c 100644
--- a/binfilter/bf_forms/source/misc/makefile.mk
+++ b/binfilter/bf_forms/source/misc/makefile.mk
@@ -31,17 +31,15 @@ BFPRJ=..$/..
 PRJNAME=binfilter
 TARGET=forms_common
 
-#GEN_HID=TRUE
-#GEN_HID_OTHER=TRUE
 NO_HIDS=TRUE
 
 ENABLE_EXCEPTIONS=TRUE
-#TARGETTYPE=GUI
 
 # --- Settings ----------------------------------
 
 .INCLUDE : settings.mk
 INC+= -I$(PRJ)$/inc$/bf_forms
+
 # --- Types -------------------------------------
 
 INCPRE+=$(SOLARINCDIR)$/offuh
diff --git a/binfilter/bf_forms/source/resource/makefile.mk b/binfilter/bf_forms/source/resource/makefile.mk
index 7bcf9bf..e68dcd9 100644
--- a/binfilter/bf_forms/source/resource/makefile.mk
+++ b/binfilter/bf_forms/source/resource/makefile.mk
@@ -31,14 +31,13 @@ BFPRJ=..$/..
 PRJNAME=binfilter
 TARGET=forms_resource
 
-#GEN_HID=TRUE
-#GEN_HID_OTHER=TRUE
 NO_HIDS=TRUE
 
 # --- Settings -----------------------------------------------------
 
 .INCLUDE :  settings.mk
 INC+= -I$(PRJ)$/inc$/bf_forms
+
 # --- Files --------------------------------------------------------
 
 SRS1NAME=forms_resource
diff --git a/binfilter/bf_goodies/source/base2d/makefile.mk b/binfilter/bf_goodies/source/base2d/makefile.mk
index 81141e0..4ac2aac 100644
--- a/binfilter/bf_goodies/source/base2d/makefile.mk
+++ b/binfilter/bf_goodies/source/base2d/makefile.mk
@@ -31,8 +31,6 @@ BFPRJ=..$/..
 PRJNAME=binfilter
 TARGET=goodies_base2d
 
-#GEN_HID=TRUE
-#GEN_HID_OTHER=TRUE
 NO_HIDS=TRUE
 
 AUTOSEG=true
diff --git a/binfilter/bf_goodies/source/base3d/makefile.mk b/binfilter/bf_goodies/source/base3d/makefile.mk
index fe23710..199e142 100644
--- a/binfilter/bf_goodies/source/base3d/makefile.mk
+++ b/binfilter/bf_goodies/source/base3d/makefile.mk
@@ -31,8 +31,6 @@ BFPRJ=..$/..
 PRJNAME=binfilter
 TARGET=goodies_base3d
 
-#GEN_HID=TRUE
-#GEN_HID_OTHER=TRUE
 NO_HIDS=TRUE
 
 AUTOSEG=true
diff --git a/binfilter/bf_goodies/util/makefile.mk b/binfilter/bf_goodies/util/makefile.mk
index b5dd164..0b87646 100644
--- a/binfilter/bf_goodies/util/makefile.mk
+++ b/binfilter/bf_goodies/util/makefile.mk
@@ -31,8 +31,6 @@ BFPRJ=..
 PRJNAME=binfilter
 TARGET=bf_go
 
-#GEN_HID=TRUE
-#GEN_HID_OTHER=TRUE
 NO_HIDS=TRUE
 
 LIBTARGET=NO
@@ -60,7 +58,6 @@ DEF1DEPN	=$(MISC)$/$(SHL1TARGET).flt \
 
 DEF1DES		=Bf_Goodies
 DEFLIB1NAME	=bf_go
-#DEF1EXPORTFILE	=bf_goodies.dxp
 
 SHL1STDLIBS= \
             $(SVTOOLLIB)		\
diff --git a/binfilter/bf_sc/source/ui/src/makefile.mk b/binfilter/bf_sc/source/ui/src/makefile.mk
index 6c2cb3e..3826791 100644
--- a/binfilter/bf_sc/source/ui/src/makefile.mk
+++ b/binfilter/bf_sc/source/ui/src/makefile.mk
@@ -31,18 +31,14 @@ BFPRJ=..$/..$/..
 PRJNAME=binfilter
 TARGET=sc_ui
 
-#GEN_HID=TRUE
-#GEN_HID_OTHER=TRUE
 NO_HIDS=TRUE
 
 # --- Settings -----------------------------------------------------
 
 .INCLUDE :  settings.mk
 INC+= -I$(PRJ)$/inc$/bf_sc
-#IMGLST_SRS=$(SRS)$/sc_ui.srs
-#BMP_IN=$(BFPRJ)$/res/imglst/apptbx
-# --- Update-Version -----------------------------------------------
 
+# --- Update-Version -----------------------------------------------
 RSCUPDVER=$(RSCREVISION)(SV$(UPD)$(UPDMINOR))
 
 # --- Files --------------------------------------------------------
diff --git a/binfilter/bf_sch/source/makefile.mk b/binfilter/bf_sch/source/makefile.mk
index 8043ebd..6a5a65b 100644
--- a/binfilter/bf_sch/source/makefile.mk
+++ b/binfilter/bf_sch/source/makefile.mk
@@ -34,13 +34,12 @@ PROJECTPCHSOURCE=$(BFPRJ)$/util\sch_sch
 PRJNAME=binfilter
 TARGET=sch
 
-#GEN_HID=TRUE
-#GEN_HID_OTHER=TRUE
 NO_HIDS=TRUE
 
 LIBTARGET=NO
 
 # --- Settings -----------------------------------------------------
+
 .INCLUDE :  settings.mk
 INC+= -I$(PRJ)$/inc$/bf_sch
 .IF "$(GUI)$(COM)" == "WINMSC"
diff --git a/binfilter/bf_sch/source/ui/docshell/makefile.mk b/binfilter/bf_sch/source/ui/docshell/makefile.mk
index 79b5ca1..f16c08b 100644
--- a/binfilter/bf_sch/source/ui/docshell/makefile.mk
+++ b/binfilter/bf_sch/source/ui/docshell/makefile.mk
@@ -34,15 +34,15 @@ PROJECTPCHSOURCE=$(BFPRJ)$/util$/sch_sch
 PRJNAME=binfilter
 TARGET=sch_docshell
 
-#GEN_HID=TRUE
-#GEN_HID_OTHER=TRUE
 NO_HIDS=TRUE
 
 ENABLE_EXCEPTIONS = TRUE
 
 # --- Settings -----------------------------------------------------
+
 .INCLUDE :  settings.mk
 INC+= -I$(PRJ)$/inc$/bf_sch
+
 # --- Files --------------------------------------------------------
 
 CXXFILES = $(BFPRJ)$/util$/sch_sch.cxx \
diff --git a/binfilter/bf_sd/source/core/makefile.mk b/binfilter/bf_sd/source/core/makefile.mk
index 61c844e..f8da98c 100644
--- a/binfilter/bf_sd/source/core/makefile.mk
+++ b/binfilter/bf_sd/source/core/makefile.mk
@@ -34,8 +34,6 @@ PROJECTPCHSOURCE=$(BFPRJ)$/util$/sd_sd
 PRJNAME=binfilter
 TARGET=sd_core
 
-#GEN_HID=TRUE
-#GEN_HID_OTHER=TRUE
 NO_HIDS=TRUE
 
 # --- Settings -----------------------------------------------------
diff --git a/binfilter/bf_sd/source/filter/bin/makefile.mk b/binfilter/bf_sd/source/filter/bin/makefile.mk
index 84068e9..b11ed06 100644
--- a/binfilter/bf_sd/source/filter/bin/makefile.mk
+++ b/binfilter/bf_sd/source/filter/bin/makefile.mk
@@ -31,8 +31,6 @@ BFPRJ=..$/..$/..
 PRJNAME=binfilter
 TARGET=sd_bin
 
-#GEN_HID=TRUE
-#GEN_HID_OTHER=TRUE
 NO_HIDS=TRUE
 
 # --- Settings -----------------------------------------------------
@@ -40,6 +38,7 @@ NO_HIDS=TRUE
 .INCLUDE : settings.mk
 .INCLUDE :  $(BFPRJ)$/util$/makefile.pmk
 INC+= -I$(PRJ)$/inc$/bf_sd
+
 # --- Files --------------------------------------------------------
 
 SLOFILES =\
diff --git a/binfilter/bf_sd/source/filter/xml/makefile.mk b/binfilter/bf_sd/source/filter/xml/makefile.mk
index cfc31a2..4073338 100644
--- a/binfilter/bf_sd/source/filter/xml/makefile.mk
+++ b/binfilter/bf_sd/source/filter/xml/makefile.mk
@@ -31,8 +31,6 @@ BFPRJ=..$/..$/..
 PRJNAME=binfilter
 TARGET=sd_xml
 
-#GEN_HID=TRUE
-#GEN_HID_OTHER=TRUE
 NO_HIDS=TRUE
 
 ENABLE_EXCEPTIONS=TRUE
@@ -42,6 +40,7 @@ ENABLE_EXCEPTIONS=TRUE
 .INCLUDE : settings.mk
 .INCLUDE :  $(BFPRJ)$/util$/makefile.pmk
 INC+= -I$(PRJ)$/inc$/bf_sd
+
 # --- Files --------------------------------------------------------
 
 SLOFILES =	\
diff --git a/binfilter/bf_sd/source/ui/unoidl/makefile.mk b/binfilter/bf_sd/source/ui/unoidl/makefile.mk
index 8360009..5135fd0 100644
--- a/binfilter/bf_sd/source/ui/unoidl/makefile.mk
+++ b/binfilter/bf_sd/source/ui/unoidl/makefile.mk
@@ -34,16 +34,16 @@ PROJECTPCHSOURCE=$(BFPRJ)$/util$/sd_sd
 PRJNAME=binfilter
 TARGET=sd_unoidl
 
-#GEN_HID=TRUE
-#GEN_HID_OTHER=TRUE
 NO_HIDS=TRUE
 
 ENABLE_EXCEPTIONS=TRUE
+
 # --- Settings -----------------------------------------------------
 
 .INCLUDE :  settings.mk
 .INCLUDE :  $(BFPRJ)$/util$/makefile.pmk
 INC+= -I$(PRJ)$/inc$/bf_sd
+
 # --- Files --------------------------------------------------------
 
 .IF "$(COM)"=="GCC"
diff --git a/binfilter/bf_sfx2/source/bastyp/makefile.mk b/binfilter/bf_sfx2/source/bastyp/makefile.mk
index 51843fa..774231d 100644
--- a/binfilter/bf_sfx2/source/bastyp/makefile.mk
+++ b/binfilter/bf_sfx2/source/bastyp/makefile.mk
@@ -31,8 +31,6 @@ BFPRJ=..$/..
 PRJNAME=binfilter
 TARGET=sfx2_bastyp
 
-#GEN_HID=TRUE
-#GEN_HID_OTHER=TRUE
 NO_HIDS=TRUE
 
 ENABLE_EXCEPTIONS=TRUE
diff --git a/binfilter/bf_starmath/util/makefile.mk b/binfilter/bf_starmath/util/makefile.mk
index 86fef7b..3b87cca 100644
--- a/binfilter/bf_starmath/util/makefile.mk
+++ b/binfilter/bf_starmath/util/makefile.mk
@@ -31,8 +31,6 @@ BFPRJ=..
 PRJNAME=binfilter
 TARGET=smath3
 
-#GEN_HID=TRUE
-#GEN_HID_OTHER=TRUE
 NO_HIDS=TRUE
 
 LIBTARGET=NO
@@ -41,6 +39,7 @@ LIBTARGET=NO
 
 .INCLUDE :  settings.mk
 INC+= -I$(PRJ)$/inc$/bf_starmath
+
 # --- Files --------------------------------------------------------
 
 RESLIB1NAME=bf_sm
diff --git a/binfilter/bf_sw/source/core/except/makefile.mk b/binfilter/bf_sw/source/core/except/makefile.mk
index f7ec01c..c74d280 100644
--- a/binfilter/bf_sw/source/core/except/makefile.mk
+++ b/binfilter/bf_sw/source/core/except/makefile.mk
@@ -33,13 +33,10 @@ BFPRJ=..$/..$/..
 PRJNAME=binfilter
 TARGET=sw_except
 
-#GEN_HID=TRUE
-#GEN_HID_OTHER=TRUE
 NO_HIDS=TRUE
 
 # --- Settings -----------------------------------------------------
 
-#.INCLUDE :  $(PRJ)$/inc$/swpre.mk
 .INCLUDE :  $(PRJ)$/inc$/bf_sw$/swpre.mk
 
 # hier kein PCH!
@@ -47,9 +44,9 @@ prjpch=
 PRJPCH=
 
 .INCLUDE :  settings.mk
-#.INCLUDE :  $(PRJ)$/inc$/sw.mk
 .INCLUDE :  $(PRJ)$/inc$/bf_sw$/sw.mk
 INC+= -I$(PRJ)$/inc$/bf_sw
+
 # --- Files --------------------------------------------------------
 
 CXXFILES =
@@ -61,6 +58,7 @@ CXXFILES += \
 SLOFILES +=  \
         $(SLO)$/sw_errhdl.obj
 .ENDIF
+
 # --- Tagets -------------------------------------------------------
 
 .INCLUDE :  target.mk
diff --git a/binfilter/bf_sw/source/filter/basflt/makefile.mk b/binfilter/bf_sw/source/filter/basflt/makefile.mk
index a32ee7e..b1a61f3 100644
--- a/binfilter/bf_sw/source/filter/basflt/makefile.mk
+++ b/binfilter/bf_sw/source/filter/basflt/makefile.mk
@@ -33,16 +33,12 @@ BFPRJ=..$/..$/..
 PRJNAME=binfilter
 TARGET=sw_basflt
 
-#GEN_HID=TRUE
-#GEN_HID_OTHER=TRUE
 NO_HIDS=TRUE
 
 # --- Settings -----------------------------------------------------
 
-#.INCLUDE :  $(PRJ)$/inc$/swpre.mk
 .INCLUDE :  $(PRJ)$/inc$/bf_sw$/swpre.mk
 .INCLUDE :  settings.mk
-#.INCLUDE :  $(PRJ)$/inc$/sw.mk
 .INCLUDE :  $(PRJ)$/inc$/bf_sw$/sw.mk
 INC+= -I$(PRJ)$/inc$/bf_sw
 
diff --git a/binfilter/bf_sw/source/filter/excel/makefile.mk b/binfilter/bf_sw/source/filter/excel/makefile.mk
index 8676c0c..54c61fa 100644
--- a/binfilter/bf_sw/source/filter/excel/makefile.mk
+++ b/binfilter/bf_sw/source/filter/excel/makefile.mk
@@ -35,16 +35,12 @@ BFPRJ=..$/..$/..
 PRJNAME=binfilter
 TARGET=sw_excel
 
-#GEN_HID=TRUE
-#GEN_HID_OTHER=TRUE
 NO_HIDS=TRUE
 
 # --- Settings -----------------------------------------------------
 
-#.INCLUDE :  $(PRJ)$/inc$/swpre.mk
 .INCLUDE :  $(PRJ)$/inc$/bf_sw$/swpre.mk
 .INCLUDE :  settings.mk
-#.INCLUDE :  $(PRJ)$/inc$/sw.mk
 .INCLUDE :  $(PRJ)$/inc$/bf_sw$/sw.mk
 INC+= -I$(PRJ)$/inc$/bf_sw
 
diff --git a/binfilter/bf_sw/source/filter/lotus/makefile.mk b/binfilter/bf_sw/source/filter/lotus/makefile.mk
index a23e98b..627709a 100644
--- a/binfilter/bf_sw/source/filter/lotus/makefile.mk
+++ b/binfilter/bf_sw/source/filter/lotus/makefile.mk
@@ -35,16 +35,12 @@ BFPRJ=..$/..$/..
 PRJNAME=binfilter
 TARGET=sw_lotus
 
-#GEN_HID=TRUE
-#GEN_HID_OTHER=TRUE
 NO_HIDS=TRUE
 
 # --- Settings -----------------------------------------------------
 
-#.INCLUDE :  $(PRJ)$/inc$/swpre.mk
 .INCLUDE :  $(PRJ)$/inc$/bf_sw$/swpre.mk
 .INCLUDE :  settings.mk
-#.INCLUDE :  $(PRJ)$/inc$/sw.mk
 .INCLUDE :  $(PRJ)$/inc$/bf_sw$/sw.mk
 INC+= -I$(PRJ)$/inc$/bf_sw
 
diff --git a/binfilter/bf_sw/source/filter/sw6/makefile.mk b/binfilter/bf_sw/source/filter/sw6/makefile.mk
index cce08fa..c6d743e 100644
--- a/binfilter/bf_sw/source/filter/sw6/makefile.mk
+++ b/binfilter/bf_sw/source/filter/sw6/makefile.mk
@@ -33,16 +33,12 @@ BFPRJ=..$/..$/..
 PRJNAME=binfilter
 TARGET=sw_sw6
 
-#GEN_HID=TRUE
-#GEN_HID_OTHER=TRUE
 NO_HIDS=TRUE
 
 # --- Settings -----------------------------------------------------
 
-#.INCLUDE :  $(PRJ)$/inc$/swpre.mk
 .INCLUDE :  $(PRJ)$/inc$/bf_sw$/swpre.mk
 .INCLUDE :  settings.mk
-#.INCLUDE :  $(PRJ)$/inc$/sw.mk
 .INCLUDE :  $(PRJ)$/inc$/bf_sw$/sw.mk
 
 INC+= -I$(PRJ)$/inc$/bf_sw
diff --git a/binfilter/bf_sw/source/filter/w4w/makefile.mk b/binfilter/bf_sw/source/filter/w4w/makefile.mk
index 2cefd94..f33f6f2 100644
--- a/binfilter/bf_sw/source/filter/w4w/makefile.mk
+++ b/binfilter/bf_sw/source/filter/w4w/makefile.mk
@@ -33,16 +33,12 @@ BFPRJ=..$/..$/..
 PRJNAME=binfilter
 TARGET=sw_w4w
 
-#GEN_HID=TRUE
-#GEN_HID_OTHER=TRUE
 NO_HIDS=TRUE
 
 # --- Settings -----------------------------------------------------
 
-#.INCLUDE :  $(PRJ)$/inc$/swpre.mk
 .INCLUDE :  $(PRJ)$/inc$/bf_sw$/swpre.mk
 .INCLUDE :  settings.mk
-#.INCLUDE :  $(PRJ)$/inc$/sw.mk
 .INCLUDE :  $(PRJ)$/inc$/bf_sw$/sw.mk
 
 INC+= -I$(PRJ)$/inc$/bf_sw
diff --git a/binfilter/bf_sw/source/filter/writer/makefile.mk b/binfilter/bf_sw/source/filter/writer/makefile.mk
index a0062ce..e2a11ac 100644
--- a/binfilter/bf_sw/source/filter/writer/makefile.mk
+++ b/binfilter/bf_sw/source/filter/writer/makefile.mk
@@ -33,16 +33,12 @@ BFPRJ=..$/..$/..
 PRJNAME=binfilter
 TARGET=sw_writer
 
-#GEN_HID=TRUE
-#GEN_HID_OTHER=TRUE
 NO_HIDS=TRUE
 
 # --- Settings -----------------------------------------------------
 
-#.INCLUDE :  $(PRJ)$/inc$/swpre.mk
 .INCLUDE :  $(PRJ)$/inc$/bf_sw$/swpre.mk
 .INCLUDE :  settings.mk
-#.INCLUDE :  $(PRJ)$/inc$/sw.mk
 .INCLUDE :  $(PRJ)$/inc$/bf_sw$/sw.mk
 INC+= -I$(PRJ)$/inc$/bf_sw
 # --- Files --------------------------------------------------------
diff --git a/binfilter/bf_sw/source/filter/xml/makefile.mk b/binfilter/bf_sw/source/filter/xml/makefile.mk
index 335dc1c..9d80218 100644
--- a/binfilter/bf_sw/source/filter/xml/makefile.mk
+++ b/binfilter/bf_sw/source/filter/xml/makefile.mk
@@ -33,16 +33,12 @@ BFPRJ=..$/..$/..
 PRJNAME=binfilter
 TARGET=sw_xml
 
-#GEN_HID=TRUE
-#GEN_HID_OTHER=TRUE
 NO_HIDS=TRUE
 
 # --- Settings -----------------------------------------------------
 
-#.INCLUDE :  $(PRJ)$/inc$/swpre.mk
 .INCLUDE :  $(PRJ)$/inc$/bf_sw$/swpre.mk
 .INCLUDE :  settings.mk
-#.INCLUDE :  $(PRJ)$/inc$/sw.mk
 .INCLUDE :  $(PRJ)$/inc$/bf_sw$/sw.mk
 INC+= -I$(PRJ)$/inc$/bf_sw
 .IF "$(mydebug)" != ""
diff --git a/binfilter/bf_sw/source/ui/app/makefile.mk b/binfilter/bf_sw/source/ui/app/makefile.mk
index a5e2ae7..ff97658 100644
--- a/binfilter/bf_sw/source/ui/app/makefile.mk
+++ b/binfilter/bf_sw/source/ui/app/makefile.mk
@@ -45,9 +45,6 @@ NO_HIDS=TRUE
 INC+= -I$(PRJ)$/inc$/bf_sw
 RSCUPDVER=$(RSCREVISION)(SV$(UPD)$(UPDMINOR))
 
-#IMGLST_SRS=$(SRS)$/app.srs
-#BMP_IN=$(PRJ)$/win/imglst
-
 # --- Files --------------------------------------------------------
 
 SRS1NAME=$(TARGET)
@@ -79,7 +76,6 @@ DEPOBJFILES= \
     $(SLO)$/sw_swlib.obj \
     $(SLO)$/sw_swcomlib.obj
 
-
 # --- Targets ------------------------------------------------------
 
 .INCLUDE :  target.mk
diff --git a/binfilter/bf_sw/source/ui/makefile.mk b/binfilter/bf_sw/source/ui/makefile.mk
index fd43e67..eafca37 100644
--- a/binfilter/bf_sw/source/ui/makefile.mk
+++ b/binfilter/bf_sw/source/ui/makefile.mk
@@ -33,16 +33,12 @@ BFPRJ=..$/..
 PRJNAME=binfilter
 TARGET=sw_ui
 
-#GEN_HID=TRUE
-#GEN_HID_OTHER=TRUE
 NO_HIDS=TRUE
 
 # --- Settings -----------------------------------------------------
 
-#.INCLUDE :  $(PRJ)$/inc$/swpre.mk
 .INCLUDE :  $(PRJ)$/inc$/bf_sw$/swpre.mk
 .INCLUDE :  settings.mk
-#.INCLUDE :  $(PRJ)$/inc$/sw.mk
 .INCLUDE :  $(PRJ)$/inc$/bf_sw$/sw.mk
 INC+= -I$(PRJ)$/inc$/bf_sw
 
@@ -80,7 +76,6 @@ LIB1FILES= \
 
 ################################################################
 
-
 kill:
     @$(RM) $(SLB)$/ui.lst
     @$(RM) $(SLB)$/ui.lib
diff --git a/binfilter/bf_sw/source/ui/uno/makefile.mk b/binfilter/bf_sw/source/ui/uno/makefile.mk
index 06dfe5d..9534496 100644
--- a/binfilter/bf_sw/source/ui/uno/makefile.mk
+++ b/binfilter/bf_sw/source/ui/uno/makefile.mk
@@ -33,19 +33,17 @@ BFPRJ=..$/..$/..
 PRJNAME=binfilter
 TARGET=sw_unoidl
 
-#GEN_HID=TRUE
-#GEN_HID_OTHER=TRUE
 NO_HIDS=TRUE
 ENABLE_EXCEPTIONS=TRUE
 
 # --- Settings -----------------------------------------------------
 
-#.INCLUDE :  $(PRJ)$/inc$/swpre.mk
 .INCLUDE :  $(PRJ)$/inc$/bf_sw$/swpre.mk
 .INCLUDE :  settings.mk
-#.INCLUDE :  $(PRJ)$/inc$/sw.mk
 .INCLUDE :  $(PRJ)$/inc$/bf_sw$/sw.mk
+
 INC+= -I$(PRJ)$/inc$/bf_sw
+
 # --- Files --------------------------------------------------------
 
 SLOFILES =  \
diff --git a/binfilter/bf_sw/source/ui/web/makefile.mk b/binfilter/bf_sw/source/ui/web/makefile.mk
index 48ae0e5..50807e1 100644
--- a/binfilter/bf_sw/source/ui/web/makefile.mk
+++ b/binfilter/bf_sw/source/ui/web/makefile.mk
@@ -33,19 +33,16 @@ BFPRJ=..$/..$/..
 PRJNAME=binfilter
 TARGET=sw_web
 
-#GEN_HID=TRUE
-#GEN_HID_OTHER=TRUE
 NO_HIDS=TRUE
 
 # --- Settings -----------------------------------------------------
 
-#.INCLUDE :  $(PRJ)$/inc$/swpre.mk
 .INCLUDE :  $(PRJ)$/inc$/bf_sw$/swpre.mk
 .INCLUDE :  settings.mk
-#.INCLUDE :  $(PRJ)$/inc$/sw.mk
 .INCLUDE :  $(PRJ)$/inc$/bf_sw$/sw.mk
 
 INC+= -I$(PRJ)$/inc$/bf_sw
+
 # --- Files --------------------------------------------------------
 
 SLOFILES =  \
diff --git a/binfilter/filter/source/bf_migrate/makefile.mk b/binfilter/filter/source/bf_migrate/makefile.mk
index 14efae4..1cc4f85 100644
--- a/binfilter/filter/source/bf_migrate/makefile.mk
+++ b/binfilter/filter/source/bf_migrate/makefile.mk
@@ -31,11 +31,8 @@ BFPRJ=..$/..
 PRJNAME=binfilter
 TARGET=bf_migratefilter
 
-#GEN_HID=TRUE
-#GEN_HID_OTHER=TRUE
 NO_HIDS=TRUE
 
-#UNOUCRRDB=$(SOLARBINDIR)$/applicat.rdb
 ENABLE_EXCEPTIONS=TRUE
 USE_DEFFILE=TRUE
 
diff --git a/filter/source/xsltfilter/makefile.mk b/filter/source/xsltfilter/makefile.mk
index a5e2713..baefcff 100644
--- a/filter/source/xsltfilter/makefile.mk
+++ b/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)))
diff --git a/filter/source/xsltvalidate/makefile.mk b/filter/source/xsltvalidate/makefile.mk
index 5337d31..50742dc 100644
--- a/filter/source/xsltvalidate/makefile.mk
+++ b/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)
diff --git a/writerfilter/source/doctok/makefile.mk b/writerfilter/source/doctok/makefile.mk
index ff03079..a3327fa 100644
--- a/writerfilter/source/doctok/makefile.mk
+++ b/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= \
diff --git a/writerfilter/source/ooxml/makefile.mk b/writerfilter/source/ooxml/makefile.mk
index e05b7d0..e364dee 100644
--- a/writerfilter/source/ooxml/makefile.mk
+++ b/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 \
diff --git a/writerfilter/source/resourcemodel/makefile.mk b/writerfilter/source/resourcemodel/makefile.mk
index c1eccd0..927daf5 100644
--- a/writerfilter/source/resourcemodel/makefile.mk
+++ b/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
diff --git a/writerfilter/source/rtftok/makefile.mk b/writerfilter/source/rtftok/makefile.mk
index 61399f0..6ac8141 100644
--- a/writerfilter/source/rtftok/makefile.mk
+++ b/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

More information about the Libreoffice-commits mailing list