[Libreoffice-commits] .: Branch 'feature/gnumake4' - 2 commits - hwpfilter/Library_hwp.mk unoxml/Library_unordf.mk unoxml/Library_unoxml.mk writerfilter/Library_doctok.mk writerfilter/Library_ooxml.mk writerfilter/Library_resourcemodel.mk writerfilter/Library_writerfilter.mk writerfilter/Library_writerfilter_uno.mk
Bjoern Michaelsen
bmichaelsen at kemper.freedesktop.org
Sat Jul 23 06:26:50 PDT 2011
hwpfilter/Library_hwp.mk | 2 +-
unoxml/Library_unordf.mk | 4 ++--
unoxml/Library_unoxml.mk | 2 +-
writerfilter/Library_doctok.mk | 4 ++--
writerfilter/Library_ooxml.mk | 4 ++--
writerfilter/Library_resourcemodel.mk | 5 ++---
writerfilter/Library_writerfilter.mk | 5 ++---
writerfilter/Library_writerfilter_uno.mk | 4 ++--
8 files changed, 14 insertions(+), 16 deletions(-)
New commits:
commit aaa8940a1b08871c694f50db3e9b47388e0b7394
Author: Bjoern Michaelsen <bjoern.michaelsen at canonical.com>
Date: Sat Jul 23 15:23:21 2011 +0200
keep gbuild calls consistent at now, even if it is a bit longer
diff --git a/hwpfilter/Library_hwp.mk b/hwpfilter/Library_hwp.mk
index ee337a4..a3bfaf2 100644
--- a/hwpfilter/Library_hwp.mk
+++ b/hwpfilter/Library_hwp.mk
@@ -47,7 +47,7 @@ $(eval $(call gb_Library_add_linked_libs,hwp,\
$(gb_STDLIBS) \
))
-$(call gb_Library_use_external,hwp,zlib)
+$(eval $(call gb_Library_use_external,hwp,zlib))
ifeq ($(OS),WNT)
diff --git a/unoxml/Library_unordf.mk b/unoxml/Library_unordf.mk
index 2f709ff..6d91d72 100644
--- a/unoxml/Library_unordf.mk
+++ b/unoxml/Library_unordf.mk
@@ -45,10 +45,10 @@ $(eval $(call gb_Library_add_linked_libs,unordf,\
$(gb_STDLIBS) \
))
-$(call gb_Library_use_externals,unordf,\
+$(eval $(call gb_Library_use_externals,unordf,\
librdf \
libxslt \
-)
+))
$(eval $(call gb_Library_add_exception_objects,unordf,\
unoxml/source/rdf/CBlankNode \
diff --git a/unoxml/Library_unoxml.mk b/unoxml/Library_unoxml.mk
index a0ab78c..5081c1b 100644
--- a/unoxml/Library_unoxml.mk
+++ b/unoxml/Library_unoxml.mk
@@ -48,7 +48,7 @@ $(eval $(call gb_Library_add_linked_libs,unoxml,\
$(gb_STDLIBS) \
))
-$(call gb_Library_use_external,unoxml,libxml2)
+$(eval $(call gb_Library_use_external,unoxml,libxml2))
$(eval $(call gb_Library_add_exception_objects,unoxml,\
unoxml/source/dom/node \
commit b7f2eba1bbf694c3132e643abd2554dc4299b1bc
Author: Bjoern Michaelsen <bjoern.michaelsen at canonical.com>
Date: Sat Jul 23 14:11:23 2011 +0200
use gb_Library_use_external in writerfilter
diff --git a/writerfilter/Library_doctok.mk b/writerfilter/Library_doctok.mk
index 1b56bb8..2715170 100644
--- a/writerfilter/Library_doctok.mk
+++ b/writerfilter/Library_doctok.mk
@@ -35,7 +35,6 @@ $(eval $(call gb_Library_set_include,doctok,\
-I$(WORKDIR)/CustomTarget/writerfilter/source \
-I$(WORKDIR)/CustomTarget/writerfilter/source/ooxml \
-I$(WORKDIR)/CustomTarget/writerfilter/source/doctok \
- $(if $(filter YES,$(SYSTEM_LIBXML)),$(filter -I%,$(LIBXML_CFLAGS))) \
-I$(OUTDIR)/inc \
))
@@ -44,7 +43,6 @@ include $(realpath $(SRCDIR)/writerfilter/debug_setup.mk)
$(eval $(call gb_Library_add_defs,doctok,\
-DWRITERFILTER_DOCTOK_DLLIMPLEMENTATION \
$(writerfilter_debug_flags) \
- $(if $(filter YES,$(SYSTEM_LIBXML)),$(filter-out -I%,$(LIBXML_CFLAGS))) \
))
$(eval $(call gb_Library_add_api,doctok,\
@@ -60,6 +58,8 @@ $(eval $(call gb_Library_add_linked_libs,doctok,\
$(gb_STDLIBS) \
))
+$(eval $(call gb_Library_use_external,doctoc,libxml2))
+
$(eval $(call gb_Library_add_exception_objects,doctok,\
writerfilter/source/doctok/Dff \
writerfilter/source/doctok/DffImpl \
diff --git a/writerfilter/Library_ooxml.mk b/writerfilter/Library_ooxml.mk
index 902703d..1d8375c 100644
--- a/writerfilter/Library_ooxml.mk
+++ b/writerfilter/Library_ooxml.mk
@@ -42,14 +42,12 @@ $(eval $(call gb_Library_set_include,ooxml,\
-I$(WORKDIR)/CustomTarget/writerfilter/source/doctok \
-I$(WORKDIR)/writerfilter/inc \
-I$(WORKDIR)/writerfilter/inc/ooxml \
- $(if $(filter YES,$(SYSTEM_LIBXML)),$(filter -I%,$(LIBXML_CFLAGS))) \
-I$(OUTDIR)/inc \
))
$(eval $(call gb_Library_add_defs,ooxml,\
-DWRITERFILTER_OOXML_DLLIMPLEMENTATION \
$(writerfilter_debug_flags) \
- $(if $(filter YES,$(SYSTEM_LIBXML)),$(filter-out -I%,$(LIBXML_CFLAGS))) \
))
$(eval $(call gb_Library_add_api,ooxml,\
@@ -70,6 +68,8 @@ $(eval $(call gb_Library_add_linked_libs,ooxml,\
$(gb_STDLIBS) \
))
+$(eval $(call gb_Library_use_external,ooxml,libxml2))
+
$(eval $(call gb_Library_add_exception_objects,ooxml,\
writerfilter/source/dmapper/BorderHandler \
writerfilter/source/dmapper/CellColorHandler \
diff --git a/writerfilter/Library_resourcemodel.mk b/writerfilter/Library_resourcemodel.mk
index 422d518..423b7af 100644
--- a/writerfilter/Library_resourcemodel.mk
+++ b/writerfilter/Library_resourcemodel.mk
@@ -31,7 +31,6 @@ $(eval $(call gb_Library_set_include,resourcemodel,\
$$(INCLUDE) \
-I$(realpath $(SRCDIR)/writerfilter/inc) \
-I$(WORKDIR)/CustomTarget/writerfilter/source \
- $(if $(filter YES,$(SYSTEM_LIBXML)),$(filter -I%,$(LIBXML_CFLAGS))) \
-I$(OUTDIR)/inc \
))
@@ -40,7 +39,6 @@ include $(SRCDIR)/writerfilter/debug_setup.mk
$(eval $(call gb_Library_add_defs,resourcemodel,\
-DWRITERFILTER_RESOURCEMODEL_DLLIMPLEMENTATION \
$(writerfilter_debug_flags) \
- $(if $(filter YES,$(SYSTEM_LIBXML)),$(filter-out -I%,$(LIBXML_CFLAGS))) \
))
$(eval $(call gb_Library_add_api,resourcemodel,\
@@ -53,10 +51,11 @@ $(eval $(call gb_Library_add_linked_libs,resourcemodel,\
cppu \
cppuhelper \
sal \
- xml2 \
$(gb_STDLIBS) \
))
+$(eval $(call gb_Library_use_external,resourcemodel,libxml2))
+
$(eval $(call gb_Library_add_exception_objects,resourcemodel,\
writerfilter/source/resourcemodel/Fraction \
writerfilter/source/resourcemodel/LoggedResources \
diff --git a/writerfilter/Library_writerfilter.mk b/writerfilter/Library_writerfilter.mk
index 073b4ee..6d47672 100644
--- a/writerfilter/Library_writerfilter.mk
+++ b/writerfilter/Library_writerfilter.mk
@@ -30,7 +30,6 @@ $(eval $(call gb_Library_Library,writerfilter))
$(eval $(call gb_Library_set_include,writerfilter,\
$$(INCLUDE) \
-I$(realpath $(SRCDIR)/writerfilter/inc) \
- $(if $(filter YES,$(SYSTEM_LIBXML)),$(filter -I%,$(LIBXML_CFLAGS))) \
))
$(eval $(call gb_Library_add_api,writerfilter,\
@@ -45,7 +44,6 @@ include $(realpath $(SRCDIR)/writerfilter/debug_setup.mk)
$(eval $(call gb_Library_add_defs,writerfilter,\
-DWRITERFILTER_WRITERFILTER_DLLIMPLEMENTATION \
$(writerfilter_debug_flags) \
- $(if $(filter YES,$(SYSTEM_LIBXML)),$(filter-out -I%,$(LIBXML_CFLAGS))) \
))
$(eval $(call gb_Library_add_linked_libs,writerfilter,\
@@ -64,10 +62,11 @@ $(eval $(call gb_Library_add_linked_libs,writerfilter,\
svt \
tl \
utl \
- xml2 \
$(gb_STDLIBS) \
))
+$(eval $(call gb_Library_use_external,writerfilter,libxml2))
+
$(eval $(call gb_Library_add_exception_objects,writerfilter,\
writerfilter/source/filter/ImportFilter \
writerfilter/source/filter/RtfFilter \
diff --git a/writerfilter/Library_writerfilter_uno.mk b/writerfilter/Library_writerfilter_uno.mk
index e2cefed..7177687 100644
--- a/writerfilter/Library_writerfilter_uno.mk
+++ b/writerfilter/Library_writerfilter_uno.mk
@@ -30,13 +30,11 @@ $(eval $(call gb_Library_Library,writerfilter_uno))
$(eval $(call gb_Library_set_include,writerfilter_uno,\
$$(INCLUDE) \
-I$(realpath $(SRCDIR)/writerfilter/inc) \
- $(if $(filter YES,$(SYSTEM_LIBXML)),$(filter -I%,$(LIBXML_CFLAGS))) \
-I$(OUTDIR)/inc \
))
$(eval $(call gb_Library_add_defs,writerfilter_uno,\
-DWRITERFILTER_WRITERFILTER_UNO_DLLIMPLEMENTATION \
- $(if $(filter YES,$(SYSTEM_LIBXML)),$(filter-out -I%,$(LIBXML_CFLAGS))) \
))
$(eval $(call gb_Library_add_api,writerfilter_uno,\
@@ -56,6 +54,8 @@ $(eval $(call gb_Library_add_linked_libs,writerfilter_uno,\
$(gb_STDLIBS) \
))
+$(eval $(call gb_Library_use_external,writerfilter_uno,libxml2))
+
$(eval $(call gb_Library_add_exception_objects,writerfilter_uno,\
writerfilter/unocomponent/component \
writerfilter/unocomponent/debugservices/doctok/DocTokAnalyzeService \
More information about the Libreoffice-commits
mailing list