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:43:55 +0200 |
| commit | 0a5a7727e34787b7f1ee6e1e5e07aeb13bdf9ed5 (patch) | |
| tree | b779711292e73a54ce17f6519ae9ed821f4b4898 | |
| parent | a3410712994077e8a4687cc90da6f6299f2e5e7d (diff) | |
correctly build GTK systray icon
the setting was lost during move the GNU make
Signed-off-by: Petr Mladek <pmladek@suse.cz>
| -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 0709f60ba5..e46a581631 100755 --- a/sfx2/Library_qstart.mk +++ b/sfx2/Library_qstart.mk @@ -44,6 +44,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 4d2396bf06..c9ec52c7ab 100755 --- a/sfx2/Library_sfx.mk +++ b/sfx2/Library_sfx.mk @@ -56,6 +56,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 36dd915ca6..6cab93586a 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 |