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

[Bjoern Michaelsen]

 sw/Library_sw.mk |    8 +-------
 1 file changed, 1 insertion(+), 7 deletions(-)

New commits:
commit 23b784c83c44f8c7492c007b6ca5a657b2ba016b
Author: Bjoern Michaelsen <bjoern.michaelsen at canonical.com>
Date:   Wed Mar 16 15:12:07 2011 +0100

    better not use introduce global variables for the libxml include path

diff --git a/sw/Library_sw.mk b/sw/Library_sw.mk
index 1166210..4168c5f 100644
--- a/sw/Library_sw.mk
+++ b/sw/Library_sw.mk
@@ -33,12 +33,6 @@ $(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 \
@@ -48,7 +42,7 @@ $(eval $(call gb_Library_set_include,sw,\
     -I$(WORKDIR)/SdiTarget/sw/sdi \
     -I$(WORKDIR)/Misc/sw/ \
     $$(INCLUDE) \
-    $(_XML_INCLUDE) \
+    $(if $(filter YES,$(SYSTEM_LIBXML),$(LIBXML_CFLAGS)) \
     -I$(OUTDIR)/inc/offuh \
     -I$(OUTDIR)/inc \
 ))