diff options
-rw-r--r-- | basic/workben/makefile.mk | 10 | ||||
-rw-r--r-- | desktop/source/deployment/gui/makefile.mk | 3 | ||||
-rw-r--r-- | desktop/source/migration/services/makefile.mk | 3 | ||||
-rw-r--r-- | desktop/win32/source/officeloader/makefile.mk | 18 | ||||
-rw-r--r-- | editeng/source/editeng/makefile.mk | 5 | ||||
-rw-r--r-- | editeng/source/items/makefile.mk | 5 | ||||
-rw-r--r-- | editeng/source/misc/makefile.mk | 4 | ||||
-rw-r--r-- | embeddedobj/util/makefile.mk | 2 | ||||
-rw-r--r-- | formula/source/ui/resource/makefile.mk | 6 | ||||
-rw-r--r-- | fpicker/source/unx/kde/makefile.mk | 2 | ||||
-rw-r--r-- | fpicker/source/win32/filepicker/makefile.mk | 4 | ||||
-rw-r--r-- | framework/qa/complex/ModuleManager/makefile.mk | 1 | ||||
-rw-r--r-- | framework/qa/complex/accelerators/makefile.mk | 1 | ||||
-rw-r--r-- | framework/test/makefile.mk | 25 | ||||
-rw-r--r-- | linguistic/source/makefile.mk | 3 | ||||
-rw-r--r-- | ucb/workben/ucb/makefile.mk | 3 |
16 files changed, 5 insertions, 90 deletions
diff --git a/basic/workben/makefile.mk b/basic/workben/makefile.mk index 7eb5da3d912c..def38732bf5b 100644 --- a/basic/workben/makefile.mk +++ b/basic/workben/makefile.mk @@ -51,16 +51,6 @@ APP1STDLIBS= \ $(CPPULIB) \ $(SOTLIB) \ - -#.IF "$(GUI)"=="WNT" || "$(COM)"=="GCC" -#APP1STDLIBS+=$(CPPULIB) -#.ENDIF -#.IF "$(GUI)"=="UNX" -#APP1STDLIBS+= \ -# \ -# $(SALLIB) -#.ENDIF - .IF "$(GUI)"!="OS2" APP1LIBS= \ $(LB)$/basic.lib diff --git a/desktop/source/deployment/gui/makefile.mk b/desktop/source/deployment/gui/makefile.mk index 9f1a50134248..509761c5b1e1 100644 --- a/desktop/source/deployment/gui/makefile.mk +++ b/desktop/source/deployment/gui/makefile.mk @@ -30,7 +30,6 @@ PRJ = ..$/..$/.. PRJNAME = desktop TARGET = deploymentgui ENABLE_EXCEPTIONS = TRUE -#USE_DEFFILE = TRUE NO_BSYMBOLIC = TRUE USE_PCH := ENABLE_PCH := @@ -87,8 +86,6 @@ SHL1LIBS = $(SLB)$/$(TARGET).lib SHL1DEF = $(MISC)$/$(SHL1TARGET).def DEF1NAME = $(SHL1TARGET) -#DEFLIB1NAME = $(TARGET) -#DEF1DEPN = SRS1NAME = $(TARGET) SRC1FILES = \ diff --git a/desktop/source/migration/services/makefile.mk b/desktop/source/migration/services/makefile.mk index 2f3eb9308ebd..35f21ba99d50 100644 --- a/desktop/source/migration/services/makefile.mk +++ b/desktop/source/migration/services/makefile.mk @@ -34,6 +34,7 @@ COMP1TYPELIST = migrationoo2 LIBTARGET=NO # --- Settings ----------------------------------------------------- + .INCLUDE : ..$/..$/deployment/inc/dp_misc.mk .INCLUDE : settings.mk DLLPRE = @@ -80,7 +81,6 @@ SHL1STDLIBS= \ SHL1DEPN= SHL1IMPLIB=imigrationoo2 -#SHL1LIBS=$(SLB)$/$(TARGET).lib SHL1DEF=$(MISC)$/$(SHL1TARGET).def DEF1NAME=$(SHL1TARGET) @@ -108,7 +108,6 @@ SHL2STDLIBS= \ SHL2DEPN= SHL2IMPLIB=imigrationoo3 -#SHL2LIBS=$(SLB)$/$(SHL2TARGET).lib SHL2DEF=$(MISC)$/$(SHL2TARGET).def DEF2NAME=$(SHL2TARGET) diff --git a/desktop/win32/source/officeloader/makefile.mk b/desktop/win32/source/officeloader/makefile.mk index 10758727b743..5609dea25085 100644 --- a/desktop/win32/source/officeloader/makefile.mk +++ b/desktop/win32/source/officeloader/makefile.mk @@ -30,7 +30,6 @@ PRJ=..$/..$/.. PRJNAME=desktop TARGET=officeloader LIBTARGET=NO -#TARGETTYPE=GUI # --- Settings ----------------------------------------------------- @@ -41,23 +40,6 @@ LIBTARGET=NO OBJFILES = \ $(OBJ)$/officeloader.obj -#APP1TARGET=so$/officeloader -#APP1NOSAL=TRUE -#APP1LINKRES=$(MISC)$/$(TARGET).res -#APP1ICON=$(SOLARRESDIR)$/icons/001_star_main.ico -#APP1OBJS = \ -# $(OBJ)$/officeloader.obj - -#APP2TARGET=officeloader -#APP2NOSAL=TRUE -#APP2LINKRES=$(MISC)$/$(TARGET).res -#APP2ICON=$(SOLARRESDIR)$/icons/ooo_gulls.ico -#APP2OBJS = \ -# $(OBJ)$/officeloader.obj - - # --- Targets ------------------------------------------------------ - .INCLUDE : target.mk - diff --git a/editeng/source/editeng/makefile.mk b/editeng/source/editeng/makefile.mk index 4a8f8f254070..e0c00762f03f 100644 --- a/editeng/source/editeng/makefile.mk +++ b/editeng/source/editeng/makefile.mk @@ -30,13 +30,8 @@ PRJNAME=editeng TARGET=editeng AUTOSEG=true -#PROJECTPCH4DLL=TRUE -#PROJECTPCH=eeng_pch -#PROJECTPCHSOURCE=eeng_pch - ENABLE_EXCEPTIONS=TRUE - # --- Settings ----------------------------------------------------------- .INCLUDE : settings.mk diff --git a/editeng/source/items/makefile.mk b/editeng/source/items/makefile.mk index 0caa661bf11c..350d9cbedeb9 100644 --- a/editeng/source/items/makefile.mk +++ b/editeng/source/items/makefile.mk @@ -27,11 +27,6 @@ PRJ=..$/.. -#PROJECTPCH4DLL=TRUE -#PROJECTPCH=svxpch -#PROJECTPCHSOURCE=$(PRJ)$/util$/svxpch -#ENABLE_EXCEPTIONS=TRUE - PRJNAME=editeng TARGET=items diff --git a/editeng/source/misc/makefile.mk b/editeng/source/misc/makefile.mk index e402ae591c78..23bdb9c1bf22 100644 --- a/editeng/source/misc/makefile.mk +++ b/editeng/source/misc/makefile.mk @@ -29,10 +29,6 @@ PRJ=..$/.. PRJNAME=editeng TARGET=misc -#PROJECTPCH4DLL=TRUE -#PROJECTPCH=eeng_pch -#PROJECTPCHSOURCE=eeng_pch - ENABLE_EXCEPTIONS=TRUE # --- Settings ----------------------------------------------------------- diff --git a/embeddedobj/util/makefile.mk b/embeddedobj/util/makefile.mk index 763d64c164c4..d2563fbce1e5 100644 --- a/embeddedobj/util/makefile.mk +++ b/embeddedobj/util/makefile.mk @@ -29,8 +29,6 @@ PRJ=.. PRJNAME=embeddedobj TARGET=embobj -#LIBTARGET=NO -#USE_DEFFILE=TRUE ENABLE_EXCEPTIONS=TRUE # --- Settings ----------------------------------------------------------- diff --git a/formula/source/ui/resource/makefile.mk b/formula/source/ui/resource/makefile.mk index 602359e1ea49..fd6a5351bac2 100644 --- a/formula/source/ui/resource/makefile.mk +++ b/formula/source/ui/resource/makefile.mk @@ -30,6 +30,7 @@ PRJINC=$(PRJ)$/source PRJNAME=formula TARGET=ui_resource ENABLE_EXCEPTIONS=TRUE + # --- Settings ----------------------------------------------------- .INCLUDE : settings.mk @@ -37,11 +38,6 @@ ENABLE_EXCEPTIONS=TRUE # --- Files -------------------------------------------------------- -#SRS1NAME=ui_res -#SRC1FILES= \ -# ui_resource.src - - SLOFILES= $(SLO)$/ModuleHelper.obj \ # --- Targets ---------------------------------- diff --git a/fpicker/source/unx/kde/makefile.mk b/fpicker/source/unx/kde/makefile.mk index e7fbd2bf2b87..e1bc4db47d36 100644 --- a/fpicker/source/unx/kde/makefile.mk +++ b/fpicker/source/unx/kde/makefile.mk @@ -32,8 +32,6 @@ TARGET=kdefilepicker LIBTARGET=NO ENABLE_EXCEPTIONS=TRUE EXTERNAL_WARNINGS_NOT_ERRORS=TRUE -#COMP1TYPELIST=$(TARGET) -#COMPRDB=$(SOLARBINDIR)$/types.rdb # --- Settings ----------------------------------------------------- diff --git a/fpicker/source/win32/filepicker/makefile.mk b/fpicker/source/win32/filepicker/makefile.mk index 17e4f2609069..bfe5bee1da01 100644 --- a/fpicker/source/win32/filepicker/makefile.mk +++ b/fpicker/source/win32/filepicker/makefile.mk @@ -29,7 +29,6 @@ PRJ=..$/..$/.. PRJNAME=fpicker TARGET=fps -#LIBTARGET=NO ENABLE_EXCEPTIONS=TRUE COMP1TYPELIST=$(TARGET) @@ -41,11 +40,8 @@ COMP1TYPELIST=$(TARGET) CDEFS+=-D_UNICODE CDEFS+=-DUNICODE -#CDEFS+=-DWIN32_LEAN_AND_MEAN -#CDEFS+=-DWIN32 CDEFS+=-U_WIN32_WINNT -D_WIN32_WINNT=0x0600 - # --- Resources ---------------------------------------------------- .IF "$(GUI)" == "WNT" diff --git a/framework/qa/complex/ModuleManager/makefile.mk b/framework/qa/complex/ModuleManager/makefile.mk index bcef75fca4ef..ec11ef5030de 100644 --- a/framework/qa/complex/ModuleManager/makefile.mk +++ b/framework/qa/complex/ModuleManager/makefile.mk @@ -30,6 +30,7 @@ PRJNAME = $(TARGET) PACKAGE = complex$/ModuleManager # --- Settings ----------------------------------------------------- + .INCLUDE: settings.mk #----- compile .java files ----------------------------------------- diff --git a/framework/qa/complex/accelerators/makefile.mk b/framework/qa/complex/accelerators/makefile.mk index 3af496191d4f..034287fbb57e 100644 --- a/framework/qa/complex/accelerators/makefile.mk +++ b/framework/qa/complex/accelerators/makefile.mk @@ -31,6 +31,7 @@ PRJNAME = $(TARGET) PACKAGE = complex$/accelerators # --- Settings ----------------------------------------------------- + .INCLUDE: settings.mk #----- compile .java files ----------------------------------------- diff --git a/framework/test/makefile.mk b/framework/test/makefile.mk index 1059cbca443b..df4adda7c290 100644 --- a/framework/test/makefile.mk +++ b/framework/test/makefile.mk @@ -24,6 +24,7 @@ # for a copy of the LGPLv3 License. # #************************************************************************* + PRJ=.. PRJNAME= framework @@ -36,29 +37,6 @@ USE_DEFFILE= TRUE .INCLUDE : settings.mk -# --- applikation: "test" -------------------------------------------------- - -#APP1TARGET= test - -#APP1OBJS= $(SLO)$/test.obj -#DEPOBJFILES+= $(APP1OBJS) - -#APP1LIBS= $(SLB)$/fwk_classes.lib \ -# $(SLB)$/fwk_helper.lib - -#APP1STDLIBS= $(CPPULIB) \ -# $(CPPUHELPERLIB) \ -# $(SALLIB) \ -# \ -# $(TOOLSLIB) \ -# $(SVTOOLLIB) \ -# $(TKLIB) \ -# $(COMPHELPERLIB) \ -# $(VCLLIB) - -#APP1DEPN= $(SLB)$/fwk_helper.lib \ -# $(SLB)$/fwk_classes.lib - # --- application: "threadtest" -------------------------------------------------- APP2TARGET= threadtest @@ -90,4 +68,3 @@ APP2DEPN= $(SLO)$/fairrwlock.obj \ # --- Targets ------------------------------------------------------ .INCLUDE : target.mk - diff --git a/linguistic/source/makefile.mk b/linguistic/source/makefile.mk index 47c8ef334b88..da6277db15d8 100644 --- a/linguistic/source/makefile.mk +++ b/linguistic/source/makefile.mk @@ -78,7 +78,6 @@ SHL1STDLIBS= \ SHL1LIBS= $(SLB)$/$(TARGET).lib SHL1DEPN= $(SLB)$/$(TARGET).lib SHL1DEF= $(MISC)$/$(SHL1TARGET).def -#SHL1VERSIONMAP= $(TARGET).map SHL1IMPLIB= ilng # build DEF file @@ -86,7 +85,6 @@ DEF1NAME =$(SHL1TARGET) DEF1DEPN =$(MISC)$/$(SHL1TARGET).flt DEFLIB1NAME =$(TARGET) DEF1DES =Linguistic main DLL -#DEF1EXPORTFILE= exports.dxp .IF "$(GUI)"=="WNT" @@ -97,7 +95,6 @@ DEF1EXPORT3 = component_getImplementationEnvironment # --- Targets ------------------------------------------------------ - .INCLUDE : target.mk diff --git a/ucb/workben/ucb/makefile.mk b/ucb/workben/ucb/makefile.mk index 54f100b819cc..a711ef7df909 100644 --- a/ucb/workben/ucb/makefile.mk +++ b/ucb/workben/ucb/makefile.mk @@ -44,8 +44,6 @@ OBJFILES=\ $(OBJ)$/srcharg.obj \ $(OBJ)$/ucbdemo.obj -#SRSFILES= $(SRS)$/ucbdemo.srs - # # UCBDEMO # @@ -53,7 +51,6 @@ APP1TARGET= ucbdemo APP1OBJS=\ $(OBJ)$/srcharg.obj \ $(OBJ)$/ucbdemo.obj -#APP1RES= $(RES)$/ucbdemo.res .IF "$(COMPHELPERLIB)"=="" |