diff options
| author | Bjoern Michaelsen <bjoern.michaelsen@canonical.com> | 2011-07-23 15:23:25 +0200 |
|---|---|---|
| committer | Bjoern Michaelsen <bjoern.michaelsen@canonical.com> | 2011-07-23 15:23:25 +0200 |
| commit | 853bfc8f7ff406f3c13ec44d2a18f1790be82c76 (patch) | |
| tree | 7b49c7c57db1b506c1b2f2688450d8a131dcf080 | |
| parent | 4dec74dce2ff658ce885c9f8d08561f9f7edce61 (diff) | |
keep gbuild calls consistent at now, even if it is a bit longer
| -rw-r--r-- | sw/Library_msword.mk | 6 | ||||
| -rw-r--r-- | sw/Library_sw.mk | 7 |
2 files changed, 8 insertions, 5 deletions
diff --git a/sw/Library_msword.mk b/sw/Library_msword.mk index c06bbcb79c..5ca4115ba6 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 e541473c2d..84471a3bca 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 \ |