Fix usage of LIBADD, LDADD and LDFLAGS

* modules/pam_selinux/Makefile.am: Rename pam_selinux_check_LDFLAGS to
pam_selinux_check_LDADD.
* modules/pam_userdb/Makefile.am: Split out pam_userdb_la_LIBADD from
AM_LDFLAGS.
* modules/pam_warn/Makefile.am: Split out pam_warn_la_LIBADD from
AM_LDFLAGS.
* modules/pam_wheel/Makefile.am: Split out pam_wheel_la_LIBADD from
AM_LDFLAGS.
* modules/pam_xauth/Makefile.am: split out pam_xauth_la_LIBADD from
AM_LDFLAGS.
* xtests/Makefile.am: Rename AM_LDFLAGS to LDADD.

diff --git a/modules/pam_selinux/Makefile.am b/modules/pam_selinux/Makefile.am
index ef142f4e8f57e8235af37c950dafde483551dc03..48709ef52157b64bf0f3988c0d33df761d4f00f0 100644 (file)
--- a/modules/pam_selinux/Makefile.am
+++ b/modules/pam_selinux/Makefile.am
@@ -21,12 +21,8 @@ secureconfdir = $(SCONFIGDIR)
 AM_CFLAGS = -I$(top_srcdir)/libpam/include -I$(top_srcdir)/libpamc/include \
        -I$(top_srcdir)/libpam_misc/include
 
-pam_selinux_check_LDFLAGS = $(AM_LDFLAGS) \
-       -L$(top_builddir)/libpam -lpam \
-       -L$(top_builddir)/libpam_misc -lpam_misc
-
-pam_selinux_la_LIBADD = -L$(top_builddir)/libpam -lpam @LIBSELINUX@ @LIBAUDIT@
 pam_selinux_la_LDFLAGS = -no-undefined -avoid-version -module
+pam_selinux_la_LIBADD = -L$(top_builddir)/libpam -lpam @LIBSELINUX@ @LIBAUDIT@
 if HAVE_VERSIONING
   pam_selinux_la_LDFLAGS += -Wl,--version-script=$(srcdir)/../modules.map
 endif
@@ -34,6 +30,8 @@ endif
 if HAVE_LIBSELINUX
   securelib_LTLIBRARIES = pam_selinux.la
   noinst_PROGRAMS = pam_selinux_check
+  pam_selinux_check_LDADD = -L$(top_builddir)/libpam -lpam \
+                           -L$(top_builddir)/libpam_misc -lpam_misc
 endif
 if ENABLE_REGENERATE_MAN
 noinst_DATA = README pam_selinux.8

diff --git a/modules/pam_userdb/Makefile.am b/modules/pam_userdb/Makefile.am
index 77cc96085ac96c6ff6b3bad7b532d2f24393a773..4fbe319b907a24b7ae734551f568e06b4a7aa081 100644 (file)
--- a/modules/pam_userdb/Makefile.am
+++ b/modules/pam_userdb/Makefile.am
@@ -18,14 +18,14 @@ securelibdir = $(SECUREDIR)
 secureconfdir = $(SCONFIGDIR)
 
 AM_CFLAGS = -I$(top_srcdir)/libpam/include -I$(top_srcdir)/libpamc/include
-AM_LDFLAGS = -no-undefined -avoid-version -module \
-       -L$(top_builddir)/libpam -lpam @LIBDB@ @LIBCRYPT@
+AM_LDFLAGS = -no-undefined -avoid-version -module @LIBDB@ @LIBCRYPT@
 if HAVE_VERSIONING
   AM_LDFLAGS += -Wl,--version-script=$(srcdir)/../modules.map
 endif
 
 if HAVE_LIBDB
   securelib_LTLIBRARIES = pam_userdb.la
+  pam_userdb_la_LIBADD = -L$(top_builddir)/libpam -lpam
 endif
 
 noinst_HEADERS = pam_userdb.h

diff --git a/modules/pam_warn/Makefile.am b/modules/pam_warn/Makefile.am
index 75cf38a5278374badf36a5eee79e757e5b5ec042..7fd570e37480f010dc29236d42693e5082c8b4a7 100644 (file)
--- a/modules/pam_warn/Makefile.am
+++ b/modules/pam_warn/Makefile.am
@@ -16,13 +16,13 @@ securelibdir = $(SECUREDIR)
 secureconfdir = $(SCONFIGDIR)
 
 AM_CFLAGS = -I$(top_srcdir)/libpam/include -I$(top_srcdir)/libpamc/include
-AM_LDFLAGS = -no-undefined -avoid-version -module \
-       -L$(top_builddir)/libpam -lpam
+AM_LDFLAGS = -no-undefined -avoid-version -module
 if HAVE_VERSIONING
   AM_LDFLAGS += -Wl,--version-script=$(srcdir)/../modules.map
 endif
 
 securelib_LTLIBRARIES = pam_warn.la
+pam_warn_la_LIBADD = -L$(top_builddir)/libpam -lpam
 
 if ENABLE_REGENERATE_MAN
 noinst_DATA = README

diff --git a/modules/pam_wheel/Makefile.am b/modules/pam_wheel/Makefile.am
index bccb8aae237b3bf0cc0aff17012ff9ff0df519b2..f9d1b3d3af36d8fdc1758b630579204a52b0c4b5 100644 (file)
--- a/modules/pam_wheel/Makefile.am
+++ b/modules/pam_wheel/Makefile.am
@@ -16,13 +16,13 @@ securelibdir = $(SECUREDIR)
 secureconfdir = $(SCONFIGDIR)
 
 AM_CFLAGS = -I$(top_srcdir)/libpam/include -I$(top_srcdir)/libpamc/include
-AM_LDFLAGS = -no-undefined -avoid-version -module \
-       -L$(top_builddir)/libpam -lpam
+AM_LDFLAGS = -no-undefined -avoid-version -module
 if HAVE_VERSIONING
   AM_LDFLAGS += -Wl,--version-script=$(srcdir)/../modules.map
 endif
 
 securelib_LTLIBRARIES = pam_wheel.la
+pam_wheel_la_LIBADD = -L$(top_builddir)/libpam -lpam
 
 if ENABLE_REGENERATE_MAN
 noinst_DATA = README

diff --git a/modules/pam_xauth/Makefile.am b/modules/pam_xauth/Makefile.am
index db089adba6c776dd89b7d6e4e950a4260aeba1f2..4504d7b223499556237cadedfa7920553fdcd13e 100644 (file)
--- a/modules/pam_xauth/Makefile.am
+++ b/modules/pam_xauth/Makefile.am
@@ -16,13 +16,13 @@ securelibdir = $(SECUREDIR)
 secureconfdir = $(SCONFIGDIR)
 
 AM_CFLAGS = -I$(top_srcdir)/libpam/include -I$(top_srcdir)/libpamc/include
-AM_LDFLAGS = -no-undefined -avoid-version -module \
-       -L$(top_builddir)/libpam -lpam @LIBSELINUX@
+AM_LDFLAGS = -no-undefined -avoid-version -module
 if HAVE_VERSIONING
   AM_LDFLAGS += -Wl,--version-script=$(srcdir)/../modules.map
 endif
 
 securelib_LTLIBRARIES = pam_xauth.la
+pam_xauth_la_LIBADD = -L$(top_builddir)/libpam -lpam @LIBSELINUX@
 
 if ENABLE_REGENERATE_MAN
 noinst_DATA = README

diff --git a/xtests/Makefile.am b/xtests/Makefile.am
index 498a9fca172096ebed5f8b9ab6943deee7c5f77d..904b536ac6e294af7902813e8fc1c893a5f51367 100644 (file)
--- a/xtests/Makefile.am
+++ b/xtests/Makefile.am
@@ -4,7 +4,7 @@
 
 AM_CFLAGS = -DLIBPAM_COMPILE -I$(top_srcdir)/libpam/include \
        -I$(top_srcdir)/libpamc/include -I$(top_srcdir)/libpam_misc/include
-AM_LDFLAGS = -L$(top_builddir)/libpam -lpam \
+LDADD = -L$(top_builddir)/libpam -lpam \
        -L$(top_builddir)/libpam_misc -lpam_misc
 
 CLEANFILES = *~ $(XTESTS)