[ooo-build-commit] Branch 'ooo/master' - 2 commits - jfreereport/java reportbuilder/util sdext/source swext/mediawiki xpdf/makefile.mk
Jan Holesovsky
kendy at kemper.freedesktop.org
Wed Sep 16 17:28:29 PDT 2009
jfreereport/java/flute/makefile.mk | 7 ++++---
jfreereport/java/jfreereport/makefile.mk | 8 ++++----
jfreereport/java/libbase/makefile.mk | 3 ++-
jfreereport/java/libfonts/makefile.mk | 9 +++++----
jfreereport/java/libformula/makefile.mk | 8 ++++----
jfreereport/java/liblayout/makefile.mk | 8 ++++----
jfreereport/java/libloader/makefile.mk | 8 ++++----
jfreereport/java/librepository/makefile.mk | 8 ++++----
jfreereport/java/libserializer/makefile.mk | 8 ++++----
jfreereport/java/libxml/makefile.mk | 8 ++++----
jfreereport/java/sac/makefile.mk | 6 +++++-
reportbuilder/util/makefile.mk | 8 ++++----
sdext/source/minimizer/makefile.mk | 5 +++++
sdext/source/pdfimport/makefile.mk | 7 +++++++
sdext/source/presenter/makefile.mk | 9 ++++++++-
swext/mediawiki/makefile.mk | 5 ++++-
xpdf/makefile.mk | 23 ++++++++++++++---------
17 files changed, 86 insertions(+), 52 deletions(-)
New commits:
commit 10f22a17f452f8e388156f6bb1bf548085616156
Author: Jens-Heiner Rechtien <hr at openoffice.org>
Date: Wed Sep 16 14:49:32 2009 +0000
CWS-TOOLING: integrate CWS cloph13
2009-09-01 #i104566# also use syslibroot/isysroot for external components
2009-08-28 #i104568# clean up duplicated definitions of OBJCXXFLAGS
2009-08-28 #i104567# add ccache-detection to configure (to skip to objcxx-flags)
2009-08-28 #i104566# use Mac OS X 10.4-SDK to ensure backwards compatibility
use MACOSX_DEPLOYMENT_TARGET and sysroot/syslibroot switches
ignore "-isysroot /Developer/..." arguments for OOo's cpp
diff --git a/xpdf/makefile.mk b/xpdf/makefile.mk
index 8ed2543..c65fa69 100644
--- a/xpdf/makefile.mk
+++ b/xpdf/makefile.mk
@@ -44,8 +44,8 @@ TARGET=xpdflib
.IF "$(SYSTEM_POPPLER)" == "YES"
dummy:
- @echo "An already available installation of poppler should exist on your system."
- @echo "Therefore xpdf provided here does not need to be built in addition."
+ @echo "An already available installation of poppler should exist on your system."
+ @echo "Therefore xpdf provided here does not need to be built in addition."
.ENDIF
# --- Files --------------------------------------------------------
@@ -62,7 +62,11 @@ CFLAGS:=$(EXTRA_CFLAGS)
CXXFLAGS:=$(EXTRA_CFLAGS)
.EXPORT : CFLAGS CXXFLAGS
.ENDIF # "$(EXTRA_CFLAGS)"!=""
-.ENDIF # "$(SYSBASE)"!=""
+.ELIF "$(OS)"=="MACOSX" # "$(SYSBASE)"!=""
+CFLAGS:=$(EXTRA_CDEFS)
+CXXFLAGS+:=$(EXTRA_CDEFS)
+.EXPORT: CFLAGS CXXFLAGS
+.ENDIF
.IF "$(GUI)"=="UNX"
.IF "$(OS)"=="SOLARIS"
@@ -76,12 +80,13 @@ LDFLAGS:=$(ARCH_FLAGS)
.EXPORT : CFLAGS CXXFLAGS LDFLAGS
.ENDIF
-.IF "$(COM)$(OS)$(CPU)" == "GCCMACOSXP"
-CONFIGURE_ACTION=./configure --without-x --enable-multithreaded --enable-exceptions CXXFLAGS="-malign-natural"
-.ELSE
-#CONFIGURE_ACTION=./configure
-#CONFIGURE_ACTION=./configure --without-x --enable-multithreaded --enable-exceptions CFLAGS="-g -O0" CXXFLAGS="-g -O0"
-CONFIGURE_ACTION=./configure --without-libpaper-library --without-t1-library --without-x --enable-multithreaded --enable-exceptions
+.IF "$(OS)"=="MACOSX"
+CONFIGURE_ACTION=configure
+CONFIGURE_FLAGS+=--without-x --without-libpaper-library --without-t1-library --enable-multithreaded --enable-exceptions
+.IF "$(CPU)"=="P"
+CXXFLAGS+=-malign-natural
+.EXPORT: CXXFLAGS
+.ENDIF
.ENDIF
BUILD_ACTION=$(GNUMAKE) -j$(EXTMAXPROCESS)
commit 13c3668a0a8d33923f41de604138be5b72ca751e
Author: Ivo Hinkelmann <ihi at openoffice.org>
Date: Wed Sep 16 11:45:54 2009 +0000
CWS-TOOLING: integrate CWS l10nframework01
diff --git a/jfreereport/java/flute/makefile.mk b/jfreereport/java/flute/makefile.mk
index e68f9fd..5c949ad 100644
--- a/jfreereport/java/flute/makefile.mk
+++ b/jfreereport/java/flute/makefile.mk
@@ -42,7 +42,7 @@ VERSION=-1.3.0
.IF "$(SOLAR_JAVA)" != ""
# --- Files --------------------------------------------------------
-
+.IF "$(L10N_framework)"==""
TARFILE_NAME=$(TARGET)
TARFILE_ROOTDIR=$(TARGET)
# PATCH_FILES=$(PRJ)$/patches$/$(TARGET).patch
@@ -60,16 +60,17 @@ BUILD_ACTION=$(ANT) -Dlib="../../../class" -Dbuild.label="build-$(RSCREVISION)"
.ENDIF # $(SOLAR_JAVA)!= ""
# --- Targets ------------------------------------------------------
+.ENDIF
.INCLUDE : set_ext.mk
.INCLUDE : target.mk
.IF "$(SOLAR_JAVA)" != ""
.INCLUDE : tg_ext.mk
-
+.IF "$(L10N_framework)"==""
ALLTAR : $(CLASSDIR)$/$(TARGET)$(VERSION).jar
$(CLASSDIR)$/$(TARGET)$(VERSION).jar : $(PACKAGE_DIR)$/$(INSTALL_FLAG_FILE)
$(COPY) $(PACKAGE_DIR)$/$(TARFILE_ROOTDIR)$/build$/lib$/$(TARGET).jar $(CLASSDIR)$/$(TARGET)$(VERSION).jar
-
+.ENDIF
.ENDIF
diff --git a/jfreereport/java/jfreereport/makefile.mk b/jfreereport/java/jfreereport/makefile.mk
index 9399649..6e83b0e 100644
--- a/jfreereport/java/jfreereport/makefile.mk
+++ b/jfreereport/java/jfreereport/makefile.mk
@@ -42,7 +42,7 @@ VERSION=-0.9.2
.IF "$(SOLAR_JAVA)" != ""
# --- Files --------------------------------------------------------
-
+.IF "$(L10N_framework)"==""
TARFILE_NAME=core
TARFILE_ROOTDIR=core
PATCH_FILES=$(PRJ)$/patches$/$(TARGET).patch
@@ -58,7 +58,7 @@ BUILD_ACTION=$(ANT) -Dlib="../../../class" -Dbuild.label="build-$(RSCREVISION)"
.ENDIF
.ENDIF # $(SOLAR_JAVA)!= ""
-
+.ENDIF
# --- Targets ------------------------------------------------------
.INCLUDE : set_ext.mk
@@ -66,9 +66,9 @@ BUILD_ACTION=$(ANT) -Dlib="../../../class" -Dbuild.label="build-$(RSCREVISION)"
.IF "$(SOLAR_JAVA)" != ""
.INCLUDE : tg_ext.mk
-
+.IF "$(L10N_framework)"==""
ALLTAR : $(CLASSDIR)$/$(TARGET)$(VERSION).jar
$(CLASSDIR)$/$(TARGET)$(VERSION).jar : $(PACKAGE_DIR)$/$(INSTALL_FLAG_FILE)
$(COPY) $(PACKAGE_DIR)$/$(TARFILE_ROOTDIR)$/build$/lib$/$(TARGET).jar $(CLASSDIR)$/$(TARGET)$(VERSION).jar
-
+.ENDIF
.ENDIF
diff --git a/jfreereport/java/libbase/makefile.mk b/jfreereport/java/libbase/makefile.mk
index c11070d..9c1d8cf 100644
--- a/jfreereport/java/libbase/makefile.mk
+++ b/jfreereport/java/libbase/makefile.mk
@@ -64,6 +64,7 @@ BUILD_ACTION=$(ANT) -Dlib="../../../class" -Dbuild.label="build-$(RSCREVISION)"
.INCLUDE : target.mk
.IF "$(SOLAR_JAVA)" != ""
+.IF "$(L10N_framework)"==""
.INCLUDE : tg_ext.mk
ALLTAR : $(CLASSDIR)$/$(TARGET)$(VERSION).jar
@@ -84,4 +85,4 @@ $(CLASSDIR)$/commons-logging.jar :
$(CLASSDIR)$/$(TARGET)$(VERSION).jar : $(CLASSDIR)$/commons-logging.jar $(PACKAGE_DIR)$/$(INSTALL_FLAG_FILE)
$(COPY) $(PACKAGE_DIR)$/$(TARFILE_ROOTDIR)$/build$/lib$/$(TARGET).jar $(CLASSDIR)$/$(TARGET)$(VERSION).jar
.ENDIF
-
+.ENDIF
diff --git a/jfreereport/java/libfonts/makefile.mk b/jfreereport/java/libfonts/makefile.mk
index e8e2893..e7f6b17 100644
--- a/jfreereport/java/libfonts/makefile.mk
+++ b/jfreereport/java/libfonts/makefile.mk
@@ -42,7 +42,7 @@ VERSION=-1.0.0
.IF "$(SOLAR_JAVA)" != ""
# --- Files --------------------------------------------------------
-
+.IF "$(L10N_framework)"==""
TARFILE_NAME=$(TARGET)
TARFILE_ROOTDIR=$(TARGET)
PATCH_FILES=$(PRJ)$/patches$/$(TARGET).patch
@@ -57,18 +57,19 @@ BUILD_ACTION=$(ANT) -Dlib="../../../class" -Dbuild.label="build-$(RSCREVISION)"
.ENDIF
.ENDIF # $(SOLAR_JAVA)!= ""
-
+.ENDIF
# --- Targets ------------------------------------------------------
.INCLUDE : set_ext.mk
.INCLUDE : target.mk
-
+.IF "$(L10N_framework)"==""
.IF "$(SOLAR_JAVA)" != ""
.INCLUDE : tg_ext.mk
ALLTAR : $(CLASSDIR)$/$(TARGET)$(VERSION).jar
$(CLASSDIR)$/$(TARGET)$(VERSION).jar : $(PACKAGE_DIR)$/$(INSTALL_FLAG_FILE)
$(COPY) $(PACKAGE_DIR)$/$(TARFILE_ROOTDIR)$/build$/lib$/$(TARGET).jar $(CLASSDIR)$/$(TARGET)$(VERSION).jar
-
+
+.ENDIF
.ENDIF
diff --git a/jfreereport/java/libformula/makefile.mk b/jfreereport/java/libformula/makefile.mk
index 1e4a309..35a5b04 100644
--- a/jfreereport/java/libformula/makefile.mk
+++ b/jfreereport/java/libformula/makefile.mk
@@ -42,7 +42,7 @@ VERSION=-0.2.0
.IF "$(SOLAR_JAVA)" != ""
# --- Files --------------------------------------------------------
-
+.IF "$(L10N_framework)"==""
TARFILE_NAME=$(TARGET)
TARFILE_ROOTDIR=$(TARGET)
PATCH_FILES=$(PRJ)$/patches$/$(TARGET).patch
@@ -60,12 +60,12 @@ BUILD_ACTION=$(ANT) -Dlib="../../../class" -Dbuild.label="build-$(RSCREVISION)"
.ENDIF # $(SOLAR_JAVA)!= ""
-
+.ENDIF
# --- Targets ------------------------------------------------------
.INCLUDE : set_ext.mk
.INCLUDE : target.mk
-
+.IF "$(L10N_framework)"==""
.IF "$(SOLAR_JAVA)" != ""
.INCLUDE : tg_ext.mk
@@ -77,4 +77,4 @@ $(CLASSDIR)$/$(TARGET)$(VERSION).jar : $(PACKAGE_DIR)$/$(INSTALL_FLAG_FILE)
# $(PACKAGE_DIR)$/$(TARFILE_ROOTDIR)$/source$/org$/jfree$/formula$/function$/information$/IsRef-Function.properties :
# @@-$(MKDIRHIER) $(@:d)
# $(MV) $(PACKAGE_DIR)$/$(TARFILE_ROOTDIR)$/source$/org$/jfree$/formula$/function$/information$/isRef-Function.properties $@
-
+.ENDIF
diff --git a/jfreereport/java/liblayout/makefile.mk b/jfreereport/java/liblayout/makefile.mk
index 409b971..30633b0 100644
--- a/jfreereport/java/liblayout/makefile.mk
+++ b/jfreereport/java/liblayout/makefile.mk
@@ -42,7 +42,7 @@ VERSION=-0.2.9
.IF "$(SOLAR_JAVA)" != ""
# --- Files --------------------------------------------------------
-
+.IF "$(L10N_framework)"==""
TARFILE_NAME=$(TARGET)
TARFILE_ROOTDIR=$(TARGET)
PATCH_FILES=$(PRJ)$/patches$/$(TARGET).patch
@@ -57,12 +57,12 @@ BUILD_ACTION=$(ANT) -Dlib="../../../class" -Dbuild.label="build-$(RSCREVISION)"
.ENDIF
.ENDIF # $(SOLAR_JAVA)!= ""
-
+.ENDIF
# --- Targets ------------------------------------------------------
.INCLUDE : set_ext.mk
.INCLUDE : target.mk
-
+.IF "$(L10N_framework)"==""
.IF "$(SOLAR_JAVA)" != ""
.INCLUDE : tg_ext.mk
@@ -71,4 +71,4 @@ $(CLASSDIR)$/$(TARGET)$(VERSION).jar : $(PACKAGE_DIR)$/$(INSTALL_FLAG_FILE)
$(COPY) $(PACKAGE_DIR)$/$(TARFILE_ROOTDIR)$/build$/lib$/$(TARGET).jar $(CLASSDIR)$/$(TARGET)$(VERSION).jar
.ENDIF
-
+.ENDIF
diff --git a/jfreereport/java/libloader/makefile.mk b/jfreereport/java/libloader/makefile.mk
index 9cb1e93..6b6e95d 100644
--- a/jfreereport/java/libloader/makefile.mk
+++ b/jfreereport/java/libloader/makefile.mk
@@ -47,7 +47,7 @@ TARFILE_NAME=$(TARGET)
TARFILE_ROOTDIR=$(TARGET)
PATCH_FILES=$(PRJ)$/patches$/$(TARGET).patch
CONVERTFILES=build.xml
-
+.IF "$(L10N_framework)"==""
.IF "$(JAVACISGCJ)"=="yes"
JAVA_HOME=
.EXPORT : JAVA_HOME
@@ -57,12 +57,12 @@ BUILD_ACTION=$(ANT) -Dlib="../../../class" -Dbuild.label="build-$(RSCREVISION)"
.ENDIF
.ENDIF # $(SOLAR_JAVA)!= ""
-
+.ENDIF
# --- Targets ------------------------------------------------------
.INCLUDE : set_ext.mk
.INCLUDE : target.mk
-
+.IF "$(L10N_framework)"==""
.IF "$(SOLAR_JAVA)" != ""
.INCLUDE : tg_ext.mk
@@ -71,4 +71,4 @@ $(CLASSDIR)$/$(TARGET)$(VERSION).jar : $(PACKAGE_DIR)$/$(INSTALL_FLAG_FILE)
$(COPY) $(PACKAGE_DIR)$/$(TARFILE_ROOTDIR)$/build$/lib$/$(TARGET).jar $(CLASSDIR)$/$(TARGET)$(VERSION).jar
.ENDIF
-
+.ENDIF
diff --git a/jfreereport/java/librepository/makefile.mk b/jfreereport/java/librepository/makefile.mk
index d6bdab7..7ab0fd6 100644
--- a/jfreereport/java/librepository/makefile.mk
+++ b/jfreereport/java/librepository/makefile.mk
@@ -47,7 +47,7 @@ TARFILE_NAME=$(TARGET)
TARFILE_ROOTDIR=$(TARGET)
PATCH_FILES=$(PRJ)$/patches$/$(TARGET).patch
CONVERTFILES=build.xml
-
+.IF "$(L10N_framework)"==""
.IF "$(JAVACISGCJ)"=="yes"
JAVA_HOME=
.EXPORT : JAVA_HOME
@@ -57,12 +57,12 @@ BUILD_ACTION=$(ANT) -Dlib="../../../class" -Dbuild.label="build-$(RSCREVISION)"
.ENDIF
.ENDIF # $(SOLAR_JAVA)!= ""
-
+.ENDIF
# --- Targets ------------------------------------------------------
.INCLUDE : set_ext.mk
.INCLUDE : target.mk
-
+.IF "$(L10N_framework)"==""
.IF "$(SOLAR_JAVA)" != ""
.INCLUDE : tg_ext.mk
@@ -71,4 +71,4 @@ $(CLASSDIR)$/$(TARGET)$(VERSION).jar : $(PACKAGE_DIR)$/$(INSTALL_FLAG_FILE)
$(COPY) $(PACKAGE_DIR)$/$(TARFILE_ROOTDIR)$/build$/lib$/$(TARGET).jar $(CLASSDIR)$/$(TARGET)$(VERSION).jar
.ENDIF
-
+.ENDIF
diff --git a/jfreereport/java/libserializer/makefile.mk b/jfreereport/java/libserializer/makefile.mk
index a062670..04b4fdb 100644
--- a/jfreereport/java/libserializer/makefile.mk
+++ b/jfreereport/java/libserializer/makefile.mk
@@ -42,7 +42,7 @@ VERSION=-1.0.0
.IF "$(SOLAR_JAVA)" != ""
# --- Files --------------------------------------------------------
-
+.IF "$(L10N_framework)"==""
TARFILE_NAME=$(TARGET)
TARFILE_ROOTDIR=$(TARGET)
PATCH_FILES=$(PRJ)$/patches$/$(TARGET).patch
@@ -57,12 +57,12 @@ BUILD_ACTION=$(ANT) -Dlib="../../../class" -Dbuild.label="build-$(RSCREVISION)"
.ENDIF
.ENDIF # $(SOLAR_JAVA)!= ""
-
+.ENDIF
# --- Targets ------------------------------------------------------
.INCLUDE : set_ext.mk
.INCLUDE : target.mk
-
+.IF "$(L10N_framework)"==""
.IF "$(SOLAR_JAVA)" != ""
.INCLUDE : tg_ext.mk
@@ -71,4 +71,4 @@ $(CLASSDIR)$/$(TARGET)$(VERSION).jar : $(PACKAGE_DIR)$/$(INSTALL_FLAG_FILE)
$(COPY) $(PACKAGE_DIR)$/$(TARFILE_ROOTDIR)$/build$/lib$/$(TARGET).jar $(CLASSDIR)$/$(TARGET)$(VERSION).jar
.ENDIF
-
+.ENDIF
diff --git a/jfreereport/java/libxml/makefile.mk b/jfreereport/java/libxml/makefile.mk
index fafb167..708cdcb 100644
--- a/jfreereport/java/libxml/makefile.mk
+++ b/jfreereport/java/libxml/makefile.mk
@@ -42,7 +42,7 @@ VERSION=-1.0.0
.IF "$(SOLAR_JAVA)" != ""
# --- Files --------------------------------------------------------
-
+.IF "$(L10N_framework)"==""
TARFILE_NAME=$(TARGET)
TARFILE_ROOTDIR=$(TARGET)
PATCH_FILES=$(PRJ)$/patches$/$(TARGET).patch
@@ -57,12 +57,12 @@ BUILD_ACTION=$(ANT) -Dlib="../../../class" -Dbuild.label="build-$(RSCREVISION)"
.ENDIF
.ENDIF # $(SOLAR_JAVA)!= ""
-
+.ENDIF
# --- Targets ------------------------------------------------------
.INCLUDE : set_ext.mk
.INCLUDE : target.mk
-
+.IF "$(L10N_framework)"==""
.IF "$(SOLAR_JAVA)" != ""
.INCLUDE : tg_ext.mk
@@ -71,4 +71,4 @@ $(CLASSDIR)$/$(TARGET)$(VERSION).jar : $(PACKAGE_DIR)$/$(INSTALL_FLAG_FILE)
$(COPY) $(PACKAGE_DIR)$/$(TARFILE_ROOTDIR)$/build$/lib$/$(TARGET).jar $(CLASSDIR)$/$(TARGET)$(VERSION).jar
.ENDIF
-
+.ENDIF
diff --git a/jfreereport/java/sac/makefile.mk b/jfreereport/java/sac/makefile.mk
index 0ce628e..f098269 100644
--- a/jfreereport/java/sac/makefile.mk
+++ b/jfreereport/java/sac/makefile.mk
@@ -38,6 +38,8 @@ TARGET=sac-1.3
.INCLUDE : settings.mk
+.IF "$(L10N_framework)"==""
+
# override buildfile
ANT_BUILDFILE=build.xml
@@ -65,12 +67,13 @@ BUILD_ACTION=$(ANT) -Dbuild.label="build-$(RSCREVISION)" -f $(ANT_BUILDFILE) all
.ENDIF
.ENDIF # $(SOLAR_JAVA)!= ""
-
+.ENDIF # L10N_framework
# --- Targets ------------------------------------------------------
.INCLUDE : set_ext.mk
.INCLUDE : target.mk
+.IF "$(L10N_framework)"==""
.IF "$(SOLAR_JAVA)" != ""
.INCLUDE : tg_ext.mk
@@ -79,4 +82,5 @@ ALLTAR : $(CLASSDIR)$/sac.jar
$(CLASSDIR)$/sac.jar : $(PACKAGE_DIR)$/$(INSTALL_FLAG_FILE)
$(COPY) $(PACKAGE_DIR)$/$(TARFILE_ROOTDIR)$/build$/lib$/sac.jar $(CLASSDIR)$/sac.jar
.ENDIF
+.ENDIF # L10N_framework
diff --git a/reportbuilder/util/makefile.mk b/reportbuilder/util/makefile.mk
index 1eb38b6..cd65b81 100644
--- a/reportbuilder/util/makefile.mk
+++ b/reportbuilder/util/makefile.mk
@@ -42,7 +42,7 @@ EXTENSION_VERSION_BASE=1.2.0
# --- Settings ----------------------------------
.INCLUDE : makefile.pmk
-
+.IF "$(L10N_framework)"==""
# ------------------------------------------------------------------
# calready set in util$/makefile.pmk
# EXTENSIONNAME:=sun-report-builder
@@ -122,13 +122,13 @@ COMPONENT_MANIFEST_SEARCHDIR:=registry
# make sure to add your custom files here
EXTENSION_PACKDEPS=$(COMPONENT_EXTJARFILES) $(COMPONENT_HTMLFILES) $(COMPONENT_OTR_FILES) $(COMPONENT_HELP) $(COMPONENT_IMAGES)
-
+.ENDIF
# --- Targets ----------------------------------
.INCLUDE : extension_pre.mk
.INCLUDE : target.mk
.INCLUDE : extension_post.mk
-
+.IF "$(L10N_framework)"==""
$(EXTENSIONDIR)$/%.jar : $(SOLARBINDIR)$/%.jar
@@-$(MKDIRHIER) $(@:d)
$(COPY) $< $@
@@ -152,7 +152,7 @@ $(COMPONENT_HELP) : $$(@:f)
$(DESCRIPTION_SRC): description.xml
+-$(RM) $@
$(TYPE) description.xml | $(SED) "s/#VERSION#/$(EXTENSION_VERSION)/" > $@
-
+.ENDIF
.ELSE # "$(SOLAR_JAVA)"!=""
.INCLUDE : target.mk
.ENDIF # "$(SOLAR_JAVA)"!=""
diff --git a/sdext/source/minimizer/makefile.mk b/sdext/source/minimizer/makefile.mk
index d3e13a0..89b1e16 100644
--- a/sdext/source/minimizer/makefile.mk
+++ b/sdext/source/minimizer/makefile.mk
@@ -37,6 +37,7 @@ ENABLE_EXCEPTIONS=TRUE
# --- Settings ----------------------------------
.INCLUDE : settings.mk
+.IF "$(L10N_framework)"==""
.INCLUDE : $(PRJ)$/source$/minimizer$/minimizer.pmk
.INCLUDE : $(PRJ)$/util$/makefile.pmk
@@ -122,8 +123,10 @@ EXTENSION_PACKDEPS=$(COMPONENT_BITMAPS) $(COMPONENT_HELP)
.INCLUDE : extension_pre.mk
+.ENDIF # L10N_framework
.INCLUDE : target.mk
+.IF "$(L10N_framework)"==""
.INCLUDE : extension_post.mk
$(COMPONENT_BITMAPS) : $(SOLARSRC)$/$(RSCDEFIMG)$/minimizer$/$$(@:f)
@@ -133,3 +136,5 @@ $(COMPONENT_BITMAPS) : $(SOLARSRC)$/$(RSCDEFIMG)$/minimizer$/$$(@:f)
$(COMPONENT_HELP) : help$/$$(@:f)
@@-$(MKDIRHIER) $(@:d)
$(COPY) $< $@
+
+.ENDIF # L10N_framework
diff --git a/sdext/source/pdfimport/makefile.mk b/sdext/source/pdfimport/makefile.mk
index d6cd478..f8c6f71 100644
--- a/sdext/source/pdfimport/makefile.mk
+++ b/sdext/source/pdfimport/makefile.mk
@@ -39,6 +39,9 @@ ENABLE_EXCEPTIONS=TRUE
MKDEPENDSOLVER:=
.INCLUDE: settings.mk
+
+.IF "$(L10N_framework)"==""
+
.INCLUDE: pdfisettings.pmk
INCPRE=-I$(PRJ)$/source$/pdfimport$/inc
@@ -132,7 +135,9 @@ COMPONENT_IMAGES=\
EXTENSION_PACKDEPS=$(CONVERTER_FILE) $(COMPONENT_DIALOGS) $(COMPONENT_HELP) $(COMPONENT_IMAGES) makefile.mk
.INCLUDE : extension_pre.mk
+.ENDIF # L10N_framework
.INCLUDE : target.mk
+.IF "$(L10N_framework)"==""
.INCLUDE : extension_post.mk
$(CONVERTER_FILE) : $(BIN)$/$$(@:f)
@@ -150,3 +155,5 @@ $(COMPONENT_HELP) : help$/$$(@:f)
$(COMPONENT_IMAGES) : images$/$$(@:f)
@@-$(MKDIRHIER) $(@:d)
$(COPY) $< $@
+.ENDIF # L10N_framework
+
diff --git a/sdext/source/presenter/makefile.mk b/sdext/source/presenter/makefile.mk
index 04b13a2..e8059dd 100644
--- a/sdext/source/presenter/makefile.mk
+++ b/sdext/source/presenter/makefile.mk
@@ -41,6 +41,7 @@ ENABLE_EXCEPTIONS=TRUE
.INCLUDE : rtlbootstrap.mk
.INCLUDE : settings.mk
+.IF "$(L10N_framework)"==""
.INCLUDE : $(PRJ)$/util$/makefile.pmk
.IF "$(ENABLE_PRESENTER_SCREEN)" == "NO"
@@ -257,9 +258,10 @@ PLATFORMID:=$(RTL_OS:l)_$(RTL_ARCH:l)
# --- Targets ----------------------------------
+.ENDIF # L10N_framework
.INCLUDE : target.mk
-
+.IF "$(L10N_framework)"==""
$(SLO)$/PresenterComponent.obj : $(INCCOM)$/PresenterExtensionIdentifier.hxx
$(INCCOM)$/PresenterExtensionIdentifier.hxx : PresenterExtensionIdentifier.txx
@@ -362,3 +364,8 @@ $(DESCRIPTION) $(PHONYDESC) : $$(@:f)
.ENDIF # "$(ENABLE_PRESENTER_SCREEN)" != "NO"
+.ELSE
+ivo:
+ $(ECHO)
+.ENDIF # L10N_framework
+
diff --git a/swext/mediawiki/makefile.mk b/swext/mediawiki/makefile.mk
index 0f7cca3..203ed62 100644
--- a/swext/mediawiki/makefile.mk
+++ b/swext/mediawiki/makefile.mk
@@ -32,7 +32,7 @@
PRJ=..
PRJNAME=swext
TARGET=mediawiki
-
+.IF "$(L10N_framework)"==""
.IF "$(ENABLE_MEDIAWIKI)" == "YES"
.INCLUDE : ant.mk
@@ -62,3 +62,6 @@ file://$(COMMONS_HTTPCLIENT_JAR) file://$(COMMONS_LOGGING_JAR)\"#" -i build.xml
@echo "MediaWiki Publisher extension disabled."
.ENDIF
+.ELSE
+pesudo:
+.ENDIF
More information about the ooo-build-commit
mailing list