use gb_Library_use_external in writerfilter

5 files changed, 10 insertions, 12 deletions

diff --git a/writerfilter/Library_doctok.mk b/writerfilter/Library_doctok.mk
index 1b56bb8f9c91..271517063dcd 100644
--- a/writerfilter/Library_doctok.mk
+++ b/writerfilter/Library_doctok.mk
@@ -35,7 +35,6 @@ $(eval $(call gb_Library_set_include,doctok,\
     -I$(WORKDIR)/CustomTarget/writerfilter/source \
     -I$(WORKDIR)/CustomTarget/writerfilter/source/ooxml \
     -I$(WORKDIR)/CustomTarget/writerfilter/source/doctok \
-	$(if $(filter YES,$(SYSTEM_LIBXML)),$(filter -I%,$(LIBXML_CFLAGS))) \
     -I$(OUTDIR)/inc \
 ))
 
@@ -44,7 +43,6 @@ include $(realpath $(SRCDIR)/writerfilter/debug_setup.mk)
 $(eval $(call gb_Library_add_defs,doctok,\
 	-DWRITERFILTER_DOCTOK_DLLIMPLEMENTATION \
 	$(writerfilter_debug_flags) \
-	$(if $(filter YES,$(SYSTEM_LIBXML)),$(filter-out -I%,$(LIBXML_CFLAGS))) \
 ))
 
 $(eval $(call gb_Library_add_api,doctok,\
@@ -60,6 +58,8 @@ $(eval $(call gb_Library_add_linked_libs,doctok,\
     $(gb_STDLIBS) \
 ))
 
+$(eval $(call gb_Library_use_external,doctoc,libxml2))
+
 $(eval $(call gb_Library_add_exception_objects,doctok,\
     writerfilter/source/doctok/Dff \
     writerfilter/source/doctok/DffImpl \
diff --git a/writerfilter/Library_ooxml.mk b/writerfilter/Library_ooxml.mk
index 902703da74dc..1d8375c4bb2d 100644
--- a/writerfilter/Library_ooxml.mk
+++ b/writerfilter/Library_ooxml.mk
@@ -42,14 +42,12 @@ $(eval $(call gb_Library_set_include,ooxml,\
 	-I$(WORKDIR)/CustomTarget/writerfilter/source/doctok \
     -I$(WORKDIR)/writerfilter/inc \
     -I$(WORKDIR)/writerfilter/inc/ooxml \
-	$(if $(filter YES,$(SYSTEM_LIBXML)),$(filter -I%,$(LIBXML_CFLAGS))) \
     -I$(OUTDIR)/inc \
 ))
 
 $(eval $(call gb_Library_add_defs,ooxml,\
 	-DWRITERFILTER_OOXML_DLLIMPLEMENTATION \
 	$(writerfilter_debug_flags) \
-	$(if $(filter YES,$(SYSTEM_LIBXML)),$(filter-out -I%,$(LIBXML_CFLAGS))) \
 ))
 
 $(eval $(call gb_Library_add_api,ooxml,\
@@ -70,6 +68,8 @@ $(eval $(call gb_Library_add_linked_libs,ooxml,\
     $(gb_STDLIBS) \
 ))
 
+$(eval $(call gb_Library_use_external,ooxml,libxml2))
+
 $(eval $(call gb_Library_add_exception_objects,ooxml,\
     writerfilter/source/dmapper/BorderHandler \
     writerfilter/source/dmapper/CellColorHandler \
diff --git a/writerfilter/Library_resourcemodel.mk b/writerfilter/Library_resourcemodel.mk
index 422d5188f292..423b7af06332 100644
--- a/writerfilter/Library_resourcemodel.mk
+++ b/writerfilter/Library_resourcemodel.mk
@@ -31,7 +31,6 @@ $(eval $(call gb_Library_set_include,resourcemodel,\
     $$(INCLUDE) \
     -I$(realpath $(SRCDIR)/writerfilter/inc) \
     -I$(WORKDIR)/CustomTarget/writerfilter/source \
-    $(if $(filter YES,$(SYSTEM_LIBXML)),$(filter -I%,$(LIBXML_CFLAGS))) \
     -I$(OUTDIR)/inc \
 ))
 
@@ -40,7 +39,6 @@ include $(SRCDIR)/writerfilter/debug_setup.mk
 $(eval $(call gb_Library_add_defs,resourcemodel,\
 	-DWRITERFILTER_RESOURCEMODEL_DLLIMPLEMENTATION \
 	$(writerfilter_debug_flags) \
-    $(if $(filter YES,$(SYSTEM_LIBXML)),$(filter-out -I%,$(LIBXML_CFLAGS))) \
 ))
 
 $(eval $(call gb_Library_add_api,resourcemodel,\
@@ -53,10 +51,11 @@ $(eval $(call gb_Library_add_linked_libs,resourcemodel,\
     cppu \
     cppuhelper \
     sal \
-    xml2 \
     $(gb_STDLIBS) \
 ))
 
+$(eval $(call gb_Library_use_external,resourcemodel,libxml2))
+
 $(eval $(call gb_Library_add_exception_objects,resourcemodel,\
     writerfilter/source/resourcemodel/Fraction \
     writerfilter/source/resourcemodel/LoggedResources \
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 \
diff --git a/writerfilter/Library_writerfilter_uno.mk b/writerfilter/Library_writerfilter_uno.mk
index e2cefed909de..7177687a8277 100644
--- a/writerfilter/Library_writerfilter_uno.mk
+++ b/writerfilter/Library_writerfilter_uno.mk
@@ -30,13 +30,11 @@ $(eval $(call gb_Library_Library,writerfilter_uno))
 $(eval $(call gb_Library_set_include,writerfilter_uno,\
     $$(INCLUDE) \
     -I$(realpath $(SRCDIR)/writerfilter/inc) \
-	$(if $(filter YES,$(SYSTEM_LIBXML)),$(filter -I%,$(LIBXML_CFLAGS))) \
     -I$(OUTDIR)/inc \
 ))
 
 $(eval $(call gb_Library_add_defs,writerfilter_uno,\
 	-DWRITERFILTER_WRITERFILTER_UNO_DLLIMPLEMENTATION \
-	$(if $(filter YES,$(SYSTEM_LIBXML)),$(filter-out -I%,$(LIBXML_CFLAGS))) \
 ))
 
 $(eval $(call gb_Library_add_api,writerfilter_uno,\
@@ -56,6 +54,8 @@ $(eval $(call gb_Library_add_linked_libs,writerfilter_uno,\
     $(gb_STDLIBS) \
 ))
 
+$(eval $(call gb_Library_use_external,writerfilter_uno,libxml2))
+
 $(eval $(call gb_Library_add_exception_objects,writerfilter_uno,\
     writerfilter/unocomponent/component \
     writerfilter/unocomponent/debugservices/doctok/DocTokAnalyzeService \