diff options
| author | Robert Nagy <robert@openbsd.org> | 2011-06-20 11:43:55 +0200 |
|---|---|---|
| committer | Petr Mladek <pmladek@suse.cz> | 2011-06-20 11:47:42 +0200 |
| commit | 736b7fc2a701a65cdc87f36dc2741675644cf7ea (patch) | |
| tree | cd4e4cef8a02bee2608ca1f83dc68593fb3b83bc /sfx2 | |
| parent | 2cab78b1b472f33616c519eb02a769f4b85844fa (diff) | |
correctly build GTK systray icon
the setting was lost during move the GNU make
Signed-off-by: Petr Mladek <pmladek@suse.cz>
Diffstat (limited to 'sfx2')
| -rwxr-xr-x | sfx2/Library_qstart.mk | 7 | ||||
| -rwxr-xr-x | sfx2/Library_sfx.mk | 9 | ||||
| -rw-r--r-- | sfx2/source/appl/shutdownicon.cxx | 2 |
3 files changed, 17 insertions, 1 deletions
diff --git a/sfx2/Library_qstart.mk b/sfx2/Library_qstart.mk index 3d6d6232bd7b..881e78df5c37 100755 --- a/sfx2/Library_qstart.mk +++ b/sfx2/Library_qstart.mk @@ -48,6 +48,13 @@ $(eval $(call gb_Library_set_defs,qstart_gtk,\ -DENABLE_QUICKSTART_APPLET \ )) +ifeq ($(ENABLE_SYSTRAY_GTK),TRUE) +$(eval $(call gb_Library_set_defs,qstart_gtk,\ + $$(DEFS) \ + -DENABLE_SYSTRAY_GTK \ +)) +endif + $(eval $(call gb_Library_set_cflags,qstart_gtk,\ $$(CFLAGS) \ $(filter-out -I%,$(GTK_CFLAGS)) \ diff --git a/sfx2/Library_sfx.mk b/sfx2/Library_sfx.mk index e6231c8a6efb..58e23ade737e 100755 --- a/sfx2/Library_sfx.mk +++ b/sfx2/Library_sfx.mk @@ -60,6 +60,15 @@ $(eval $(call gb_Library_set_defs,sfx,\ -DSFX2_DLLIMPLEMENTATION \ )) +ifeq ($(ENABLE_SYSTRAY_GTK),TRUE) +$(eval $(call gb_Library_set_defs,sfx,\ + $$(DEFS) \ + -DENABLE_QUICKSTART_APPLET \ + -DENABLE_SYSTRAY_GTK \ + -DPLUGIN_NAME=libqstart_gtk$(gb_Library_OOOEXT) \ +)) +endif + $(eval $(call gb_Library_add_linked_libs,sfx,\ comphelper \ cppu \ diff --git a/sfx2/source/appl/shutdownicon.cxx b/sfx2/source/appl/shutdownicon.cxx index 5cd33826c6e1..32610f1fcead 100644 --- a/sfx2/source/appl/shutdownicon.cxx +++ b/sfx2/source/appl/shutdownicon.cxx @@ -90,7 +90,7 @@ extern "C" { static void SAL_CALL thisModule() {} } # endif #endif -#if defined(UNX) && defined(ENABLE_SYSTRAY_GTK) +#if defined(UNX) && defined(ENABLE_SYSTRAY_GTK) && !defined(PLUGIN_NAME) #define PLUGIN_NAME "libqstart_gtkli.so" #endif |