7c55a87
diff -up gnome-panel-2.32.0.2/applets/notification_area/Makefile.am.libs gnome-panel-2.32.0.2/applets/notification_area/Makefile.am
7c55a87
--- gnome-panel-2.32.0.2/applets/notification_area/Makefile.am.libs	2010-09-30 12:29:17.884603002 -0400
3860f36
+++ gnome-panel-2.32.0.2/applets/notification_area/Makefile.am	2010-09-30 13:11:01.996603010 -0400
6186773
@@ -1,5 +1,4 @@
6186773
 noinst_LTLIBRARIES = libtray.la
6186773
-noinst_PROGRAMS = testtray
6186773
 
6186773
 AM_CPPFLAGS =							\
6186773
 	$(NOTIFICATION_AREA_CFLAGS)				\
6186773
@@ -30,15 +29,15 @@ NOTIFICATION_AREA_SOURCES = main.c
7c55a87
 
7c55a87
 NOTIFICATION_AREA_LDADD =				\
7c55a87
 	../../libpanel-applet/libpanel-applet-3.la	\
7c55a87
-	$(X_LIBS)					\
3860f36
+	libtray.la					\
7c55a87
 	$(NOTIFICATION_AREA_LIBS)			\
7c55a87
 	$(LIBPANEL_APPLET_LIBS)				\
3860f36
-	libtray.la
3860f36
+	$(X_LIBS)
7c55a87
 
7c55a87
 testtray_SOURCES = testtray.c
7c55a87
 testtray_LDADD =			\
7c55a87
-	$(X_LIBS)			\
7c55a87
 	$(NOTIFICATION_AREA_LIBS)	\
7c55a87
+	$(X_LIBS)			\
7c55a87
 	libtray.la
7c55a87
 
7c55a87
 if NOTIFICATION_AREA_INPROCESS
4d57c98
diff -up gnome-panel-2.32.0.2/gnome-panel/Makefile.am.libs gnome-panel-2.32.0.2/gnome-panel/Makefile.am
7c55a87
--- gnome-panel-2.32.0.2/gnome-panel/Makefile.am.libs	2010-09-27 14:04:32.000000000 -0400
7c55a87
+++ gnome-panel-2.32.0.2/gnome-panel/Makefile.am	2010-09-30 12:27:42.928603001 -0400
4d57c98
@@ -147,7 +147,8 @@ gnome_desktop_item_edit_SOURCES =	\
cb6b679
 
5feb076
 gnome_desktop_item_edit_LDADD = 	\
5feb076
 	$(top_builddir)/gnome-panel/libpanel-util/libpanel-util.la \
4d57c98
-	$(PANEL_LIBS)
4d57c98
+	$(PANEL_LIBS) \
4d57c98
+	$(X_LIBS)
5feb076
 
4d57c98
 panel_test_applets_SOURCES =		\
4d57c98
 	panel-modules.c			\