[Libreoffice-commits] .: apache-commons/java migrationanalysis/src mysqlc/source nlpsolver/makefile.mk reportbuilder/util sdext/source tomcat/makefile.mk
Thomas Arnhold
tarnhold at kemper.freedesktop.org
Tue Feb 1 08:38:04 PST 2011
apache-commons/java/codec/makefile.mk | 2 --
migrationanalysis/src/msokill/makefile.mk | 1 -
mysqlc/source/makefile.mk | 12 ------------
nlpsolver/makefile.mk | 3 ---
reportbuilder/util/makefile.mk | 1 -
sdext/source/minimizer/makefile.mk | 1 -
sdext/source/pdfimport/test/makefile.mk | 2 --
sdext/source/pdfimport/xpdftest/makefile.mk | 2 --
sdext/source/presenter/makefile.mk | 6 ------
tomcat/makefile.mk | 1 -
10 files changed, 31 deletions(-)
New commits:
commit 8c564710712a223ab838c1fc0d58b878981ad24c
Author: Thomas Arnhold <thomas at arnhold.org>
Date: Tue Feb 1 17:37:37 2011 +0100
Clean up makefiles
diff --git a/apache-commons/java/codec/makefile.mk b/apache-commons/java/codec/makefile.mk
index 13b6c9f..8464353 100644
--- a/apache-commons/java/codec/makefile.mk
+++ b/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"
diff --git a/migrationanalysis/src/msokill/makefile.mk b/migrationanalysis/src/msokill/makefile.mk
index 918c7c4..bee81b0 100644
--- a/migrationanalysis/src/msokill/makefile.mk
+++ b/migrationanalysis/src/msokill/makefile.mk
@@ -51,7 +51,6 @@ LIBSALCPPRT=
APP1NOSAL= TRUE
APP1TARGET= msokill
-#APP1STDLIB
STDLIB1=msi.lib\
shell32.lib\
oleaut32.lib\
diff --git a/mysqlc/source/makefile.mk b/mysqlc/source/makefile.mk
index 4685049..31f8ce1 100755
--- a/mysqlc/source/makefile.mk
+++ b/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
diff --git a/nlpsolver/makefile.mk b/nlpsolver/makefile.mk
index 23b642c..451e1b3 100644
--- a/nlpsolver/makefile.mk
+++ b/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)
diff --git a/reportbuilder/util/makefile.mk b/reportbuilder/util/makefile.mk
index c299ce5..55ba88c 100755
--- a/reportbuilder/util/makefile.mk
+++ b/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 -----------------------------
diff --git a/sdext/source/minimizer/makefile.mk b/sdext/source/minimizer/makefile.mk
index 152f0b0..0ab276f 100755
--- a/sdext/source/minimizer/makefile.mk
+++ b/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"
diff --git a/sdext/source/pdfimport/test/makefile.mk b/sdext/source/pdfimport/test/makefile.mk
index d0b0591..eb666b1 100755
--- a/sdext/source/pdfimport/test/makefile.mk
+++ b/sdext/source/pdfimport/test/makefile.mk
@@ -162,5 +162,3 @@ APP2STDLIBS=\
@echo ----------------------------------------------------------
testshl2 -forward $(BIN)$/ $(SHL1TARGETN)
$(TOUCH) $@
-
-#ALLTAR : $(MISC)$/pdfi_unittest_succeeded
diff --git a/sdext/source/pdfimport/xpdftest/makefile.mk b/sdext/source/pdfimport/xpdftest/makefile.mk
index 9ebd916..23cc79b 100644
--- a/sdext/source/pdfimport/xpdftest/makefile.mk
+++ b/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
diff --git a/sdext/source/presenter/makefile.mk b/sdext/source/presenter/makefile.mk
index a72df14..21fae2f 100755
--- a/sdext/source/presenter/makefile.mk
+++ b/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
diff --git a/tomcat/makefile.mk b/tomcat/makefile.mk
index b440e84..9bdae76 100755
--- a/tomcat/makefile.mk
+++ b/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
More information about the Libreoffice-commits
mailing list