summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRobert Nagy <robert@openbsd.org>2011-06-20 11:43:55 +0200
committerPetr Mladek <pmladek@suse.cz>2011-06-20 12:16:16 +0200
commit9d427bb9ebb491e4ce28c98ec511ca4cd11ce463 (patch)
treeb779711292e73a54ce17f6519ae9ed821f4b4898
parent0296fabc3ceafb000eb983f1889afb368012056f (diff)
correctly build GTK systray icon
the setting was lost during move the GNU make Signed-off-by: Petr Mladek <pmladek@suse.cz> Signed-off-by: Tor Lillqvist <tlillqvist@novell.com> Signed-off-by: Michael Meeks <michael.meeks@novell.com>
-rwxr-xr-xsfx2/Library_qstart.mk7
-rwxr-xr-xsfx2/Library_sfx.mk9
-rw-r--r--sfx2/source/appl/shutdownicon.cxx2
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