diff options
-rw-r--r-- | basebmp/test/makefile.mk | 19 | ||||
-rw-r--r-- | basegfx/source/color/makefile.mk | 4 | ||||
-rw-r--r-- | basegfx/source/curve/makefile.mk | 2 | ||||
-rw-r--r-- | basegfx/source/matrix/makefile.mk | 4 | ||||
-rw-r--r-- | basegfx/source/numeric/makefile.mk | 4 | ||||
-rw-r--r-- | basegfx/source/pixel/makefile.mk | 4 | ||||
-rw-r--r-- | basegfx/source/point/makefile.mk | 4 | ||||
-rw-r--r-- | basegfx/source/polygon/makefile.mk | 2 | ||||
-rw-r--r-- | basegfx/source/range/makefile.mk | 2 | ||||
-rw-r--r-- | basegfx/source/raster/makefile.mk | 2 | ||||
-rw-r--r-- | basegfx/source/tuple/makefile.mk | 4 | ||||
-rw-r--r-- | basegfx/source/vector/makefile.mk | 4 | ||||
-rw-r--r-- | dtrans/source/win32/dnd/makefile.mk | 7 | ||||
-rw-r--r-- | dtrans/source/win32/workbench/makefile.mk | 7 | ||||
-rw-r--r-- | l10ntools/source/makefile.mk | 49 | ||||
-rw-r--r-- | rsc/source/prj/makefile.mk | 4 | ||||
-rw-r--r-- | svtools/source/table/makefile.mk | 4 | ||||
-rw-r--r-- | tools/util/makefile.mk | 2 | ||||
-rw-r--r-- | vcl/os2/source/app/makefile.mk | 3 | ||||
-rwxr-xr-x | vcl/util/makefile.mk | 6 |
20 files changed, 4 insertions, 133 deletions
diff --git a/basebmp/test/makefile.mk b/basebmp/test/makefile.mk index 8dc95dcea0e5..4fdc39bb6fd4 100644 --- a/basebmp/test/makefile.mk +++ b/basebmp/test/makefile.mk @@ -99,25 +99,6 @@ SHL1RPATH = NONE .ENDIF # END ------------------------------------------------------------------ -#APP2TARGET= bmpdemo - -#APP2OBJS= \ -# $(OBJ)$/bmpdemo.obj - -#APP2STDLIBS=$(TOOLSLIB) \ -# $(COMPHELPERLIB) \ -# $(BASEGFXLIB) \ -# $(BASEBMPLIB) \ -# $(CPPULIB) \ -# $(CPPUHELPERLIB) \ -# $(UCBHELPERLIB) \ -# $(SALLIB) \ -# $(VCLLIB) -# -#.IF "$(GUI)"!="UNX" -#APP2DEF= $(MISC)$/$(TARGET).def -#.ENDIF - #------------------------------- All object files ------------------------------- # do this here, so we get right dependencies SLOFILES=$(SHL1OBJS) diff --git a/basegfx/source/color/makefile.mk b/basegfx/source/color/makefile.mk index c4e842db72ae..eec507899c4c 100644 --- a/basegfx/source/color/makefile.mk +++ b/basegfx/source/color/makefile.mk @@ -29,10 +29,6 @@ PRJ=..$/.. PRJNAME=basegfx TARGET=color -#UNOUCRRDB=$(SOLARBINDIR)$/applicat.rdb -#ENABLE_EXCEPTIONS=FALSE -#USE_DEFFILE=TRUE - # --- Settings ---------------------------------- .INCLUDE : settings.mk diff --git a/basegfx/source/curve/makefile.mk b/basegfx/source/curve/makefile.mk index 88190cfdfe1a..9fc84c4a2e08 100644 --- a/basegfx/source/curve/makefile.mk +++ b/basegfx/source/curve/makefile.mk @@ -29,9 +29,7 @@ PRJ=..$/.. PRJNAME=basegfx TARGET=curve -#UNOUCRRDB=$(SOLARBINDIR)$/applicat.rdb ENABLE_EXCEPTIONS=FALSE -#USE_DEFFILE=TRUE # --- Settings ---------------------------------- diff --git a/basegfx/source/matrix/makefile.mk b/basegfx/source/matrix/makefile.mk index 35ea4d0cb86f..1f22f928bf8e 100644 --- a/basegfx/source/matrix/makefile.mk +++ b/basegfx/source/matrix/makefile.mk @@ -29,10 +29,6 @@ PRJ=..$/.. PRJNAME=basegfx TARGET=matrix -#UNOUCRRDB=$(SOLARBINDIR)$/applicat.rdb -#ENABLE_EXCEPTIONS=FALSE -#USE_DEFFILE=TRUE - # --- Settings ---------------------------------- .INCLUDE : settings.mk diff --git a/basegfx/source/numeric/makefile.mk b/basegfx/source/numeric/makefile.mk index 83abbbde4d82..5115fecc079a 100644 --- a/basegfx/source/numeric/makefile.mk +++ b/basegfx/source/numeric/makefile.mk @@ -29,10 +29,6 @@ PRJ=..$/.. PRJNAME=basegfx TARGET=numeric -#UNOUCRRDB=$(SOLARBINDIR)$/applicat.rdb -#ENABLE_EXCEPTIONS=FALSE -#USE_DEFFILE=TRUE - # --- Settings ---------------------------------- .INCLUDE : settings.mk diff --git a/basegfx/source/pixel/makefile.mk b/basegfx/source/pixel/makefile.mk index 75192dc5c180..ab3c9a590ace 100644 --- a/basegfx/source/pixel/makefile.mk +++ b/basegfx/source/pixel/makefile.mk @@ -29,10 +29,6 @@ PRJ=..$/.. PRJNAME=basegfx TARGET=pixel -#UNOUCRRDB=$(SOLARBINDIR)$/applicat.rdb -#ENABLE_EXCEPTIONS=FALSE -#USE_DEFFILE=TRUE - # --- Settings ---------------------------------- .INCLUDE : settings.mk diff --git a/basegfx/source/point/makefile.mk b/basegfx/source/point/makefile.mk index 96798eb35cc9..1c03ab1bf42e 100644 --- a/basegfx/source/point/makefile.mk +++ b/basegfx/source/point/makefile.mk @@ -29,10 +29,6 @@ PRJ=..$/.. PRJNAME=basegfx TARGET=point -#UNOUCRRDB=$(SOLARBINDIR)$/applicat.rdb -#ENABLE_EXCEPTIONS=FALSE -#USE_DEFFILE=TRUE - # --- Settings ---------------------------------- .INCLUDE : settings.mk diff --git a/basegfx/source/polygon/makefile.mk b/basegfx/source/polygon/makefile.mk index 7ac71ada5e8e..f9d27918ffb0 100644 --- a/basegfx/source/polygon/makefile.mk +++ b/basegfx/source/polygon/makefile.mk @@ -29,9 +29,7 @@ PRJ=..$/.. PRJNAME=basegfx TARGET=polygon -#UNOUCRRDB=$(SOLARBINDIR)$/applicat.rdb ENABLE_EXCEPTIONS=TRUE -#USE_DEFFILE=TRUE # --- Settings ---------------------------------- diff --git a/basegfx/source/range/makefile.mk b/basegfx/source/range/makefile.mk index 5e05eeda94d9..9cc5893fcc44 100644 --- a/basegfx/source/range/makefile.mk +++ b/basegfx/source/range/makefile.mk @@ -29,9 +29,7 @@ PRJ=..$/.. PRJNAME=basegfx TARGET=range -#UNOUCRRDB=$(SOLARBINDIR)$/applicat.rdb ENABLE_EXCEPTIONS=TRUE -#USE_DEFFILE=TRUE # --- Settings ---------------------------------- diff --git a/basegfx/source/raster/makefile.mk b/basegfx/source/raster/makefile.mk index 1381b9f6d716..5493083d53b1 100644 --- a/basegfx/source/raster/makefile.mk +++ b/basegfx/source/raster/makefile.mk @@ -29,9 +29,7 @@ PRJ=..$/.. PRJNAME=basegfx TARGET=raster -#UNOUCRRDB=$(SOLARBINDIR)$/applicat.rdb ENABLE_EXCEPTIONS=TRUE -#USE_DEFFILE=TRUE # --- Settings ---------------------------------- diff --git a/basegfx/source/tuple/makefile.mk b/basegfx/source/tuple/makefile.mk index 01a4c6de2d3c..dfddeff24a5b 100644 --- a/basegfx/source/tuple/makefile.mk +++ b/basegfx/source/tuple/makefile.mk @@ -29,10 +29,6 @@ PRJ=..$/.. PRJNAME=basegfx TARGET=tuple -#UNOUCRRDB=$(SOLARBINDIR)$/applicat.rdb -#ENABLE_EXCEPTIONS=FALSE -#USE_DEFFILE=TRUE - # --- Settings ---------------------------------- .INCLUDE : settings.mk diff --git a/basegfx/source/vector/makefile.mk b/basegfx/source/vector/makefile.mk index defc7a31dd51..2393e3e35ee2 100644 --- a/basegfx/source/vector/makefile.mk +++ b/basegfx/source/vector/makefile.mk @@ -29,10 +29,6 @@ PRJ=..$/.. PRJNAME=basegfx TARGET=vector -#UNOUCRRDB=$(SOLARBINDIR)$/applicat.rdb -#ENABLE_EXCEPTIONS=FALSE -#USE_DEFFILE=TRUE - # --- Settings ---------------------------------- .INCLUDE : settings.mk diff --git a/dtrans/source/win32/dnd/makefile.mk b/dtrans/source/win32/dnd/makefile.mk index 54fd748a0889..4dda72007d15 100644 --- a/dtrans/source/win32/dnd/makefile.mk +++ b/dtrans/source/win32/dnd/makefile.mk @@ -44,13 +44,6 @@ stoponerror=tr # ------------------------------------------------------------------ -#CFLAGS+=-GR -DUNICODE -D_UNICODE - -#DBG_CONSOLE_OUT: when IDropTarget or IDropSource are called we write to a console -#DBG_CLIPBOARD_DATA: To provide DoDragDrop with an data object we call OleGetClipboard -#CFLAGS+= -DDBG_CONSOLE_OUT -DDBG_CLIPBOARD_DATA - - SLOFILES= $(SLO)$/dndentry.obj \ $(SLO)$/target.obj \ $(SLO)$/idroptarget.obj \ diff --git a/dtrans/source/win32/workbench/makefile.mk b/dtrans/source/win32/workbench/makefile.mk index be85525016c9..7432d2512df2 100644 --- a/dtrans/source/win32/workbench/makefile.mk +++ b/dtrans/source/win32/workbench/makefile.mk @@ -41,7 +41,6 @@ stoponerror=tr .ENDIF # --- Settings ----------------------------------------------------- -#.INCLUDE : $(PRJ)$/util$/makefile.pmk .INCLUDE : settings.mk @@ -54,8 +53,7 @@ CFLAGS+=-D_WIN32_DCOM -EHsc -Ob0 OBJFILES= $(OBJ)$/test_wincb.obj APP1TARGET= $(TARGET) APP1OBJS= $(OBJ)$/test_wincb.obj - - + APP1STDLIBS= $(SALLIB) \ $(CPPULIB) \ $(CPPUHELPERLIB) \ @@ -65,7 +63,6 @@ APP1STDLIBS= $(SALLIB) \ $(COMDLG32LIB) APP1LIBS= $(SLB)$/dtutils.lib - APP1NOSAL= TRUE @@ -86,11 +83,9 @@ APP1STDLIBS= $(SALLIB)\ $(OLEAUT32LIB) APP1LIBS= - APP1NOSAL= TRUE .ENDIF # --- Targets ------------------------------------------------------ .INCLUDE : target.mk -#.INCLUDE : $(PRJ)$/util$/target.pmk diff --git a/l10ntools/source/makefile.mk b/l10ntools/source/makefile.mk index fc4203b0d9d3..56ae0c616f48 100644 --- a/l10ntools/source/makefile.mk +++ b/l10ntools/source/makefile.mk @@ -33,12 +33,14 @@ PRJNAME=l10ntools TARGET=transex TARGETTYPE=CUI LIBTARGET=no + # --- Settings ----------------------------------------------------- + ENABLE_EXCEPTIONS=TRUE .INCLUDE : settings.mk + CDEFS+= -DYY_NEVER_INTERACTIVE=1 -#CDEFS+= -pg .IF "$(SYSTEM_EXPAT)" == "YES" CFLAGS+=-DSYSTEM_EXPAT @@ -62,7 +64,6 @@ OBJFILES= \ LIB1TARGET= $(LB)$/$(TARGET).lib LIB1ARCHIV= $(LB)$/libtransex.a -#LIB1FILES= $(LB)$/transex3.lib LIB1OBJFILES= $(OBJ)$/export.obj \ $(OBJ)$/export2.obj \ $(OBJ)$/merge.obj \ @@ -76,47 +77,25 @@ APP1VERSIONMAP=exports.map # extractor and merger for *.src and *.hrc APP1TARGET= transex3 -#APP1OBJS= $(OBJ)$/src_yy.obj APP1OBJS= $(OBJ)$/src_yy_wrapper.obj - APP1STDLIBS+= \ $(TOOLSLIB) \ $(SALLIB) - -.IF "$(OS)"=="MACOSX" -# static libs at end for OS X -.ENDIF - APP1LIBS+= $(LB)$/$(TARGET).lib APP1DEPN= $(OBJ)$/src_yy_wrapper.obj $(LB)$/$(TARGET).lib APP2TARGET= helpex APP2OBJS= $(OBJ)$/helpmerge.obj $(OBJ)$/xmlparse.obj $(OBJ)$/export2.obj $(OBJ)$/utf8conv.obj $(OBJ)$/merge.obj $(OBJ)$/helpex.obj APP2RPATH= NONE - -.IF "$(OS)"!="MACOSX" -.ENDIF - APP2STDLIBS+=$(SALLIB) $(EXPATASCII3RDLIB) $(TOOLSLIB) -.IF "$(OS)"=="MACOSX" -# static libs at end for OS X -.ENDIF - # extractor and merger for *.lng and *.lng APP3TARGET= ulfex APP3OBJS= $(OBJ)$/lngmerge.obj $(OBJ)$/merge.obj $(OBJ)$/export2.obj $(OBJ)$/lngex.obj $(OBJ)$/utf8conv.obj APP3RPATH= NONE - -.IF "$(OS)"!="MACOSX" -#APP3STDLIBS+= $(BTSTRPLIB) -.ENDIF APP3STDLIBS+= \ $(TOOLSLIB) \ $(SALLIB) -.IF "$(OS)"=="MACOSX" -# static libs at end for OS X -.ENDIF # encoding converter for *.gsi APP4TARGET= gsiconv @@ -135,40 +114,18 @@ APP5STDLIBS+= \ # extractor and merger for *.cfg APP6TARGET= cfgex APP6OBJS= $(OBJ)$/cfgmerge.obj $(OBJ)$/cfg_yy_wrapper.obj $(OBJ)$/merge.obj $(OBJ)$/export2.obj $(OBJ)$/utf8conv.obj - -.IF "$(OS)"!="MACOSX" -#APP6STDLIBS+= $(BTSTRPLIB) -.ENDIF - APP6STDLIBS+= \ $(TOOLSLIB) \ $(SALLIB) -.IF "$(OS)"=="MACOSX" -# static libs at end for OS X -.ENDIF - # extractor and merger for *.xrm APP7TARGET= xrmex APP7OBJS= $(OBJ)$/xrmmerge.obj $(OBJ)$/xrm_yy_wrapper.obj $(OBJ)$/merge.obj $(OBJ)$/export2.obj $(OBJ)$/utf8conv.obj APP7RPATH= NONE - -.IF "$(OS)"!="MACOSX" -.ENDIF - APP7STDLIBS+= \ $(TOOLSLIB) \ $(SALLIB) -.IF "$(OS)"=="MACOSX" -# static libs at end for OS X -.ENDIF - -# -#APP8TARGET= treeconfig -#APP8OBJS= $(OBJ)$/treeconfig.obj $(OBJ)$/inireader.obj $(OBJ)$/export2.obj -#APP8STDLIBS=$(TOOLSLIB) $(SALLIB) $(ICUINLIB) $(STLPORT) - # localizer for l10n framework APP9TARGET= localize_sl EXCEPTIONSFILES= \ diff --git a/rsc/source/prj/makefile.mk b/rsc/source/prj/makefile.mk index ac5b25902191..128d23160cc8 100644 --- a/rsc/source/prj/makefile.mk +++ b/rsc/source/prj/makefile.mk @@ -46,9 +46,7 @@ APP1STDLIBS=$(TOOLSLIB) $(I18NISOLANGLIB) $(SALLIB) # $(RTLLIB) APP1LIBS= $(LB)$/rsctoo.lib APP1OBJS= $(OBJ)$/start.obj .IF "$(GUI)" != "OS2" -# why not this way? APP1STACK=64000 -#APP1STACK=32768 .ENDIF APP1RPATH=NONE @@ -67,9 +65,7 @@ APP2LIBS= $(LB)$/rsctoo.lib \ $(LB)$/rscmis.lib APP2OBJS= $(OBJ)$/gui.obj .IF "$(GUI)" != "OS2" -# why not this way? APP2STACK=64000 -#APP2STACK=32768 .ENDIF APP2RPATH=NONE diff --git a/svtools/source/table/makefile.mk b/svtools/source/table/makefile.mk index cf1adc76fe92..78c50f9eca4a 100644 --- a/svtools/source/table/makefile.mk +++ b/svtools/source/table/makefile.mk @@ -30,7 +30,6 @@ PRJ=..$/.. ENABLE_EXCEPTIONS=TRUE PRJNAME=svtools TARGET=table -#LIBTARGET=NO # --- Settings ----------------------------------------------------- @@ -47,9 +46,6 @@ SLOFILES=\ $(SLO)$/defaultinputhandler.obj \ $(SLO)$/tabledatawindow.obj -#LIB1TARGET= $(SLB)$/$(TARGET).lib -#LIB1OBJFILES= $(SLOFILES) - # --- Targets ------------------------------------------------------ .INCLUDE : target.mk diff --git a/tools/util/makefile.mk b/tools/util/makefile.mk index 7a2008c0b864..9d6a4ac43fa8 100644 --- a/tools/util/makefile.mk +++ b/tools/util/makefile.mk @@ -90,8 +90,6 @@ LIB1FILES+= $(SLB)$/dll.lib .IF "$(BIG_TOOLS)"!="" .IF "$(GUI)"=="WNT" -#SOLARLIBDIR=$(SOLARVER)\$((INPATH)\lib -#SOLARLIBDIR=..\$(INPATH)\lib # bei lokalen osl rtl oder vos das SOLARLIBDIR bitte patchen ! LIB1FILES+= $(SOLARLIBDIR)\xosl.lib \ $(SOLARLIBDIR)\xrtl.lib diff --git a/vcl/os2/source/app/makefile.mk b/vcl/os2/source/app/makefile.mk index 80aeb7f568fb..9f3bfd7e89d8 100644 --- a/vcl/os2/source/app/makefile.mk +++ b/vcl/os2/source/app/makefile.mk @@ -32,12 +32,9 @@ TARGET=salapp # --- Settings ----------------------------------------------------- -#.INCLUDE : svpre.mk .INCLUDE : settings.mk -#.INCLUDE : sv.mk .INCLUDE : $(PRJ)$/util$/makefile2.pmk - # --- Files -------------------------------------------------------- YD00_CXXFILES=\ diff --git a/vcl/util/makefile.mk b/vcl/util/makefile.mk index 76137c5efa7f..20be25d53a62 100755 --- a/vcl/util/makefile.mk +++ b/vcl/util/makefile.mk @@ -134,7 +134,6 @@ SHL11FILE= $(MISC)$/app.slo SHL12FILE= $(MISC)$/gdi.slo SHL13FILE= $(MISC)$/win.slo SHL14FILE= $(MISC)$/ctrl.slo -#SHL15FILE= $(MISC)$/ex.slo SHL16FILE= $(MISC)$/salapp.slo SHL17FILE= $(MISC)$/salwin.slo SHL18FILE= $(MISC)$/salgdi.slo @@ -214,11 +213,6 @@ LIB1FILES+= \ .ENDIF # USE_BUILTIN_RASTERIZER SHL1LIBS= $(LIB1TARGET) -.IF "$(GUI)"!="UNX" -.IF "$(COM)"!="GCC" -#SHL1OBJS= $(SLO)$/salshl.obj -.ENDIF -.ENDIF .IF "$(GUI)" != "UNX" SHL1RES= $(RES)$/salsrc.res |