summaryrefslogtreecommitdiff
path: root/sw/Library_msword.mk
diff options
context:
space:
mode:
authorBjoern Michaelsen <bjoern.michaelsen@canonical.com>2011-07-23 15:23:25 +0200
committerBjoern Michaelsen <bjoern.michaelsen@canonical.com>2011-07-23 15:23:25 +0200
commite7abd52dae05ded8ec217259372dd37f7e3f0658 (patch)
tree533c8dd993130ec781f201170a01b29e212f4316 /sw/Library_msword.mk
parent381c3050637e28b703f7d37349c0ec244f7b30d5 (diff)
keep gbuild calls consistent at now, even if it is a bit longer
Diffstat (limited to 'sw/Library_msword.mk')
-rw-r--r--sw/Library_msword.mk6
1 files changed, 4 insertions, 2 deletions
diff --git a/sw/Library_msword.mk b/sw/Library_msword.mk
index c06bbcb79c45..5ca4115ba6aa 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 \