[Libreoffice-commits] .: Branch 'integration/dev300_m101' - sw/Library_sw.mk

Norbert Thiebaud nthiebaud at kemper.freedesktop.org
Tue Mar 15 21:30:13 PDT 2011


 sw/Library_sw.mk |    7 +++++++
 1 file changed, 7 insertions(+)

New commits:
commit d68c566851cb70785c61b5b971a386b94897d704
Author: Norbert Thiebaud <nthiebaud at gmail.com>
Date:   Tue Mar 15 23:30:04 2011 -0500

    tempory hack to get the prober libxml include on SYSTEM_LIBXML=YES build

diff --git a/sw/Library_sw.mk b/sw/Library_sw.mk
index d9b0034..1166210 100644
--- a/sw/Library_sw.mk
+++ b/sw/Library_sw.mk
@@ -33,6 +33,12 @@ $(eval $(call gb_Library_add_precompiled_header,sw,$(SRCDIR)/sw/inc/pch/precompi
 
 $(eval $(call gb_Library_set_componentfile,sw,sw/util/sw))
 
+ifeq ($(strip $(SYSTEM_LIBXML)),YES)
+_XML_INCLUDE := $$(LIBXML_CFLAGS)
+else
+_XML_INCLUDE :=
+endif
+
 $(eval $(call gb_Library_set_include,sw,\
     -I$(SRCDIR)/sw/source/core/inc \
     -I$(SRCDIR)/sw/source/filter/inc \
@@ -42,6 +48,7 @@ $(eval $(call gb_Library_set_include,sw,\
     -I$(WORKDIR)/SdiTarget/sw/sdi \
     -I$(WORKDIR)/Misc/sw/ \
     $$(INCLUDE) \
+    $(_XML_INCLUDE) \
     -I$(OUTDIR)/inc/offuh \
     -I$(OUTDIR)/inc \
 ))


More information about the Libreoffice-commits mailing list