diff options
| author | Thomas Arnhold <thomas@arnhold.org> | 2011-02-02 11:48:50 +0100 |
|---|---|---|
| committer | Thomas Arnhold <thomas@arnhold.org> | 2011-02-02 12:11:50 +0100 |
| commit | 98df445a7d1a24e3c01381a5debea1ce58bb5cf4 (patch) | |
| tree | 304fd6379bd2ccd0229fd2fc100e89e778742362 /desktop | |
| parent | 7bdd6275f136edf04449970c915968ee4f31b76a (diff) | |
Clean up makefiles
Diffstat (limited to 'desktop')
| -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 |
3 files changed, 1 insertions, 23 deletions
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 - |