summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--vcl/Library_vclplug_gtk.mk13
1 files changed, 3 insertions, 10 deletions
diff --git a/vcl/Library_vclplug_gtk.mk b/vcl/Library_vclplug_gtk.mk
index b6305fc13582..15faba01eefb 100644
--- a/vcl/Library_vclplug_gtk.mk
+++ b/vcl/Library_vclplug_gtk.mk
@@ -35,17 +35,13 @@ $(eval $(call gb_Library_set_include,vclplug_gtk,\
-I$(OUTDIR)/inc \
))
-$(eval $(call gb_Library_set_include,vclplug_gtk,\
- $$(INCLUDE) \
- $$(GTK_CFLAGS) \
-))
-
$(eval $(call gb_Library_add_defs,vclplug_gtk,\
-DVCLPLUG_GTK_IMPLEMENTATION \
-DVERSION=\"$(UPD)$(LAST_MINOR)\" \
))
ifneq ($(ENABLE_DBUS),)
+# FIXME: pkg-config calls should be done in configure, and this should be _use_external
$(eval $(call gb_Library_set_include,vclplug_gtk,\
$$(INCLUDE) \
$(filter -I%,$(shell pkg-config --cflags dbus-glib-1)) \
@@ -63,11 +59,6 @@ $(eval $(call gb_Library_add_api,vclplug_gtk,\
udkapi \
))
-$(eval $(call gb_Library_add_libs,vclplug_gtk,\
- $$(GTK_LIBS) \
- $$(GTHREAD_LIBS) \
-))
-
$(eval $(call gb_Library_add_linked_libs,vclplug_gtk,\
vclplug_gen \
vcl \
@@ -92,6 +83,8 @@ $(eval $(call gb_Library_add_linked_libs,vclplug_gtk,\
))
$(eval $(call gb_Library_use_externals,vclplug_gtk,\
+ gtk \
+ gthread \
icule \
icuuc \
))