gnome-panel r11435 - in trunk/applets: clock fish notification_area wncklet

[vuntz svn gnome org]

Author: vuntz
Date: Wed Jan  7 14:35:10 2009
New Revision: 11435
URL: http://svn.gnome.org/viewvc/gnome-panel?rev=11435&view=rev

Log:
2009-01-07  Vincent Untz  <vuntz gnome org>

	* Makefile.am: add LIBPANEL_APPLET_LIBS to LDADD since we don't really
	use the libpanel-applet pkg-config file. Fix build issue with
	"-Wl,-z,defs".


Modified:
   trunk/applets/clock/ChangeLog
   trunk/applets/clock/Makefile.am
   trunk/applets/fish/ChangeLog
   trunk/applets/fish/Makefile.am
   trunk/applets/notification_area/ChangeLog
   trunk/applets/notification_area/Makefile.am
   trunk/applets/wncklet/ChangeLog
   trunk/applets/wncklet/Makefile.am

Modified: trunk/applets/clock/Makefile.am
==============================================================================
--- trunk/applets/clock/Makefile.am	(original)
+++ trunk/applets/clock/Makefile.am	Wed Jan  7 14:35:10 2009
@@ -67,6 +67,7 @@
 CLOCK_LDADD =						\
 	../../libpanel-applet/libpanel-applet-2.la	\
 	$(CLOCK_LIBS)					\
+	$(LIBPANEL_APPLET_LIBS)				\
 	$(POLKIT_GNOME_LIBS)				\
 	-lgweather
 

Modified: trunk/applets/fish/Makefile.am
==============================================================================
--- trunk/applets/fish/Makefile.am	(original)
+++ trunk/applets/fish/Makefile.am	Wed Jan  7 14:35:10 2009
@@ -14,7 +14,8 @@
 
 FISH_LDADD =						\
 	../../libpanel-applet/libpanel-applet-2.la	\
-	$(FISH_LIBS)
+	$(FISH_LIBS)					\
+	$(LIBPANEL_APPLET_LIBS)
 
 if FISH_INPROCESS
 APPLET_TYPE     = shlib

Modified: trunk/applets/notification_area/Makefile.am
==============================================================================
--- trunk/applets/notification_area/Makefile.am	(original)
+++ trunk/applets/notification_area/Makefile.am	Wed Jan  7 14:35:10 2009
@@ -32,7 +32,8 @@
 NOTIFICATION_AREA_LDADD =			\
 	../../libpanel-applet/libpanel-applet-2.la	\
 	$(X_LIBS)					\
-	$(NOTIFICATION_AREA_LIBS)
+	$(NOTIFICATION_AREA_LIBS)			\
+	$(LIBPANEL_APPLET_LIBS)
 
 if NOTIFICATION_AREA_INPROCESS
 APPLET_TYPE     = shlib

Modified: trunk/applets/wncklet/Makefile.am
==============================================================================
--- trunk/applets/wncklet/Makefile.am	(original)
+++ trunk/applets/wncklet/Makefile.am	Wed Jan  7 14:35:10 2009
@@ -31,7 +31,8 @@
 
 WNCKLET_LDADD =						\
 	../../libpanel-applet/libpanel-applet-2.la	\
-	$(WNCKLET_LIBS)
+	$(WNCKLET_LIBS)					\
+	$(LIBPANEL_APPLET_LIBS)
 
 if WNCKLET_INPROCESS
 APPLET_TYPE     = shlib