[Libreoffice-commits] .: Branch 'feature/gnumake4' - sw/Library_msword.mk sw/Library_sw.mk

[Bjoern Michaelsen]

 sw/Library_msword.mk |    6 ++++--
 sw/Library_sw.mk     |    7 ++++---
 2 files changed, 8 insertions(+), 5 deletions(-)

New commits:
commit 853bfc8f7ff406f3c13ec44d2a18f1790be82c76
Author: Bjoern Michaelsen <bjoern.michaelsen at canonical.com>
Date:   Sat Jul 23 15:23:25 2011 +0200

    keep gbuild calls consistent at  now, even if it is a bit longer

diff --git a/sw/Library_msword.mk b/sw/Library_msword.mk
index c06bbcb..5ca4115 100644
--- a/sw/Library_msword.mk
+++ b/sw/Library_msword.mk
@@ -38,7 +38,6 @@ $(eval $(call gb_Library_set_include,msword,\
     -I$(WORKDIR)/inc/sw/sdi \
     -I$(WORKDIR)/Misc/sw/ \
     $$(INCLUDE) \
-	$(if $(filter YES,$(SYSTEM_LIBXML)),$(LIBXML_CFLAGS)) \
     -I$(OUTDIR)/inc/sw \
 ))
 
@@ -75,7 +74,10 @@ $(eval $(call gb_Library_add_linked_libs,msword,\
     $(gb_STDLIBS) \
 ))
 
-$(call gb_Library_use_external,msword,icuuc)
+$(eval $(call gb_Library_use_externals,msword,\
+	icuuc \
+	libxml2 \
+))
 
 $(eval $(call gb_Library_add_exception_objects,msword,\
     sw/source/filter/rtf/rtffld \
diff --git a/sw/Library_sw.mk b/sw/Library_sw.mk
index e541473..84471a3 100644
--- a/sw/Library_sw.mk
+++ b/sw/Library_sw.mk
@@ -42,7 +42,6 @@ $(eval $(call gb_Library_set_include,sw,\
     -I$(WORKDIR)/SdiTarget/sw/sdi \
     -I$(WORKDIR)/Misc/sw/ \
     $$(INCLUDE) \
-    $(if $(filter YES,$(SYSTEM_LIBXML)),$(LIBXML_CFLAGS)) \
     -I$(OUTDIR)/inc \
 ))
 
@@ -83,11 +82,13 @@ $(eval $(call gb_Library_add_linked_libs,sw,\
     vbahelper \
     vcl \
     xo \
-    xml2 \
     $(gb_STDLIBS) \
 ))
 
-$(call gb_Library_use_external,sw,icuuc)
+$(eval $(call gb_Library_use_externals,sw,\
+	icuuc \
+	libxml2 \
+))
 
 $(eval $(call gb_Library_add_exception_objects,sw,\
     sw/source/core/SwNumberTree/SwNodeNum \