update gnumake pieces for system cairo

3 files changed, 10 insertions, 61 deletions

diff --git a/vcl/Library_vcl.mk b/vcl/Library_vcl.mk
index e10eb98009da..1cd58bcb3601 100644
--- a/vcl/Library_vcl.mk
+++ b/vcl/Library_vcl.mk
@@ -476,42 +476,10 @@ $(eval $(call gb_Library_add_exception_objects,vcl,\
 $(eval $(call gb_Library_add_defs,vcl,\
     -DENABLE_LIBRSVG \
 ))
-ifeq ($(SYSTEM_CAIRO),YES)
-$(eval $(call gb_Library_set_cxxflags,vcl,\
-    $$(CXXFLAGS) \
-    $$(CAIRO_CFLAGS) \
-    -DSYSTEM_CAIRO \
-))
-
-# CAIRO_LIBS contains both -L and -l options. Thes sets LDFLAGS which
-# goes early into the linking command line before the object files. So
-# on platforms where libraries are searched for symbols undefined at
-# that point as they occur on the command line, it is pointless to
-# search the cairo library at that point as no references to cairo
-# entries have been read from object files yet.
-$(eval $(call gb_Library_add_ldflags,vcl,\
-    $$(CAIRO_LIBS) \
-))
-
-# Thus we also need to add cairo to the list of linked libs. These go
-# after the object files on the linking command line.
-$(eval $(call gb_Library_add_linked_libs,vcl,\
-    cairo \
-))
-
-else
-$(eval $(call gb_Library_add_linked_libs,vcl,\
-    cairo \
-))
-ifeq ($(OS),LINUX)
-$(eval $(call gb_Library_add_linked_libs,vcl,\
-    freetype \
-    fontconfig \
-))
-endif
-endif
 endif
 
+$(eval $(call gb_Library_use_external,vcl,cairo))
+
 ifeq ($(GUIBASE),unx)
 $(eval $(call gb_Library_add_ldflags,vcl,\
 	$$(FONTCONFIG_LIBS) \
diff --git a/vcl/Library_vclplug_gen.mk b/vcl/Library_vclplug_gen.mk
index 99b319e453fa..8f5a2ebd16f2 100644
--- a/vcl/Library_vclplug_gen.mk
+++ b/vcl/Library_vclplug_gen.mk
@@ -67,21 +67,7 @@ $(eval $(call gb_Library_use_externals,vclplug_gen,\
 	icuuc \
 ))
 
-ifeq ($(SYSTEM_CAIRO),YES)
-$(eval $(call gb_Library_set_ldflags,vclplug_gen,\
-    $$(LDFLAGS) \
-    $$(CAIRO_LIBS) \
-))
-else
-$(eval $(call gb_Library_add_cxxflags,vclplug_gen,\
-    $$(FONTCONFIG_CFLAGS) \
-    $$(FREETYPE_CFLAGS) \
-))
-
-$(eval $(call gb_Library_add_linked_libs,vclplug_gen,\
-    cairo \
-))
-endif
+$(eval $(call gb_Library_use_external,vclplug_gen,cairo))
 
 $(eval $(call gb_Library_add_exception_objects,vclplug_gen,\
     vcl/unx/generic/app/i18n_cb \
diff --git a/vcl/Library_vclplug_gtk3.mk b/vcl/Library_vclplug_gtk3.mk
index 587d69376500..045ade7a1106 100644
--- a/vcl/Library_vclplug_gtk3.mk
+++ b/vcl/Library_vclplug_gtk3.mk
@@ -35,13 +35,12 @@ $(eval $(call gb_Library_set_include,vclplug_gtk3,\
     -I$(OUTDIR)/inc \
 ))
 
-$(eval $(call gb_Library_set_cxxflags,vclplug_gtk3,\
-    $$(CXXFLAGS) \
+$(eval $(call gb_Library_add_cxxflags,vclplug_gtk3,\
+    $$(INCLUDE) \
     $$(GTK3_CFLAGS) \
 ))
 
-$(eval $(call gb_Library_set_defs,vclplug_gtk3,\
-    $$(DEFS) \
+$(eval $(call gb_Library_add_defs,vclplug_gtk3,\
     -DVCLPLUG_GTK_IMPLEMENTATION \
     -DVERSION=\"$(UPD)$(LAST_MINOR)\" \
 ))
@@ -56,18 +55,15 @@ $(eval $(call gb_Library_set_include,vclplug_gtk3,\
 	$$(INCLUDE) \
 	$(filter -I%,$(shell pkg-config --cflags dbus-glib-1)) \
 ))
-$(eval $(call gb_Library_set_defs,vclplug_gtk3,\
-    $$(DEFS) \
+$(eval $(call gb_Library_add_defs,vclplug_gtk3,\
     -DENABLE_DBUS \
 ))
-$(eval $(call gb_Library_set_ldflags,vclplug_gtk3,\
-    $$(LDFLAGS) \
+$(eval $(call gb_Library_add_libs,vclplug_gtk3,\
     $(shell pkg-config --libs dbus-glib-1)\
 ))
 endif
 
-$(eval $(call gb_Library_set_ldflags,vclplug_gtk3,\
-    $$(LDFLAGS) \
+$(eval $(call gb_Library_add_libs,vclplug_gtk3,\
     $$(GTK3_LIBS) \
     $$(GTHREAD_LIBS) \
 ))
@@ -80,10 +76,9 @@ $(eval $(call gb_Library_add_linked_libs,vclplug_gtk3,\
     sot \
     ucbhelper \
     basegfx \
+    basebmp \
     comphelper \
     cppuhelper \
-    icuuc \
-    icule \
     i18nisolang1 \
     i18npaper \
     i18nutil \