Clean up makefiles

apache-commons/java/codec/makefile.mk

@@ -49,8 +49,6 @@ TARFILE_ROOTDIR=commons-codec-1.3
 
 PATCH_FILES=$(PRJ)$/patches$/codec.patch
 
-#CONVERTFILES=build.xml
-                
 OUT2CLASS=dist$/commons-codec-1.3.jar
 
 ANT_OPTS+="-Dfile.encoding=ISO-8859-1"

migrationanalysis/src/msokill/makefile.mk

@@ -51,7 +51,6 @@ LIBSALCPPRT=
 APP1NOSAL=		TRUE
 APP1TARGET=		msokill
 
-#APP1STDLIB
 STDLIB1=msi.lib\
     shell32.lib\
     oleaut32.lib\

mysqlc/source/makefile.mk

@@ -281,18 +281,6 @@ $(EXTENSIONDIR)$/registry$/data$/org$/openoffice$/Office$/DataAccess$/Drivers.xc
     @@-$(MKDIRHIER) $(EXTENSIONDIR)$/registry$/data$/org$/openoffice$/Office$/DataAccess
     @$(COPY) $< $(EXTENSIONDIR)$/registry$/data$/org$/openoffice$/Office$/DataAccess$/Drivers.xcu > $(NULLDEV)
 
-# The below doesn't work - it's completely beyond me .... $@ is some strange path when echoed, so the whole construct
-# doesn't work .... :(
-
-#$(foreach,i,$(COMPONENT_XCU) $(EXTENSIONDIR)$/$i : $i)
-#    @echo -----------------
-#    @echo $@
-#    @echo $<
-#    @echo -----------------
-#    -$(MKDIRHIER) $(@:d)
-#    (COPY) $< $@
-#    @echo -----------------
-
 # non-existing descriptions: copy from the English version
 .IF "$(strip $(MISSING_LANGS))" != ""
 $(foreach,i,$(MISSING_LANGS) $(EXTENSIONDIR)$/description$/description_$i.txt): .$/description$/description_en-US.txt

nlpsolver/makefile.mk

@@ -42,9 +42,6 @@ TARFILE_MD5=90401bca927835b6fbae4a707ed187c8
 TARFILE_NAME=nlpsolver-0.9
 TARFILE_ROOTDIR=nlpsolver-0.9
 
-#ADDITIONAL_FILES= \
-#    toolsrc/org/mozilla/javascript/tools/debugger/OfficeScriptInfo.java
-
 PATCH_FILES=nlpsolver-0.9.patch
 
 ANT_FLAGS+=-Dplatforms.JDK_1.5.home=$(JAVA_HOME) -Doffice.program.dir=$(SOLARBINDIR)

reportbuilder/util/makefile.mk

@@ -41,7 +41,6 @@ EXTENSION_VERSION_BASE=1.2.1
 .IF "$(L10N_framework)"==""
 # ------------------------------------------------------------------
 # calready set in util$/makefile.pmk
-# EXTENSIONNAME:=report-builder
 EXTENSION_ZIPNAME:=report-builder
 
 # create Extension -----------------------------

sdext/source/minimizer/makefile.mk

@@ -38,7 +38,6 @@ ENABLE_EXCEPTIONS=TRUE
 .INCLUDE :  $(PRJ)$/util$/makefile.pmk
 
 # set in minimizer.pmk
-#EXTENSIONNAME:=PresentationMinimizer
 EXTENSION_ZIPNAME:=presentation-minimizer
 
 .IF "$(ENABLE_MINIMIZER)" != "YES"

sdext/source/pdfimport/test/makefile.mk

@@ -162,5 +162,3 @@ APP2STDLIBS=\
           @echo ----------------------------------------------------------
           testshl2 -forward $(BIN)$/ $(SHL1TARGETN)
            $(TOUCH) $@
-
-#ALLTAR : $(MISC)$/pdfi_unittest_succeeded

sdext/source/pdfimport/xpdftest/makefile.mk

@@ -44,8 +44,6 @@ ENABLE_EXCEPTIONS=TRUE
 
 .INCLUDE :  target.mk
 
-#ALLTAR : $(MISC)$/test_0_succeeded $(MISC)$/test_1_succeeded
-
 $(MISC)$/test_0_succeeded: $(BIN)$/xpdfimport$(EXECPOST) binary_0_out.def text_0_out.def testinput.pdf
     $(BIN)$/xpdfimport -f $(MISC)$/binary_0_out testinput.pdf > $(MISC)$/text_0_out
     diff --strip-trailing-cr $(MISC)$/binary_0_out binary_0_out.def

sdext/source/presenter/makefile.mk

@@ -138,9 +138,6 @@ COMPONENT_FILES=																			\
     $(ZIP1DIR)$/registry$/schema/org$/openoffice$/Office$/extension$/PresenterScreen.xcs   	\
     $(ZIP1DIR)$/registry$/data/$/org$/openoffice$/Office$/extension$/PresenterScreen.xcu 
 
-#COMPONENT_MERGED_XCU= \
-#	$(FIND_XCU)$/org$/openoffice$/Office$/extension$/PresenterScreen.xcu 
-
 COMPONENT_BITMAPS=												\
     $(ZIP1DIR)$/bitmaps$/BorderTop.png							\
     $(ZIP1DIR)$/bitmaps$/BorderTopLeft.png						\
@@ -262,9 +259,6 @@ ZIP1DEPS=					\
     $(COMPONENT_LIBRARY)	\
     $(COMPONENT_HELP)
 
-#	$(COMPONENT_MERGED_XCU) \
-
-
 LINKNAME:=help
 XHPLINKSRC:=$(ZIP1DIR)/help
 

tomcat/makefile.mk

@@ -44,7 +44,6 @@ TARFILE_MD5=2a177023f9ea8ec8bd00837605c5df1b
 TARFILE_ROOTDIR=jakarta-tomcat-5.0.30-src
 
 ADDITIONAL_FILES = jakarta-servletapi-5/build.xml
-#CONVERTFILES=build$/build.xml
 
 PATCH_FILES=tomcat.patch