5 files changed, 7 insertions, 86 deletions
diff --git a/canvas/Library_cairocanvas.mk b/canvas/Library_cairocanvas.mk
index 1bfd3c7dce1b..02b7fc323a59 100644
--- a/canvas/Library_cairocanvas.mk
+++ b/canvas/Library_cairocanvas.mk
@@ -47,22 +47,6 @@ $(eval $(call gb_Library_set_defs,cairocanvas,\
 ))
 endif
 
-ifeq ($(SYSTEM_CAIRO),YES)
-# FREETYPE_CLAGS from environment if ENABLE_CAIRO is used
-# $(CAIRO_CFLAGS) currently not set; taking usr/include directly
-$(eval $(call gb_Library_set_include,cairocanvas,\
-	$$(INCLUDE) \
-	$(FREETYPE_CFLAGS) \
-	-I/usr/include \
-))
-else
-$(eval $(call gb_Library_set_include,cairocanvas,\
-	$$(INCLUDE) \
-	-I$(OUTDIR)/inc/cairo \
-	$(FREETYPE_CFLAGS) \
-))
-endif
-
 $(eval $(call gb_Library_add_linked_libs,cairocanvas,\
 	sal \
 	stl \
@@ -96,6 +80,7 @@ $(eval $(call gb_Library_add_exception_objects,cairocanvas,\
 	canvas/source/cairo/cairo_textlayout \
 ))
 
+$(call gb_Library_use_external,cairocanvas,cairo)
 
 ifeq ($(OS),WNT)
 
@@ -103,18 +88,12 @@ $(eval $(call gb_Library_add_exception_objects,cairocanvas,\
 	canvas/source/cairo/cairo_win32_cairo \
 ))
 $(eval $(call gb_Library_add_linked_libs,cairocanvas,\
-	cairo \
 	gdi32 \
 	user32 \
 ))
 
 else
 
-$(eval $(call gb_Library_add_linked_libs,cairocanvas,\
-	cairo \
-	pixman-1 \
-))
-
 ifeq ($(OS),MACOSX)
 $(eval $(call gb_Library_add_exception_objects,cairocanvas,\
 	canvas/source/cairo/cairo_quartz_cairo \
diff --git a/sax/Library_expwrap.mk b/sax/Library_expwrap.mk
index 2c03ccf20f07..6bea2f3e077b 100644
--- a/sax/Library_expwrap.mk
+++ b/sax/Library_expwrap.mk
@@ -39,13 +39,6 @@ $(eval $(call gb_Library_set_defs,expwrap,\
 	$$(DEFS) \
 ))
 
-ifeq ($(SYSTEM_ZLIB),YES)
-$(eval $(call gb_Library_set_defs,expwrap,\
-	$$(DEFS) \
-	-DSYSTEM_ZLIB \
-))
-endif
-
 $(eval $(call gb_Library_add_linked_libs,expwrap,\
 	sal \
 	cppu \
@@ -54,24 +47,7 @@ $(eval $(call gb_Library_add_linked_libs,expwrap,\
     $(gb_STDLIBS) \
 ))
 
-ifeq ($(SYSTEM_EXPAT),YES)
-$(eval $(call gb_Library_set_defs,expwrap,\
-	$$(DEFS) \
-	-DSYSTEM_EXPAT \
-))
-$(eval $(call gb_Library_add_linked_libs,expwrap,\
-	expat \
-))
-else
-$(eval $(call gb_Library_set_defs,expwrap,\
-	$$(DEFS) \
-	-DXML_UNICODE \
-))
-$(eval $(call gb_Library_add_linked_static_libs,expwrap,\
-	expat_xmlparse \
-	expat_xmltok \
-))
-endif
+$(call gb_Library_use_external,expwrap,expat_utf16)
 
 $(eval $(call gb_Library_add_exception_objects,expwrap,\
 	sax/source/expatwrap/attrlistimpl \
diff --git a/sax/Library_fastsax.mk b/sax/Library_fastsax.mk
index 1ee51eeffb92..e45fa5021311 100644
--- a/sax/Library_fastsax.mk
+++ b/sax/Library_fastsax.mk
@@ -55,20 +55,7 @@ $(eval $(call gb_Library_set_defs,fastsax,\
 ))
 endif
 
-ifeq ($(SYSTEM_EXPAT),YES)
-$(eval $(call gb_Library_set_defs,fastsax,\
-	$$(DEFS) \
-	-DSYSTEM_EXPAT \
-))
-$(eval $(call gb_Library_add_linked_libs,fastsax,\
-	expat \
-))
-else
-$(eval $(call gb_Library_add_linked_static_libs,fastsax,\
-	expat_xmlparse \
-	expat_xmltok \
-))
-endif
+$(call gb_Library_use_external,fastsax,expat_utf8)
 
 # re-uses xml2utf object from sax.uno lib (see below)
 $(eval $(call gb_Library_add_exception_objects,fastsax,\
diff --git a/svtools/Library_svt.mk b/svtools/Library_svt.mk
index c7dab0f17746..a06a238bcce3 100644
--- a/svtools/Library_svt.mk
+++ b/svtools/Library_svt.mk
@@ -58,7 +58,6 @@ $(eval $(call gb_Library_add_linked_libs,svt,\
     cppuhelper \
     i18nisolang1 \
     i18nutil \
-    icuuc \
     jvmfwk \
     sal \
     sot \
@@ -73,18 +72,10 @@ $(eval $(call gb_Library_add_linked_libs,svt,\
     $(gb_STDLIBS) \
 ))
 
-ifeq ($(SYSTEM_JPEG),YES)
-$(eval $(call gb_Library_add_linked_libs,svt,\
+$(call gb_Library_use_externals,svt,\
+	icuuc \
     jpeg \
-))
-$(eval $(call gb_Library_set_ldflags,svt,\
-    $$(filter-out -L/usr/lib/jvm%,$$(LDFLAGS)) \
-))
-else
-$(eval $(call gb_Library_add_linked_static_libs,svt,\
-    jpeglib \
-))
-endif
+)
 
 $(eval $(call gb_Library_add_exception_objects,svt,\
     svtools/source/brwbox/brwbox1 \
diff --git a/tools/Library_tl.mk b/tools/Library_tl.mk
index 4e676f2c3436..234ff7c6ec75 100644
--- a/tools/Library_tl.mk
+++ b/tools/Library_tl.mk
@@ -126,19 +126,7 @@ $(eval $(call gb_Library_add_exception_objects,tl,\
 ))
 endif
 
-ifeq ($(SYSTEM_ZLIB),YES)
-$(eval $(call gb_Library_set_cxxflags,tl,\
-    $$(CXXFLAGS) \
-    -DSYSTEM_ZLIB \
-))
-$(eval $(call gb_Library_add_linked_libs,tl,\
-    z \
-))
-else
-$(eval $(call gb_Library_add_linked_static_libs,tl,\
-    zlib \
-))
-endif
+$(call gb_Library_use_external,tl,zlib)
 
 ifeq ($(OS),WNT)