diff options
| -rw-r--r-- | canvas/source/tools/makefile.mk | 3 | ||||
| -rw-r--r-- | comphelper/qa/complex/makefile.mk | 2 | ||||
| -rw-r--r-- | dtrans/test/win32/dnd/makefile.mk | 4 | ||||
| -rw-r--r-- | l10ntools/layout/makefile.mk | 1 | ||||
| -rw-r--r-- | l10ntools/source/filter/merge/makefile.mk | 13 | ||||
| -rw-r--r-- | svl/qa/complex/ConfigItems/helper/makefile.mk | 1 | ||||
| -rw-r--r-- | svl/util/makefile.mk | 1 | ||||
| -rw-r--r-- | vcl/aqua/source/res/makefile.mk | 1 |
8 files changed, 1 insertions, 25 deletions
diff --git a/canvas/source/tools/makefile.mk b/canvas/source/tools/makefile.mk index d51053d1d491..ab4f545a3bdd 100644 --- a/canvas/source/tools/makefile.mk +++ b/canvas/source/tools/makefile.mk @@ -44,9 +44,6 @@ CDEFS+= -DVERBOSE CDEFS+= -DPROFILER .ENDIF -#CFLAGS +:= /Ox /Ot # THIS IS IMPORTANT - - .IF "$(L10N_framework)"=="" SLOFILES = \ $(SLO)$/cachedprimitivebase.obj \ diff --git a/comphelper/qa/complex/makefile.mk b/comphelper/qa/complex/makefile.mk index ec0efdd1188c..2ddba50b4d81 100644 --- a/comphelper/qa/complex/makefile.mk +++ b/comphelper/qa/complex/makefile.mk @@ -30,6 +30,7 @@ TARGET = ComphelperComplexTests PRJNAME = comphelper # --- Settings ----------------------------------------------------- + .INCLUDE: settings.mk #----- compile .java files ----------------------------------------- @@ -42,7 +43,6 @@ JAVACLASSFILES := $(foreach,i,$(JAVAFILES) $(CLASSDIR)$/$(i:d)$/$(i:b).class) MAXLINELENGTH = 100000 -#JARCLASSDIRS = JARTARGET = $(TARGET).jar JARCOMPRESS = TRUE diff --git a/dtrans/test/win32/dnd/makefile.mk b/dtrans/test/win32/dnd/makefile.mk index 3744e6135806..93ac89b0d35c 100644 --- a/dtrans/test/win32/dnd/makefile.mk +++ b/dtrans/test/win32/dnd/makefile.mk @@ -32,7 +32,6 @@ TARGET=dndTest TARGETTYPE=CUI LIBTARGET=NO -#USE_DEFFILE= TRUE ENABLE_EXCEPTIONS=TRUE # --- Settings --- @@ -41,7 +40,6 @@ ENABLE_EXCEPTIONS=TRUE # --- Files --- -# CFLAGS+=-GR -DUNICODE -D_UNICODE CFLAGS+= -D_WIN32_DCOM INCPRE+= -I$(ATL_INCLUDE) @@ -73,8 +71,6 @@ APP1LIBS= \ $(SLB)$/dtobjfact.lib \ $(SLB)$/dtutils.lib -# $(SOLARLIBDIR)$/imtaolecb.lib\ - APP1DEF= $(MISC)\$(APP1TARGET).def # --- Targets --- diff --git a/l10ntools/layout/makefile.mk b/l10ntools/layout/makefile.mk index 9341e91b69a4..dee3c6e81b33 100644 --- a/l10ntools/layout/makefile.mk +++ b/l10ntools/layout/makefile.mk @@ -31,7 +31,6 @@ INCPRE=$(MISC) PRJNAME=l10ntools TARGET=tralay -#TARGETTYPE=GUI TARGETTYPE=CUI LIBTARGET=no diff --git a/l10ntools/source/filter/merge/makefile.mk b/l10ntools/source/filter/merge/makefile.mk index f8f8fb640249..b66e5b27e6a1 100644 --- a/l10ntools/source/filter/merge/makefile.mk +++ b/l10ntools/source/filter/merge/makefile.mk @@ -35,18 +35,10 @@ PACKAGE = com$/sun$/star$/filter$/config$/tools$/merge .INCLUDE: settings.mk #----- compile .java files ----------------------------------------- -#.IF "$(L10N_framework)"=="" OWNCOPY = \ $(MISC)$/$(TARGET)_copied.done -#JARFILES = \ -# ridl.jar \ -# unoil.jar \ -# jurt.jar \ -# juh.jar \ -# java_uno.jar - CFGFILES = \ FCFGMerge.cfg @@ -85,8 +77,3 @@ $(OWNCOPY) : $(CFGFILES) $(COPY) $? $(CLASSDIR)$/$(PACKAGE) && $(TOUCH) $@ .ENDIF # "$(SOLAR_JAVA)" != "" - -#.ELSE -#pseudo: - -#.ENDIF diff --git a/svl/qa/complex/ConfigItems/helper/makefile.mk b/svl/qa/complex/ConfigItems/helper/makefile.mk index 13ea12106792..17c7b81ae9c7 100644 --- a/svl/qa/complex/ConfigItems/helper/makefile.mk +++ b/svl/qa/complex/ConfigItems/helper/makefile.mk @@ -61,7 +61,6 @@ SHL1STDLIBS= \ $(SALLIB) SHL1DEF= $(MISC)$/$(SHL1TARGET).def -#SHL1DEPN= $(SHL1IMPLIBN) $(SHL1TARGETN) DEF1NAME= $(SHL1TARGET) diff --git a/svl/util/makefile.mk b/svl/util/makefile.mk index 9ea5e8d80b50..c19dc58914a1 100644 --- a/svl/util/makefile.mk +++ b/svl/util/makefile.mk @@ -31,7 +31,6 @@ PRJNAME=svl TARGET=svl RESTARGETSIMPLE=svs GEN_HID=TRUE -# GEN_HID_OTHER=TRUE ENABLE_EXCEPTIONS=TRUE # --- Settings ----------------------------------------------------- diff --git a/vcl/aqua/source/res/makefile.mk b/vcl/aqua/source/res/makefile.mk index 2043504450e7..8cc46caf443b 100644 --- a/vcl/aqua/source/res/makefile.mk +++ b/vcl/aqua/source/res/makefile.mk @@ -43,7 +43,6 @@ dummy: ZIPFLAGS = -r ZIP1TARGET = osxres -#ZIP1DIR = ZIP1LIST = MainMenu.nib/*.nib cursors/*.png # --- Targets -------------------------------------------------- |