vcl2gnumake: #i116588# support all optional link and cflags

3 files changed, 113 insertions, 7 deletions

diff --git a/vcl/Library_vcl.mk b/vcl/Library_vcl.mk
index 0a1648ed3114..b7d0999fe28c 100755
--- a/vcl/Library_vcl.mk
+++ b/vcl/Library_vcl.mk
@@ -58,7 +58,7 @@ endif
 $(eval $(call gb_Library_set_defs,vcl,\
     $$(DEFS) \
     -DVCL_DLLIMPLEMENTATION \
-    -DCUI_DLL_NAME=\"$(gb_Library_SYSPRE)cui$(gb_Library_OOOEXT)\" \
+    -DCUI_DLL_NAME=\"$(or $(call gb_Library_get_dllname,cui),$(call gb_Library_get_filename,cui))\" \
 ))
 
 $(eval $(call gb_Library_add_linked_libs,vcl,\
@@ -82,11 +82,7 @@ $(eval $(call gb_Library_add_linked_libs,vcl,\
 ))
 
 ifneq ($(ENABLE_GRAPHITE),)
-ifneq ($(OS),WNT)
-$(eval $(call gb_Library_add_linked_static_libs,vcl,\
-    graphite \
-))
-else
+ifeq ($(OS),WNT)
 $(eval $(call gb_Library_add_linked_libs,vcl,\
     graphite_dll \
 ))
@@ -103,6 +99,12 @@ $(eval $(call gb_Library_set_cxxflags,vcl,\
     $$(CXXFLAGS) \
     $$(OBJCXXFLAGS) \
 ))
+ifeq ($(ENABLE_CAIRO),TRUE)
+$(eval $(call gb_Library_set_defs,vclplug_gen,\
+    $$(DEFS) \
+    -DCAIRO \
+))
+endif
 $(eval $(call gb_Library_add_objcxxobjects,vcl,\
     vcl/aqua/source/a11y/aqua11yactionwrapper \
     vcl/aqua/source/a11y/aqua11ycomponentwrapper \
@@ -177,13 +179,21 @@ $(eval $(call gb_Library_set_defs,vcl,\
     $$(DEFS) \
     -DSAL_DLLPREFIX=\"$(gb_Library_SYSPRE)\" \
     -DSAL_DLLPOSTFIX=\"$(gb_Library_OOOEXT)\" \
-    -D_XSALSET_LIBNAME=\"$(gb_Library_SYSPRE)spa$(gb_Library_OOOEXT)\" \
+    -D_XSALSET_LIBNAME=\"$(call gb_Library_get_filename,spa)\" \
 ))
+## handle fontconfig
 ifneq ($(ENABLE_FONTCONFIG),)
 $(eval $(call gb_Library_set_defs,vcl,\
     $$(DEFS) \
     -DENABLE_FONTCONFIG \
 ))
+## handle CUPS
+ifneq ($(ENABLE_CUPS),)
+$(eval $(call gb_Library_set_defs,vcl,\
+    $$(DEFS) \
+    -DENABLE_CUPS \
+))
+endif
 endif
 $(eval $(call gb_Library_add_exception_objects,vcl,\
     vcl/source/glyphs/gcach_ftyp \
@@ -404,6 +414,7 @@ $(eval $(call gb_Library_add_exception_objects,vcl,\
     vcl/source/window/wrkwin \
 ))
 
+## handle Graphite
 ifneq ($(ENABLE_GRAPHITE),)
 $(eval $(call gb_Library_set_defs,vcl,\
     $$(DEFS) \
@@ -420,6 +431,16 @@ $(eval $(call gb_Library_add_exception_objects,vcl,\
     vcl/source/glyphs/graphite_adaptors \
     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,\
+    graphite \
+))
+endif
 endif
 endif
 
diff --git a/vcl/Library_vclplug_gen.mk b/vcl/Library_vclplug_gen.mk
index cca106caf419..7d534aa211a3 100644
--- a/vcl/Library_vclplug_gen.mk
+++ b/vcl/Library_vclplug_gen.mk
@@ -121,6 +121,80 @@ $(eval $(call gb_Library_set_defs,vclplug_gen,\
     -DVCLPLUG_GEN_IMPLEMENTATION \
 ))
 
+
+## handle RandR 
+ifneq ($(ENABLE_RANDR),)
+$(eval $(call gb_Library_set_defs,vclplug_gen,\
+    $$(DEFS) \
+    -DUSE_RANDR \
+))
+ifeq ($(XRANDR_DLOPEN),FALSE)
+$(eval $(call gb_Library_set_cxxflags,vclplug_gen,\
+    $$(CXXFLAGS) \
+    $$(XRANDR_CFLAGS) \
+))
+else
+$(eval $(call gb_Library_set_defs,vclplug_gen,\
+    $$(DEFS) \
+    -DXRANDR_DLOPEN \
+))
+endif
+endif
+
+## handle Xinerama
+ifneq ($(USE_XINERAMA),NO)
+ifneq ($(OS),SOLARIS)
+# not Solaris
+$(eval $(call gb_Library_set_defs,vclplug_gen,\
+    $$(DEFS) \
+    -DUSE_XINERAMA_XORG \
+))
+ifeq ($(XINERAMA_LINK),dynamic)
+$(eval $(call gb_Library_set_ldflags,vclplug_gen,\
+    $$(LDFLAGS) \
+    -lXinerama \
+))
+else
+$(eval $(call gb_Library_set_ldflags,vclplug_gen,\
+    $$(LDFLAGS) \
+    -Wl,-Bstatic -lXinerama -Wl,-Bdynamic \
+))
+endif
+else
+# Solaris
+$(eval $(call gb_Library_set_defs,vclplug_gen,\
+    $$(DEFS) \
+    -DUSE_XINERAMA_XSUN \
+))
+ifeq ($(USE_XINERAMA_VERSION),Xorg)
+# Solaris, Xorg
+ifeq ($(XINERAMA_LINK),dynamic)
+$(eval $(call gb_Library_set_ldflags,vclplug_gen,\
+    $$(LDFLAGS) \
+    -lXinerama \
+))
+else
+$(eval $(call gb_Library_set_ldflags,vclplug_gen,\
+    $$(LDFLAGS) \
+    -Wl,-Bstatic -lXinerama -Wl,-Bdynamic \
+))
+endif
+endif
+endif
+endif
+
+## handle Render linking
+ifeq ($(XRENDER_LINK),YES)
+$(eval $(call gb_Library_set_defs,vclplug_gen,\
+    $$(DEFS) \
+    -DXRENDER_LINK \
+))
+$(eval $(call gb_Library_set_ldflags,vclplug_gen,\
+    $$(LDFLAGS) \
+    $(shell pkg-config --libs xrender) \
+))
+endif
+
 ifeq ($(OS),LINUX)
 $(eval $(call gb_Library_add_linked_libs,vclplug_gen,\
     dl \
diff --git a/vcl/Library_vclplug_gtk.mk b/vcl/Library_vclplug_gtk.mk
index 1b8e2d881640..d0df791bad7d 100644
--- a/vcl/Library_vclplug_gtk.mk
+++ b/vcl/Library_vclplug_gtk.mk
@@ -52,6 +52,17 @@ $(eval $(call gb_Library_set_defs,vclplug_gtk,\
     -DVERSION=\"$(UPD)$(LAST_MINOR)\" \
 ))
 
+ifneq ($(ENABLE_DBUS),)
+$(eval $(call gb_Library_set_defs,vclplug_gtk,\
+    $$(DEFS) \
+    -DENABLE_DBUS \
+))
+$(eval $(call gb_Library_set_ldflags,vclplug_gtk,\
+    $$(LDFLAGS) \
+    $(shell pkg-config --libs dbus-glib-1)\
+))
+endif
+
 $(eval $(call gb_Library_set_ldflags,vclplug_gtk,\
     $$(LDFLAGS) \
     $$(GTK_LIBS)\