1 files changed, 25 insertions, 36 deletions
diff --git a/vcl/Library_vcl.mk b/vcl/Library_vcl.mk
index 19c1c9e7fcf6..7ca41baa4b62 100644
--- a/vcl/Library_vcl.mk
+++ b/vcl/Library_vcl.mk
@@ -28,15 +28,15 @@
 $(eval $(call gb_Library_Library,vcl))
 
 ifeq ($(OS),MACOSX)
-$(eval $(call gb_Library_set_componentfile,vcl,vcl/vcl.macosx,vcl/vcl))
+$(eval $(call gb_Library_set_componentfile,vcl,vcl/vcl.macosx))
 else ifeq ($(OS),WNT)
-$(eval $(call gb_Library_set_componentfile,vcl,vcl/vcl.windows,vcl/vcl))
+$(eval $(call gb_Library_set_componentfile,vcl,vcl/vcl.windows))
 else ifeq ($(GUIBASE),android)
 $(eval $(call gb_Library_set_componentfile,vcl,vcl/vcl.android,vcl/vcl))
 else ifeq ($(OS),IOS)
 $(eval $(call gb_Library_set_componentfile,vcl,vcl/vcl.ios,vcl/vcl))
 else
-$(eval $(call gb_Library_set_componentfile,vcl,vcl/vcl.unx,vcl/vcl))
+$(eval $(call gb_Library_set_componentfile,vcl,vcl/vcl.unx))
 endif
 
 $(eval $(call gb_Library_add_package_headers,vcl,vcl_inc))
@@ -56,15 +56,14 @@ $(eval $(call gb_Library_set_include,vcl,\
     -I$(WORKDIR)/CustomTarget/vcl/unx/generic/fontmanager \
 ))
 ifeq ($(GUIBASE),unx)
-$(eval $(call gb_Library_set_cxxflags,vcl,\
-    $$(CXXFLAGS) \
+$(eval $(call gb_Library_set_include,vcl,\
+	$$(INCLUDE) \
     $$(FONTCONFIG_CFLAGS) \
     $$(FREETYPE_CFLAGS) \
 ))
 endif
 
-$(eval $(call gb_Library_set_defs,vcl,\
-    $$(DEFS) \
+$(eval $(call gb_Library_add_defs,vcl,\
     -DVCL_DLLIMPLEMENTATION \
     -DCUI_DLL_NAME=\"$(call gb_Library_get_runtime_filename,cui)\" \
     -DDLLPOSTFIX=$(subst $(or $(gb_Library_DLLEXT),$(gb_Library_PLAINEXT)),,$(gb_Library_OOOEXT)) \
@@ -83,8 +82,6 @@ $(eval $(call gb_Library_add_linked_libs,vcl,\
     basegfx \
     comphelper \
     cppuhelper \
-    icuuc \
-    icule \
     i18nisolang1 \
     i18npaper \
     i18nutil \
@@ -94,10 +91,14 @@ $(eval $(call gb_Library_add_linked_libs,vcl,\
     $(gb_STDLIBS) \
 ))
 
+$(call gb_Library_use_externals,vcl,\
+	icule \
+	icuuc \
+)
+
 ifeq ($(GUIBASE),aqua)
-$(eval $(call gb_Library_set_cxxflags,vcl,\
-    $$(CXXFLAGS) \
-    $$(OBJCXXFLAGS) \
+$(eval $(call gb_Library_add_cxxflags,vcl,\
+    $(gb_OBJCXXFLAGS) \
 ))
 $(eval $(call gb_Library_add_objcxxobjects,vcl,\
     vcl/aqua/source/a11y/aqua11yactionwrapper \
@@ -169,16 +170,14 @@ $(eval $(call gb_Library_add_exception_objects,vcl,\
 endif
 
 ifeq ($(GUIBASE),unx)
-$(eval $(call gb_Library_set_defs,vcl,\
-    $$(DEFS) \
+$(eval $(call gb_Library_add_defs,vcl,\
     -DSAL_DLLPREFIX=\"$(gb_Library_SYSPRE)\" \
     -DSAL_DLLPOSTFIX=\"$(gb_Library_OOOEXT)\" \
     -D_XSALSET_LIBNAME=\"$(call gb_Library_get_runtime_filename,spa)\" \
 ))
 ## handle CUPS
 ifneq ($(ENABLE_CUPS),)
-$(eval $(call gb_Library_set_defs,vcl,\
-    $$(DEFS) \
+$(eval $(call gb_Library_add_defs,vcl,\
     -DENABLE_CUPS \
 ))
 endif
@@ -443,34 +442,28 @@ $(eval $(call gb_Library_add_exception_objects,vcl,\
 endif
 ## handle Graphite
 ifneq ($(ENABLE_GRAPHITE),)
-$(eval $(call gb_Library_set_defs,vcl,\
-    $$(DEFS) \
+# add defines, graphite sources for all platforms
+$(eval $(call gb_Library_add_defs,vcl,\
     -DENABLE_GRAPHITE \
 ))
 $(eval $(call gb_Library_add_exception_objects,vcl,\
     vcl/source/glyphs/graphite_features \
     vcl/source/glyphs/graphite_layout \
 ))
+
+# handle X11 platforms, which have additional files and possibly system graphite
 ifeq ($(GUIBASE),unx)
 $(eval $(call gb_Library_add_exception_objects,vcl,\
     vcl/source/glyphs/graphite_serverfont \
 ))
-ifeq ($(SYSTEM_GRAPHITE),YES)
-$(eval $(call gb_Library_set_ldflags,vcl,\
-    $$(LDFLAGS) \
-    $(GRAPHITE_LIBS)
-))
-else
-$(eval $(call gb_Library_add_linked_static_libs,vcl,\
-    graphite2_off \
-))
-endif
 else
 $(eval $(call gb_Library_add_linked_libs,vcl,\
     graphite2_off \
     version \
 ))
 endif
+
+$(call gb_Library_use_external,vcl,graphite)
 endif
 
 ## handle Cairo
@@ -539,13 +532,11 @@ endif
 
 ifeq ($(OS),SOLARIS)
 ifeq ($(CPUNAME)$(CPU),SPARCU)
-$(eval $(call gb_Library_set_ldflags,vcl,\
-    $$(LDFLAGS) \
+$(eval $(call gb_Library_add_ldflags,vcl,\
     -R/usr/sfw/lib/64 \
 ))
 else
-$(eval $(call gb_Library_set_ldflags,vcl,\
-    $$(LDFLAGS) \
+$(eval $(call gb_Library_add_ldflags,vcl,\
     -R/usr/sfw/lib \
 ))
 endif
@@ -555,8 +546,7 @@ ifeq ($(GUIBASE),aqua)
 $(eval $(call gb_Library_add_linked_libs,vcl,\
     AppleRemote \
 ))
-$(eval $(call gb_Library_set_ldflags,vcl,\
-    $$(LDFLAGS) \
+$(eval $(call gb_Library_add_libs,vcl,\
     -framework QuickTime \
     -framework Cocoa \
     -framework Carbon \
@@ -566,8 +556,7 @@ endif
 
 ifeq ($(OS),WNT)
 ifeq ($(COM),MSC)
-$(eval $(call gb_Library_set_ldflags,vcl,\
-    $$(LDFLAGS) \
+$(eval $(call gb_Library_add_ldflags,vcl,\
     /ENTRY:LibMain@12 \
 ))
 endif