diff options
| author | Bjoern Michaelsen <bjoern.michaelsen@canonical.com> | 2012-11-14 09:40:46 +0100 |
|---|---|---|
| committer | Bjoern Michaelsen <bjoern.michaelsen@canonical.com> | 2012-11-14 13:53:01 +0100 |
| commit | 6bea834b4a4cc50b5eb3d53cf685ecb5e5ada315 (patch) | |
| tree | 0bfc0b2a6116dcf2e17a75f6aaeb6e478ef31069 /vcl/Library_vclplug_gtk.mk | |
| parent | 62a803dc46c1ffb5cba7f094868ce339feeecfda (diff) | |
only enable unity integration with enabled dbus and gio
Change-Id: I418e3c57e7c201529020864b1f4677ec4c24e2c8
Diffstat (limited to 'vcl/Library_vclplug_gtk.mk')
| -rw-r--r-- | vcl/Library_vclplug_gtk.mk | 19 |
1 files changed, 15 insertions, 4 deletions
diff --git a/vcl/Library_vclplug_gtk.mk b/vcl/Library_vclplug_gtk.mk index a70ce09193a1..a95ea19a0c62 100644 --- a/vcl/Library_vclplug_gtk.mk +++ b/vcl/Library_vclplug_gtk.mk @@ -89,16 +89,27 @@ $(eval $(call gb_Library_add_exception_objects,vclplug_gtk,\ vcl/unx/gtk/gdi/salnativewidgets-gtk \ vcl/unx/gtk/window/gtkframe \ vcl/unx/gtk/window/gtkobject \ - vcl/unx/gtk/window/gloactiongroup \ - vcl/unx/gtk/window/gtksalmenu \ - vcl/unx/gtk/window/glomenu \ - vcl/unx/gtk/window/hudawareness \ vcl/unx/gtk/fpicker/resourceprovider \ vcl/unx/gtk/fpicker/SalGtkPicker \ vcl/unx/gtk/fpicker/SalGtkFilePicker \ vcl/unx/gtk/fpicker/SalGtkFolderPicker \ )) +ifneq ($(ENABLE_DBUS),) +ifneq ($(ENABLE_GIO),) +$(eval $(call gb_Library_add_exception_objects,vclplug_gtk,\ + vcl/unx/gtk/window/gloactiongroup \ + vcl/unx/gtk/window/gtksalmenu \ + vcl/unx/gtk/window/glomenu \ + vcl/unx/gtk/window/hudawareness \ +)) +$(eval $(call gb_Library_add_defs,vclplug_gtk,\ + -DENABLE_GIO=$(ENABLE_GIO) \ + -DENABLE_DBUS=#(ENABLE_DBUS) \ +)) +endif +endif + ifeq ($(ENABLE_GTK_PRINT),TRUE) $(eval $(call gb_Library_add_exception_objects,vclplug_gtk,\ vcl/unx/gtk/gdi/gtkprintwrapper \ |