diff options
| author | Bjoern Michaelsen <bjoern.michaelsen@canonical.com> | 2011-07-23 14:11:23 +0200 |
|---|---|---|
| committer | Bjoern Michaelsen <bjoern.michaelsen@canonical.com> | 2011-07-23 14:11:23 +0200 |
| commit | 969003ef690a52d6a698ac3564c741505f9adf1a (patch) | |
| tree | d12c0516c17937034f2d49e64cf7de8a2e9c49e4 /writerfilter/Library_writerfilter.mk | |
| parent | 4608deb5d90ba5b654229d6b226ec21c90ee3996 (diff) | |
use gb_Library_use_external in writerfilter
Diffstat (limited to 'writerfilter/Library_writerfilter.mk')
| -rw-r--r-- | writerfilter/Library_writerfilter.mk | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/writerfilter/Library_writerfilter.mk b/writerfilter/Library_writerfilter.mk index 073b4ee4373a..6d47672156b0 100644 --- a/writerfilter/Library_writerfilter.mk +++ b/writerfilter/Library_writerfilter.mk @@ -30,7 +30,6 @@ $(eval $(call gb_Library_Library,writerfilter)) $(eval $(call gb_Library_set_include,writerfilter,\ $$(INCLUDE) \ -I$(realpath $(SRCDIR)/writerfilter/inc) \ - $(if $(filter YES,$(SYSTEM_LIBXML)),$(filter -I%,$(LIBXML_CFLAGS))) \ )) $(eval $(call gb_Library_add_api,writerfilter,\ @@ -45,7 +44,6 @@ include $(realpath $(SRCDIR)/writerfilter/debug_setup.mk) $(eval $(call gb_Library_add_defs,writerfilter,\ -DWRITERFILTER_WRITERFILTER_DLLIMPLEMENTATION \ $(writerfilter_debug_flags) \ - $(if $(filter YES,$(SYSTEM_LIBXML)),$(filter-out -I%,$(LIBXML_CFLAGS))) \ )) $(eval $(call gb_Library_add_linked_libs,writerfilter,\ @@ -64,10 +62,11 @@ $(eval $(call gb_Library_add_linked_libs,writerfilter,\ svt \ tl \ utl \ - xml2 \ $(gb_STDLIBS) \ )) +$(eval $(call gb_Library_use_external,writerfilter,libxml2)) + $(eval $(call gb_Library_add_exception_objects,writerfilter,\ writerfilter/source/filter/ImportFilter \ writerfilter/source/filter/RtfFilter \ |