diff options
| author | Ryan Lortie <desrt@desrt.ca> | 2014-02-25 16:37:51 -0500 |
|---|---|---|
| committer | Ryan Lortie <desrt@desrt.ca> | 2014-02-25 16:44:53 -0500 |
| commit | 9a23fcc8022526efdb1716ca987de1519e4093d6 (patch) | |
| tree | 743d0d9e252f5cab14f722350e8e40e83a0dd3d7 | |
| parent | 6daad88bb6ba6b5935a26ec06acb36b8a0826c83 (diff) | |
| download | gdm-9a23fcc8022526efdb1716ca987de1519e4093d6.tar.gz | |
Stop using LDFLAGS for libraries
Originally, EXTRA_*_LIBS was introduced as a way to get certain
libraries to the front of the line when invoking the linker in order to
control which version of a library we got. See bug 85785 for the
history there.
This is probably no longer needed, so officially declare that the only
thing that the EXTRA_ variables mean is "not from pkg-config".
Move all of the EXTRA_*_LIBS from LDFLAGS to _LDADD, along with some
other things that were improperly in LDFLAGS.
https://bugzilla.gnome.org/show_bug.cgi?id=724283
| -rw-r--r-- | daemon/Makefile.am | 19 |
1 files changed, 4 insertions, 15 deletions
diff --git a/daemon/Makefile.am b/daemon/Makefile.am index 2fcac8be..87fcb988 100644 --- a/daemon/Makefile.am +++ b/daemon/Makefile.am @@ -181,10 +181,6 @@ nodist_gdm_simple_slave_SOURCES = \ gdm-slave-glue.h \ $(NULL) -gdm_simple_slave_LDFLAGS = \ - $(PAM_LIBS) \ - $(NULL) - gdm_simple_slave_LDADD = \ $(top_builddir)/common/libgdmcommon.la \ $(XLIB_LIBS) \ @@ -192,6 +188,7 @@ gdm_simple_slave_LDADD = \ $(EXTRA_DAEMON_LIBS) \ $(SYSTEMD_LIBS) \ $(JOURNALD_LIBS) \ + $(PAM_LIBS) \ $(NULL) gdm_xdmcp_chooser_slave_SOURCES = \ @@ -278,11 +275,6 @@ gdm_session_worker_SOURCES += gdm-session-solaris-auditor.h \ gdm-session-solaris-auditor.c endif -gdm_session_worker_LDFLAGS = \ - $(XLIB_LIBS) \ - $(PAM_LIBS) \ - $(NULL) - gdm_session_worker_LDADD = \ $(top_builddir)/common/libgdmcommon.la \ $(DAEMON_LIBS) \ @@ -290,6 +282,8 @@ gdm_session_worker_LDADD = \ $(JOURNALD_LIBS) \ $(LIBSELINUX_LIBS) \ $(EXTRA_DAEMON_LIBS) \ + $(XLIB_LIBS) \ + $(PAM_LIBS) \ $(NULL) sbin_PROGRAMS = \ @@ -365,12 +359,6 @@ CONSOLE_KIT_SOURCES = \ EXTRA_gdm_SOURCES += $(CONSOLE_KIT_SOURCES) -# Note that these libs are in LDFLAGS because they should come before -# everything else on the link line as they may override stuff -gdm_LDFLAGS = \ - $(EXTRA_DAEMON_LIBS) \ - $(NULL) - gdm_LDADD = \ $(top_builddir)/common/libgdmcommon.la \ $(XLIB_LIBS) \ @@ -379,6 +367,7 @@ gdm_LDADD = \ $(LIBWRAP_LIBS) \ $(SYSTEMD_LIBS) \ $(JOURNALD_LIBS) \ + $(EXTRA_DAEMON_LIBS) \ $(NULL) if WITH_CONSOLE_KIT |