diff options
| author | David Tardon <dtardon@redhat.com> | 2011-11-02 13:04:19 +0100 |
|---|---|---|
| committer | David Tardon <dtardon@redhat.com> | 2011-11-02 13:26:53 +0100 |
| commit | 337b07d872e903cdc5f4411d76aca873567eee81 (patch) | |
| tree | 2f9f2e55d9b937de223ffc1a731ca89b344c8859 | |
| parent | 1b717cee8c7e9d321dc8fdbfb47719cbd9b6c870 (diff) | |
use external
| -rw-r--r-- | vcl/Library_vclplug_gtk.mk | 15 | ||||
| -rw-r--r-- | vcl/Library_vclplug_gtk3.mk | 17 |
2 files changed, 5 insertions, 27 deletions
diff --git a/vcl/Library_vclplug_gtk.mk b/vcl/Library_vclplug_gtk.mk index 2e1983ecdb84..e2f9b8d68479 100644 --- a/vcl/Library_vclplug_gtk.mk +++ b/vcl/Library_vclplug_gtk.mk @@ -41,20 +41,6 @@ $(eval $(call gb_Library_add_defs,vclplug_gtk,\ -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)) \ -)) -$(eval $(call gb_Library_add_defs,vclplug_gtk,\ - -DENABLE_DBUS \ -)) -$(eval $(call gb_Library_add_libs,vclplug_gtk,\ - $(shell pkg-config --libs dbus-glib-1)\ -)) -endif - $(eval $(call gb_Library_add_api,vclplug_gtk,\ offapi \ udkapi \ @@ -84,6 +70,7 @@ $(eval $(call gb_Library_add_linked_libs,vclplug_gtk,\ )) $(eval $(call gb_Library_use_externals,vclplug_gtk,\ + dbus \ gtk \ gthread \ icule \ diff --git a/vcl/Library_vclplug_gtk3.mk b/vcl/Library_vclplug_gtk3.mk index 72e7a7596754..9c589ff71606 100644 --- a/vcl/Library_vclplug_gtk3.mk +++ b/vcl/Library_vclplug_gtk3.mk @@ -51,19 +51,6 @@ $(eval $(call gb_Library_add_api,vclplug_gtk3,\ udkapi \ )) -ifneq ($(ENABLE_DBUS),) -$(eval $(call gb_Library_set_include,vclplug_gtk3,\ - $$(INCLUDE) \ - $(filter -I%,$(shell pkg-config --cflags dbus-glib-1)) \ -)) -$(eval $(call gb_Library_add_defs,vclplug_gtk3,\ - -DENABLE_DBUS \ -)) -$(eval $(call gb_Library_add_libs,vclplug_gtk3,\ - $(shell pkg-config --libs dbus-glib-1)\ -)) -endif - $(eval $(call gb_Library_add_libs,vclplug_gtk3,\ $$(GTK3_LIBS) \ $$(GTHREAD_LIBS) \ @@ -92,6 +79,10 @@ $(eval $(call gb_Library_add_linked_libs,vclplug_gtk3,\ $(gb_STDLIBS) \ )) +$(eval $(call gb_Library_use_externals,vclplug_gtk,\ + dbus \ +)) + $(eval $(call gb_Library_add_exception_objects,vclplug_gtk3,\ vcl/unx/gtk3/a11y/gtk3atkaction \ vcl/unx/gtk3/a11y/gtk3atkbridge \ |