From e7abd52dae05ded8ec217259372dd37f7e3f0658 Mon Sep 17 00:00:00 2001
From: Bjoern Michaelsen <bjoern.michaelsen@canonical.com>
Date: Sat, 23 Jul 2011 15:23:25 +0200
Subject: keep gbuild calls consistent at  now, even if it is a bit longer

---
 sw/Library_sw.mk | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

(limited to 'sw/Library_sw.mk')

diff --git a/sw/Library_sw.mk b/sw/Library_sw.mk
index e541473c2d9b..84471a3bca20 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 \
-- 
cgit