[Libreoffice-commits] .: vcl/Library_vclplug_gtk.mk
Bjoern Michaelsen
bmichaelsen at kemper.freedesktop.org
Tue Jul 26 06:18:27 PDT 2011
vcl/Library_vclplug_gtk.mk | 13 +++----------
1 file changed, 3 insertions(+), 10 deletions(-)
New commits:
commit b4e6842ba21e1a3e9c035621de10df16b9c883bc
Author: Bjoern Michaelsen <bjoern.michaelsen at canonical.com>
Date: Tue Jul 26 15:18:07 2011 +0200
use gtk and gthread externals in vclplug_gtk, add FIXME for dbus
diff --git a/vcl/Library_vclplug_gtk.mk b/vcl/Library_vclplug_gtk.mk
index b6305fc..15faba0 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 \
))
More information about the Libreoffice-commits
mailing list