diff options
| author | Bjoern Michaelsen <bjoern.michaelsen@canonical.com> | 2011-03-16 15:12:07 +0100 |
|---|---|---|
| committer | Bjoern Michaelsen <bjoern.michaelsen@canonical.com> | 2011-03-16 15:12:07 +0100 |
| commit | 056c886e820da0047b13946447d770d6a0790a37 (patch) | |
| tree | 27c5d921ae8e07e3ab5fe8385758f5b6dde13910 /sw/Library_sw.mk | |
| parent | 23fc3d8a0205402783a9b9a047919c31aad28af2 (diff) | |
better not use introduce global variables for the libxml include path
Diffstat (limited to 'sw/Library_sw.mk')
| -rw-r--r-- | sw/Library_sw.mk | 8 |
1 files changed, 1 insertions, 7 deletions
diff --git a/sw/Library_sw.mk b/sw/Library_sw.mk index 1166210fafeb..4168c5fcdae9 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 \ )) |