[linux-pam] Fix usage of LIBADD, LDADD and LDFLAGS

[Dmitry V. Levin]

commit 61a6b8c8e850ec1589e01accf15f3bce2c80d494
Author: Dmitry V. Levin <ldv(a)altlinux.org&gt;
Date:   Fri Oct 28 02:20:17 2011 +0000

    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.

 modules/pam_selinux/Makefile.am |    8 +++-----
 modules/pam_userdb/Makefile.am  |    4 ++--
 modules/pam_warn/Makefile.am    |    4 ++--
 modules/pam_wheel/Makefile.am   |    4 ++--
 modules/pam_xauth/Makefile.am   |    4 ++--
 xtests/Makefile.am              |    2 +-
 6 files changed, 12 insertions(+), 14 deletions(-)
---
diff --git a/modules/pam_selinux/Makefile.am b/modules/pam_selinux/Makefile.am
index ef142f4..48709ef 100644
--- 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 77cc960..4fbe319 100644
--- 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 75cf38a..7fd570e 100644
--- 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 bccb8aa..f9d1b3d 100644
--- 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 db089ad..4504d7b 100644
--- 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 498a9fc..904b536 100644
--- 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)