gdm r5652 - in trunk: . daemon gui/simple-chooser gui/simple-greeter tests

[mccann svn gnome org]

Author: mccann
Date: Thu Jan 31 18:17:49 2008
New Revision: 5652
URL: http://svn.gnome.org/viewvc/gdm?rev=5652&view=rev

Log:
2008-01-31  William Jon McCann  <mccann jhu edu>

	* daemon/Makefile.am:
	* gui/simple-chooser/Makefile.am:
	* gui/simple-greeter/Makefile.am:
	* tests/Makefile.am:
	Pass convenience libs to linker ahead of global libs.
	Patch from <dmacks netspace org>
	Fixes #508169



Modified:
   trunk/ChangeLog
   trunk/daemon/Makefile.am
   trunk/gui/simple-chooser/Makefile.am
   trunk/gui/simple-greeter/Makefile.am
   trunk/tests/Makefile.am

Modified: trunk/daemon/Makefile.am
==============================================================================
--- trunk/daemon/Makefile.am	(original)
+++ trunk/daemon/Makefile.am	Thu Jan 31 18:17:49 2008
@@ -101,11 +101,11 @@
 	$(NULL)
 
 test_session_LDADD =		\
+	$(top_builddir)/common/libgdmcommon.la	\
 	$(XLIB_LIBS)		\
 	$(EXTRA_DAEMON_LIBS)	\
 	$(DAEMON_LIBS)		\
 	$(PAM_LIBS)		\
-	$(top_builddir)/common/libgdmcommon.la	\
 	$(NULL)
 
 libexec_PROGRAMS = 			\
@@ -146,10 +146,10 @@
 	$(NULL)
 
 gdm_simple_slave_LDADD = 			\
+	$(top_builddir)/common/libgdmcommon.la	\
 	$(XLIB_LIBS)				\
 	$(DAEMON_LIBS)				\
 	$(EXTRA_DAEMON_LIBS)                    \
-	$(top_builddir)/common/libgdmcommon.la	\
 	$(NULL)
 
 gdm_factory_slave_SOURCES = 		\
@@ -178,9 +178,9 @@
 	$(NULL)
 
 gdm_factory_slave_LDADD = 			\
+	$(top_builddir)/common/libgdmcommon.la	\
 	$(XLIB_LIBS)				\
 	$(DAEMON_LIBS)				\
-	$(top_builddir)/common/libgdmcommon.la	\
 	$(NULL)
 
 gdm_product_slave_SOURCES = 		\
@@ -209,10 +209,10 @@
 	$(NULL)
 
 gdm_product_slave_LDADD = 			\
+	$(top_builddir)/common/libgdmcommon.la	\
 	$(XLIB_LIBS)				\
 	$(DAEMON_LIBS)				\
 	$(EXTRA_DAEMON_LIBS)                    \
-	$(top_builddir)/common/libgdmcommon.la	\
 	$(NULL)
 
 gdm_xdmcp_chooser_slave_SOURCES = 		\
@@ -245,8 +245,8 @@
 	$(NULL)
 
 gdm_session_worker_LDADD = 			\
-	$(DAEMON_LIBS)				\
 	$(top_builddir)/common/libgdmcommon.la	\
+	$(DAEMON_LIBS)				\
 	$(NULL)
 
 sbin_PROGRAMS = 			\
@@ -310,11 +310,11 @@
 	$(NULL)
 
 gdm_binary_LDADD = \
+	$(top_builddir)/common/libgdmcommon.la	\
 	$(XLIB_LIBS)				\
 	$(DAEMON_LIBS)				\
 	$(XDMCP_LIBS)                           \
 	$(LIBWRAP_LIBS)                         \
-	$(top_builddir)/common/libgdmcommon.la	\
 	$(NULL)
 
 if WITH_CONSOLE_KIT

Modified: trunk/gui/simple-chooser/Makefile.am
==============================================================================
--- trunk/gui/simple-chooser/Makefile.am	(original)
+++ trunk/gui/simple-chooser/Makefile.am	Thu Jan 31 18:17:49 2008
@@ -39,11 +39,11 @@
 	$(NULL)
 
 gdm_simple_chooser_LDADD = 		\
+	$(top_builddir)/common/libgdmcommon.la	\
 	$(GTK_LIBS)			\
 	$(EXTRA_CHOOSER_LIBS)   	\
 	$(SIMPLE_CHOOSER_LIBS)		\
 	$(XDMCP_LIBS)			\
-	$(top_builddir)/common/libgdmcommon.la	\
 	$(NULL)
 
 test_host_chooser_SOURCES = 		\
@@ -55,11 +55,11 @@
 	$(NULL)
 
 test_host_chooser_LDADD =		\
+	$(top_builddir)/common/libgdmcommon.la	\
 	$(GTK_LIBS)			\
 	$(EXTRA_CHOOSER_LIBS)   	\
 	$(SIMPLE_CHOOSER_LIBS)		\
 	$(XDMCP_LIBS)			\
-	$(top_builddir)/common/libgdmcommon.la	\
 	$(NULL)
 
 EXTRA_DIST = 			\

Modified: trunk/gui/simple-greeter/Makefile.am
==============================================================================
--- trunk/gui/simple-greeter/Makefile.am	(original)
+++ trunk/gui/simple-greeter/Makefile.am	Thu Jan 31 18:17:49 2008
@@ -71,8 +71,8 @@
 	$(NULL)
 
 test_greeter_panel_LDADD =	\
-	$(GTK_LIBS)		\
 	$(top_builddir)/gui/simple-greeter/libnotificationarea/libnotificationarea.la	\
+	$(GTK_LIBS)		\
 	$(NULL)
 
 test_remote_login_window_SOURCES = 	\
@@ -179,9 +179,9 @@
 	$(NULL)
 
 gdm_simple_greeter_LDADD = 		\
-	$(EXTRA_GREETER_LIBS)   	\
 	$(top_builddir)/common/libgdmcommon.la	\
 	$(top_builddir)/gui/simple-greeter/libnotificationarea/libnotificationarea.la	\
+	$(EXTRA_GREETER_LIBS)   	\
 	$(SIMPLE_GREETER_LIBS)		\
 	$(POLKIT_GNOME_LIBS)		\
 	$(RBAC_LIBS)			\

Modified: trunk/tests/Makefile.am
==============================================================================
--- trunk/tests/Makefile.am	(original)
+++ trunk/tests/Makefile.am	Thu Jan 31 18:17:49 2008
@@ -31,9 +31,9 @@
 	$(NULL)
 
 m_common_LDADD = 		\
+	$(top_builddir)/common/libgdmcommon.la	\
 	@CHECK_LIBS@		\
 	$(COMMON_LIBS)		\
 	$(EXTRA_TEST_LIBS)	\
-	$(top_builddir)/common/libgdmcommon.la	\
 	$(NULL)