[Libreoffice-commits] .: 2 commits - canvas/source comphelper/qa dtrans/test l10ntools/layout l10ntools/source svl/qa svl/util svtools/inc tools/workben vcl/aqua

[Thomas Arnhold]

 canvas/source/tools/makefile.mk               |    3 ---
 comphelper/qa/complex/makefile.mk             |    2 +-
 dtrans/test/win32/dnd/makefile.mk             |    4 ----
 l10ntools/layout/makefile.mk                  |    1 -
 l10ntools/source/filter/merge/makefile.mk     |   13 -------------
 svl/qa/complex/ConfigItems/helper/makefile.mk |    1 -
 svl/util/makefile.mk                          |    1 -
 svtools/inc/svtools/svtools.hrc               |    2 +-
 tools/workben/fstest.cxx                      |    2 +-
 vcl/aqua/source/res/makefile.mk               |    1 -
 10 files changed, 3 insertions(+), 27 deletions(-)

New commits:
commit e83a41564e1780e36ad2affd3dce2aa3939972db
Author: Thomas Arnhold <thomas at arnhold.org>
Date:   Tue Feb 1 17:58:43 2011 +0100

    Clean up makefiles

diff --git a/canvas/source/tools/makefile.mk b/canvas/source/tools/makefile.mk
index d51053d..ab4f545 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 ec0efdd..2ddba50 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 3744e61..93ac89b 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 9341e91..dee3c6e 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 f8f8fb6..b66e5b2 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 13ea121..17c7b81 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 9ea5e8d..c19dc58 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 2043504..8cc46ca 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 --------------------------------------------------
commit 6703163cd201792d6bc9976a56072cfa4509484b
Author: Thomas Arnhold <thomas at arnhold.org>
Date:   Mon Jan 31 21:56:43 2011 +0100

    Remove RCS information

diff --git a/svtools/inc/svtools/svtools.hrc b/svtools/inc/svtools/svtools.hrc
index 8019d5b..6f22775 100644
--- a/svtools/inc/svtools/svtools.hrc
+++ b/svtools/inc/svtools/svtools.hrc
@@ -25,7 +25,7 @@
  *
  ************************************************************************/
 #ifndef _SVTOOLS_HRC
-#define _SVTOOLS_HRC "$Revision:   1.0"
+#define _SVTOOLS_HRC
 
 #include <svl/solar.hrc>
 
diff --git a/tools/workben/fstest.cxx b/tools/workben/fstest.cxx
index 0c9fa28..bf459a9 100644
--- a/tools/workben/fstest.cxx
+++ b/tools/workben/fstest.cxx
@@ -29,7 +29,7 @@
 // MARKER(update_precomp.py): autogen include statement, do not remove
 #include "precompiled_tools.hxx"
 
-#define _FSTEST_CXX "$Revision: 1.5 $"
+#define _FSTEST_CXX
 #include <tools/solar.h>
 
 #include <stdio.h>