diff options
| -rw-r--r-- | ChangeLog | 10 | ||||
| -rw-r--r-- | daemon/Makefile.am | 12 | ||||
| -rw-r--r-- | gui/simple-chooser/Makefile.am | 4 | ||||
| -rw-r--r-- | gui/simple-greeter/Makefile.am | 4 | ||||
| -rw-r--r-- | tests/Makefile.am | 2 |
5 files changed, 21 insertions, 11 deletions
@@ -1,5 +1,15 @@ 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 + +2008-01-31 William Jon McCann <mccann@jhu.edu> + * daemon/gdm-xdmcp-chooser-slave.xml: Ooops. Forgot to add file. diff --git a/daemon/Makefile.am b/daemon/Makefile.am index 2e9c10bd..c4a61454 100644 --- a/daemon/Makefile.am +++ b/daemon/Makefile.am @@ -101,11 +101,11 @@ test_session_SOURCES = \ $(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 @@ gdm_simple_slave_LDFLAGS = \ $(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 @@ gdm_factory_slave_LDFLAGS = \ $(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 @@ gdm_product_slave_LDFLAGS = \ $(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 @@ gdm_session_worker_LDFLAGS = \ $(NULL) gdm_session_worker_LDADD = \ - $(DAEMON_LIBS) \ $(top_builddir)/common/libgdmcommon.la \ + $(DAEMON_LIBS) \ $(NULL) sbin_PROGRAMS = \ @@ -310,11 +310,11 @@ gdm_binary_LDFLAGS = \ $(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 diff --git a/gui/simple-chooser/Makefile.am b/gui/simple-chooser/Makefile.am index 8fabe53f..7ce17f70 100644 --- a/gui/simple-chooser/Makefile.am +++ b/gui/simple-chooser/Makefile.am @@ -39,11 +39,11 @@ gdm_simple_chooser_SOURCES = \ $(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 @@ test_host_chooser_SOURCES = \ $(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 = \ diff --git a/gui/simple-greeter/Makefile.am b/gui/simple-greeter/Makefile.am index 37aceca2..2da781eb 100644 --- a/gui/simple-greeter/Makefile.am +++ b/gui/simple-greeter/Makefile.am @@ -71,8 +71,8 @@ test_greeter_panel_SOURCES = \ $(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 @@ gdm_simple_greeter_SOURCES = \ $(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) \ diff --git a/tests/Makefile.am b/tests/Makefile.am index 6f6ee2e4..f3ddc2f8 100644 --- a/tests/Makefile.am +++ b/tests/Makefile.am @@ -31,9 +31,9 @@ m_common_CFLAGS = \ $(NULL) m_common_LDADD = \ + $(top_builddir)/common/libgdmcommon.la \ @CHECK_LIBS@ \ $(COMMON_LIBS) \ $(EXTRA_TEST_LIBS) \ - $(top_builddir)/common/libgdmcommon.la \ $(NULL) |