diff options
| author | Michael Stahl <mstahl@redhat.com> | 2011-11-02 17:49:42 +0100 |
|---|---|---|
| committer | Michael Stahl <mstahl@redhat.com> | 2011-11-02 17:49:42 +0100 |
| commit | 66d9925bb6e9c43aacfe9e4ac6f1ee10a8e25166 (patch) | |
| tree | ea3e9cb2bd0ca5a8fe7432908bdfdd5071f0773d /vcl/Library_vclplug_gtk3.mk | |
| parent | b2254d5d6fde8c28501e99e29bc824e935a25247 (diff) | |
| parent | f6f5c89259867b5aeb86d5509f826da949d122c4 (diff) | |
Merge branch 'master' of git://anongit.freedesktop.org/libreoffice/core
Diffstat (limited to 'vcl/Library_vclplug_gtk3.mk')
| -rw-r--r-- | vcl/Library_vclplug_gtk3.mk | 17 |
1 files changed, 4 insertions, 13 deletions
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 \ |