Relevant BUGIDs:

Purpose of commit: bugfix

Commit summary:
---------------

2007-09-02  Thorsten Kukuk  <kukuk@thkukuk.de>

        * examples/Makefile.am: Fix usage of LIBADD, LDADD and LDFLAGS.
        * libpam/Makefile.am: Likewise.
        * modules/pam_access/Makefile.am: Likewise.
        * modules/pam_cracklib/Makefile.am: Likewise.
        * modules/pam_debug/Makefile.am: Likewise.
        * modules/pam_deny/Makefile.am: Likewise.
        * modules/pam_echo/Makefile.am: Likewise.
        * modules/pam_env/Makefile.am: Likewise.
        * modules/pam_exec/Makefile.am: Likewise.
        * modules/pam_faildelay/Makefile.am: Likewise.
        * modules/pam_filter/Makefile.am: Likewise.
        * modules/pam_filter/upperLOWER/Makefile.am: Likewise.
        * modules/pam_ftp/Makefile.am: Likewise.
        * modules/pam_group/Makefile.am: Likewise.
        * modules/pam_issue/Makefile.am: Likewise.
        * modules/pam_keyinit/Makefile.am: Likewise.
        * modules/pam_lastlog/Makefile.am: Likewise.
        * modules/pam_limits/Makefile.am: Likewise.
        * modules/pam_listfile/Makefile.am: Likewise.
        * modules/pam_localuser/Makefile.am: Likewise.
        * modules/pam_loginuid/Makefile.am: Likewise.
        * modules/pam_mail/Makefile.am: Likewise.
        * modules/pam_mkhomedir/Makefile.am: Likewise.
        * modules/pam_motd/Makefile.am: Likewise.
        * modules/pam_namespace/Makefile.am: Likewise.
        * modules/pam_nologin/Makefile.am: Likewise.
        * modules/pam_permit/Makefile.am: Likewise.
        * modules/pam_rhosts/Makefile.am: Likewise.
        * modules/pam_rootok/Makefile.am: Likewise.
        * modules/pam_securetty/Makefile.am: Likewise.
        * modules/pam_selinux/Makefile.am: Likewise.
        * modules/pam_shells/Makefile.am: Likewise.
        * modules/pam_stress/Makefile.am: Likewise.
        * modules/pam_succeed_if/Makefile.am: Likewise.
        * modules/pam_tally/Makefile.am: Likewise.
        * modules/pam_time/Makefile.am: Likewise.
        * modules/pam_umask/Makefile.am: Likewise.
        * modules/pam_unix/Makefile.am: Likewise.
        * tests/Makefile.am: Likewise.

diff --git a/ChangeLog b/ChangeLog
index 4a60fa507d23c1da151b69a1c8a86f90004e463f..bbc4bb726deda605c66005ae4a3e1ae6cf7f4d14 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,45 @@
+2007-09-02  Thorsten Kukuk  <kukuk@thkukuk.de>
+
+       * examples/Makefile.am: Fix usage of LIBADD, LDADD and LDFLAGS.
+       * libpam/Makefile.am: Likewise.
+       * modules/pam_access/Makefile.am: Likewise.
+       * modules/pam_cracklib/Makefile.am: Likewise.
+       * modules/pam_debug/Makefile.am: Likewise.
+       * modules/pam_deny/Makefile.am: Likewise.
+       * modules/pam_echo/Makefile.am: Likewise.
+       * modules/pam_env/Makefile.am: Likewise.
+       * modules/pam_exec/Makefile.am: Likewise.
+       * modules/pam_faildelay/Makefile.am: Likewise.
+       * modules/pam_filter/Makefile.am: Likewise.
+       * modules/pam_filter/upperLOWER/Makefile.am: Likewise.
+       * modules/pam_ftp/Makefile.am: Likewise.
+       * modules/pam_group/Makefile.am: Likewise.
+       * modules/pam_issue/Makefile.am: Likewise.
+       * modules/pam_keyinit/Makefile.am: Likewise.
+       * modules/pam_lastlog/Makefile.am: Likewise.
+       * modules/pam_limits/Makefile.am: Likewise.
+       * modules/pam_listfile/Makefile.am: Likewise.
+       * modules/pam_localuser/Makefile.am: Likewise.
+       * modules/pam_loginuid/Makefile.am: Likewise.
+       * modules/pam_mail/Makefile.am: Likewise.
+       * modules/pam_mkhomedir/Makefile.am: Likewise.
+       * modules/pam_motd/Makefile.am: Likewise.
+       * modules/pam_namespace/Makefile.am: Likewise.
+       * modules/pam_nologin/Makefile.am: Likewise.
+       * modules/pam_permit/Makefile.am: Likewise.
+       * modules/pam_rhosts/Makefile.am: Likewise.
+       * modules/pam_rootok/Makefile.am: Likewise.
+       * modules/pam_securetty/Makefile.am: Likewise.
+       * modules/pam_selinux/Makefile.am: Likewise.
+       * modules/pam_shells/Makefile.am: Likewise.
+       * modules/pam_stress/Makefile.am: Likewise.
+       * modules/pam_succeed_if/Makefile.am: Likewise.
+       * modules/pam_tally/Makefile.am: Likewise.
+       * modules/pam_time/Makefile.am: Likewise.
+       * modules/pam_umask/Makefile.am: Likewise.
+       * modules/pam_unix/Makefile.am: Likewise.
+       * tests/Makefile.am: Likewise.
+
 2007-08-31  Steve Langasek  <vorlon@debian.org>
 
        * modules/pam_group/group.conf: don't use "games" as an example

diff --git a/examples/Makefile.am b/examples/Makefile.am
index f8b9f0063a6a30feda10e46da78cd686d674d8cb..ac3f407a4fb0cb8cb32ee2fd4d49936aea8d1f46 100644 (file)
--- a/examples/Makefile.am
+++ b/examples/Makefile.am
@@ -8,7 +8,7 @@ EXTRA_DIST = README
 
 AM_CFLAGS = -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
 
 noinst_PROGRAMS = xsh vpass blank check_user

diff --git a/libpam/Makefile.am b/libpam/Makefile.am
index 57a4493552a7b6679f5760f7be5d1bf0a92b9e66..413c8c72bf26e62995006cf481b3f1065d986d48 100644 (file)
--- a/libpam/Makefile.am
+++ b/libpam/Makefile.am
@@ -20,10 +20,11 @@ include_HEADERS = include/security/_pam_compat.h \
 noinst_HEADERS = pam_prelude.h pam_private.h pam_tokens.h \
                pam_modutil_private.h pam_static_modules.h
 
-libpam_la_LDFLAGS = -no-undefined -version-info 81:8:81 \
-       @LIBAUDIT@ $(LIBPRELUDE_LIBS) @LIBDL@
+libpam_la_LDFLAGS = -no-undefined -version-info 81:8:81
+libpam_la_LIBADD = @LIBAUDIT@ $(LIBPRELUDE_LIBS) @LIBDL@
+
 if STATIC_MODULES
-  libpam_la_LDFLAGS += `ls ../modules/pam_*/*.lo` \
+  libpam_la_LIBADD += `ls ../modules/pam_*/*.lo` \
        @LIBDB@ @LIBCRYPT@ @LIBNSL@ @LIBCRACK@ -lutil
 endif
 if HAVE_VERSIONING

diff --git a/modules/pam_access/Makefile.am b/modules/pam_access/Makefile.am
index 8641b97cab34fbd028ae6a5317f74a5c46f4fbfa..9b58e81eaa0032d2173dc15dd3ba44325d8541de 100644 (file)
--- a/modules/pam_access/Makefile.am
+++ b/modules/pam_access/Makefile.am
@@ -15,13 +15,13 @@ secureconfdir = $(SCONFIGDIR)
 
 AM_CFLAGS = -I$(top_srcdir)/libpam/include -I$(top_srcdir)/libpamc/include \
        -DPAM_ACCESS_CONFIG=\"$(SCONFIGDIR)/access.conf\"
-AM_LDFLAGS =  -no-undefined -avoid-version -module \
-       -L$(top_builddir)/libpam -lpam @LIBNSL@
+AM_LDFLAGS =  -no-undefined -avoid-version -module
 if HAVE_VERSIONING
   AM_LDFLAGS += -Wl,--version-script=$(srcdir)/../modules.map
 endif
 
 securelib_LTLIBRARIES = pam_access.la
+pam_access_la_LIBADD = -L$(top_builddir)/libpam -lpam @LIBNSL@
 
 secureconf_DATA = access.conf
 

diff --git a/modules/pam_cracklib/Makefile.am b/modules/pam_cracklib/Makefile.am
index cc8d6ff96d773d8e378e82943043f4310d3d4a79..619ffc931e728915a646ed667c05fd21c5e5b787 100644 (file)
--- a/modules/pam_cracklib/Makefile.am
+++ b/modules/pam_cracklib/Makefile.am
@@ -14,8 +14,7 @@ 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
@@ -26,7 +25,8 @@ securelib_LTLIBRARIES = pam_cracklib.la
 TESTS = tst-pam_cracklib
 endif
 
-pam_cracklib_la_LIBADD = @LIBCRACK@ @LIBCRYPT@
+pam_cracklib_la_LIBADD = -L$(top_builddir)/libpam -lpam \
+       @LIBCRACK@ @LIBCRYPT@
 
 if ENABLE_REGENERATE_MAN
 

diff --git a/modules/pam_debug/Makefile.am b/modules/pam_debug/Makefile.am
index 889d7877d820056f9a6357da7c4b573d9a005d47..0b798516e72dff8879834f58bc914d6fced47f61 100644 (file)
--- a/modules/pam_debug/Makefile.am
+++ b/modules/pam_debug/Makefile.am
@@ -13,13 +13,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_debug.la
+pam_debug_la_LIBADD = -L$(top_builddir)/libpam -lpam
 
 TESTS = tst-pam_debug
 

diff --git a/modules/pam_deny/Makefile.am b/modules/pam_deny/Makefile.am
index 9837f880121ea3a6cb091bf03c3f43405945f063..94b5f0f6f8ea1723db071a2fe7d9a3dc377d68d2 100644 (file)
--- a/modules/pam_deny/Makefile.am
+++ b/modules/pam_deny/Makefile.am
@@ -14,13 +14,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_deny.la
+pam_deny_la_LIBADD = -L$(top_builddir)/libpam -lpam
 
 if ENABLE_REGENERATE_MAN
 

diff --git a/modules/pam_echo/Makefile.am b/modules/pam_echo/Makefile.am
index 40415c7b67f0d01d4abdfaec515c794627c6d51d..d004e8f40ff9c7f82b08ad6f9bd564e984332421 100644 (file)
--- a/modules/pam_echo/Makefile.am
+++ b/modules/pam_echo/Makefile.am
@@ -14,13 +14,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_echo.la
+pam_echo_la_LIBADD = -L$(top_builddir)/libpam -lpam
 
 if ENABLE_REGENERATE_MAN
 noinst_DATA = README

diff --git a/modules/pam_env/Makefile.am b/modules/pam_env/Makefile.am
index 83236e9b94c9b5c18d2f418cae899d8bb7a8fd15..878136881f29f6e7a8175a78e44223950f7fc833 100644 (file)
--- a/modules/pam_env/Makefile.am
+++ b/modules/pam_env/Makefile.am
@@ -15,13 +15,13 @@ secureconfdir = $(SCONFIGDIR)
 
 AM_CFLAGS = -I$(top_srcdir)/libpam/include -I$(top_srcdir)/libpamc/include \
        -DDEFAULT_CONF_FILE=\"$(SCONFIGDIR)/pam_env.conf\"
-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_env.la
+pam_env_la_LIBADD = -L$(top_builddir)/libpam -lpam
 
 secureconf_DATA = pam_env.conf
 sysconf_DATA = environment

diff --git a/modules/pam_exec/Makefile.am b/modules/pam_exec/Makefile.am
index 4fc28b283aecdcefd6aefe42c9cc48c68dbf6bb7..55fe9297636583793c7a5a928bd654ea95265801 100644 (file)
--- a/modules/pam_exec/Makefile.am
+++ b/modules/pam_exec/Makefile.am
@@ -14,13 +14,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_exec.la
+pam_exec_la_LIBADD = -L$(top_builddir)/libpam -lpam
 
 if ENABLE_REGENERATE_MAN
 

diff --git a/modules/pam_faildelay/Makefile.am b/modules/pam_faildelay/Makefile.am
index ac1bc1d365725270c5c2c72f5dce3bba91268f0b..2796018c3dd4481745a239716636fcb98e9a2356 100644 (file)
--- a/modules/pam_faildelay/Makefile.am
+++ b/modules/pam_faildelay/Makefile.am
@@ -15,13 +15,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_faildelay.la
+pam_faildelay_la_LIBADD = -L$(top_builddir)/libpam -lpam
 
 if ENABLE_REGENERATE_MAN
 noinst_DATA = README

diff --git a/modules/pam_filter/Makefile.am b/modules/pam_filter/Makefile.am
index b218bffb7a8dd83168163ae22d49c0974bb9ee20..ab2ceee92f6fd4b63ad7c0cc80521440c4136a90 100644 (file)
--- a/modules/pam_filter/Makefile.am
+++ b/modules/pam_filter/Makefile.am
@@ -1,5 +1,5 @@
 #
-# Copyright (c) 2005, 2006 Thorsten Kukuk <kukuk@suse.de>
+# Copyright (c) 2005, 2006, 2007 Thorsten Kukuk <kukuk@thkukuk.de>
 #
 
 SUBDIRS = upperLOWER
@@ -15,13 +15,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
 
 include_HEADERS=pam_filter.h
+pam_filter_la_LIBADD = -L$(top_builddir)/libpam -lpam
 
 securelib_LTLIBRARIES = pam_filter.la
 TESTS = tst-pam_filter

diff --git a/modules/pam_filter/upperLOWER/Makefile.am b/modules/pam_filter/upperLOWER/Makefile.am
index 205429c8ed60930cccbc49c0badadd8ec38364a5..93d24ff5ebb29ed81dde3d2f1440fd98df2c6927 100644 (file)
--- a/modules/pam_filter/upperLOWER/Makefile.am
+++ b/modules/pam_filter/upperLOWER/Makefile.am
@@ -9,6 +9,7 @@ securelibfilterdir = $(SECUREDIR)/pam_filter
 
 AM_CFLAGS = -I$(top_srcdir)/libpam/include -I$(top_srcdir)/libpamc/include \
        -I$(srcdir)/.. @PIE_CFLAGS@
-AM_LDFLAGS = @PIE_LDFLAGS@ -L$(top_builddir)/libpam -lpam
+AM_LDFLAGS = @PIE_LDFLAGS@
+LDADD = -L$(top_builddir)/libpam -lpam
 
 securelibfilter_PROGRAMS = upperLOWER

diff --git a/modules/pam_ftp/Makefile.am b/modules/pam_ftp/Makefile.am
index e6d510a125f952d927ade793df98ade877e2ae02..a4ce03df34462aa0bffee677654806aa3706f33d 100644 (file)
--- a/modules/pam_ftp/Makefile.am
+++ b/modules/pam_ftp/Makefile.am
@@ -13,13 +13,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_ftp.la
+pam_ftp_la_LIBADD = -L$(top_builddir)/libpam -lpam
 
 TESTS = tst-pam_ftp
 

diff --git a/modules/pam_group/Makefile.am b/modules/pam_group/Makefile.am
index 544fa12f1fa85fb32218015cc2f35f630d320c24..22dc831b03a3f66204a38fda5e22de0ae974a23a 100644 (file)
--- a/modules/pam_group/Makefile.am
+++ b/modules/pam_group/Makefile.am
@@ -14,13 +14,13 @@ secureconfdir = $(SCONFIGDIR)
 
 AM_CFLAGS = -I$(top_srcdir)/libpam/include -I$(top_srcdir)/libpamc/include \
        -DPAM_GROUP_CONF=\"$(SCONFIGDIR)/group.conf\"
-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_group.la
+pam_group_la_LIBADD = -L$(top_builddir)/libpam -lpam
 
 secureconf_DATA = group.conf
 

diff --git a/modules/pam_issue/Makefile.am b/modules/pam_issue/Makefile.am
index 4e43bd054b9f4b2c6b8447acfa1676196607e475..8161fd8121ccfa9a5bd7dd1c583a855ad7072f39 100644 (file)
--- a/modules/pam_issue/Makefile.am
+++ b/modules/pam_issue/Makefile.am
@@ -15,13 +15,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_issue.la
+pam_issue_la_LIBADD = -L$(top_builddir)/libpam -lpam
 
 if ENABLE_REGENERATE_MAN
 noinst_DATA = README

diff --git a/modules/pam_keyinit/Makefile.am b/modules/pam_keyinit/Makefile.am
index 49e34d75021fdfa6ef568252a685feb54981e94f..5039705afd162d7e9fc443c30345f92f05e38403 100644 (file)
--- a/modules/pam_keyinit/Makefile.am
+++ b/modules/pam_keyinit/Makefile.am
@@ -22,8 +22,7 @@ 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
@@ -31,3 +30,4 @@ endif
 if HAVE_KEY_MANAGEMENT
   securelib_LTLIBRARIES = pam_keyinit.la
 endif
+pam_keyinit_la_LIBADD = -L$(top_builddir)/libpam -lpam

diff --git a/modules/pam_lastlog/Makefile.am b/modules/pam_lastlog/Makefile.am
index e81e7833f45bad8626987bdd0fee3015c338bc9e..899bda7b6c74949ecfbe713b800de361c5542047 100644 (file)
--- a/modules/pam_lastlog/Makefile.am
+++ b/modules/pam_lastlog/Makefile.am
@@ -15,13 +15,13 @@ XMLS = README.xml pam_lastlog.8.xml
 TESTS = tst-pam_lastlog
 
 AM_CFLAGS = -I$(top_srcdir)/libpam/include -I$(top_srcdir)/libpamc/include
-AM_LDFLAGS = -no-undefined -avoid-version -module \
-       -L$(top_builddir)/libpam -lpam -lutil
+AM_LDFLAGS = -no-undefined -avoid-version -module
 if HAVE_VERSIONING
   AM_LDFLAGS += -Wl,--version-script=$(srcdir)/../modules.map
 endif
 
 securelib_LTLIBRARIES = pam_lastlog.la
+pam_lastlog_la_LIBADD = -L$(top_builddir)/libpam -lpam -lutil
 
 if ENABLE_REGENERATE_MAN
 noinst_DATA = README

diff --git a/modules/pam_limits/Makefile.am b/modules/pam_limits/Makefile.am
index 60256a7cf499aa5fbf6200467b4b2c80730b64e4..13232ea68fcbed7288cc730f0576b7b3c5ae41ca 100644 (file)
--- a/modules/pam_limits/Makefile.am
+++ b/modules/pam_limits/Makefile.am
@@ -18,13 +18,13 @@ limits_conf_dir = $(SCONFIGDIR)/limits.d
 AM_CFLAGS = -I$(top_srcdir)/libpam/include -I$(top_srcdir)/libpamc/include \
        -DLIMITS_FILE_DIR=\"$(limits_conf_dir)/*.conf\" \
        -DLIMITS_FILE=\"$(SCONFIGDIR)/limits.conf\"
-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_limits.la
+pam_limits_la_LIBADD = -L$(top_builddir)/libpam -lpam
 
 secureconf_DATA = limits.conf
 

diff --git a/modules/pam_listfile/Makefile.am b/modules/pam_listfile/Makefile.am
index 5eb5c75caf09bb65b46ecc5066d333ea95aeb285..2f211320d4115dcbe99e9782fac420c7f37a3544 100644 (file)
--- a/modules/pam_listfile/Makefile.am
+++ b/modules/pam_listfile/Makefile.am
@@ -15,13 +15,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_listfile.la
+pam_listfile_la_LIBADD = -L$(top_builddir)/libpam -lpam
 
 if ENABLE_REGENERATE_MAN
 noinst_DATA = README

diff --git a/modules/pam_localuser/Makefile.am b/modules/pam_localuser/Makefile.am
index ae3317559a8ad2b6af872700d251ff844593aa0c..d4e47937c6213202de880437af2e3dc99353df85 100644 (file)
--- a/modules/pam_localuser/Makefile.am
+++ b/modules/pam_localuser/Makefile.am
@@ -15,13 +15,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_localuser.la
+pam_localuser_la_LIBADD = -L$(top_builddir)/libpam -lpam
 
 if ENABLE_REGENERATE_MAN
 noinst_DATA = README

diff --git a/modules/pam_loginuid/Makefile.am b/modules/pam_loginuid/Makefile.am
index 6f2d84b0880c0f34e966bfabb02a1072d07132f0..636db9633d6e1f43ea505a38b9e2b7daad9165c2 100644 (file)
--- a/modules/pam_loginuid/Makefile.am
+++ b/modules/pam_loginuid/Makefile.am
@@ -14,13 +14,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 @LIBAUDIT@
+AM_LDFLAGS = -no-undefined -avoid-version -module
 if HAVE_VERSIONING
   AM_LDFLAGS += -Wl,--version-script=$(srcdir)/../modules.map
 endif
 
 securelib_LTLIBRARIES = pam_loginuid.la
+pam_loginuid_la_LIBADD = -L$(top_builddir)/libpam -lpam @LIBAUDIT@
 
 if ENABLE_REGENERATE_MAN
 

diff --git a/modules/pam_mail/Makefile.am b/modules/pam_mail/Makefile.am
index 95a25a61d8df47b6b29b0a90872c99d60bab28e5..0b5d2d701d5423d548d160fe219abaee612137c3 100644 (file)
--- a/modules/pam_mail/Makefile.am
+++ b/modules/pam_mail/Makefile.am
@@ -15,13 +15,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_mail.la
+pam_mail_la_LIBADD = -L$(top_builddir)/libpam -lpam
 
 if ENABLE_REGENERATE_MAN
 noinst_DATA = README

diff --git a/modules/pam_mkhomedir/Makefile.am b/modules/pam_mkhomedir/Makefile.am
index 1feea68880aa662753110acf7fc275e109e104f2..7ed3a9f05e499dea7355f00f410d61e78ff30cdd 100644 (file)
--- a/modules/pam_mkhomedir/Makefile.am
+++ b/modules/pam_mkhomedir/Makefile.am
@@ -16,14 +16,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
+AM_LDFLAGS = -no-undefined -avoid-version -module
 if HAVE_VERSIONING
   AM_LDFLAGS += -Wl,--version-script=$(srcdir)/../modules.map
 endif
 
 securelib_LTLIBRARIES = pam_mkhomedir.la
 pam_mkhomedir_la_SOURCES = pam_mkhomedir.c
+pam_mkhomedir_la_LIBADD = -L$(top_builddir)/libpam -lpam
 
 if ENABLE_REGENERATE_MAN
 noinst_DATA = README

diff --git a/modules/pam_motd/Makefile.am b/modules/pam_motd/Makefile.am
index d6e1bafadac91d5a567b82e2072facfc1036f25b..872e5d37dce636006f346d548ba9150ef760df84 100644 (file)
--- a/modules/pam_motd/Makefile.am
+++ b/modules/pam_motd/Makefile.am
@@ -15,13 +15,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_motd.la
+pam_motd_la_LIBADD = -L$(top_builddir)/libpam -lpam
 
 if ENABLE_REGENERATE_MAN
 noinst_DATA = README

diff --git a/modules/pam_namespace/Makefile.am b/modules/pam_namespace/Makefile.am
index bbcb2f702cbc7722dc1114098b40bd315677f6fe..002678ba06a62f4e666ef96f3a4054996a4deae7 100644 (file)
--- a/modules/pam_namespace/Makefile.am
+++ b/modules/pam_namespace/Makefile.am
@@ -22,8 +22,7 @@ secureconfdir = $(SCONFIGDIR)
 
 AM_CFLAGS = -I$(top_srcdir)/libpam/include -I$(top_srcdir)/libpamc/include \
         -DPAM_NAMESPACE_CONFIG=\"$(SCONFIGDIR)/namespace.conf\"
-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
@@ -31,6 +30,7 @@ endif
 if HAVE_UNSHARE
 securelib_LTLIBRARIES = pam_namespace.la
 pam_namespace_la_SOURCES = pam_namespace.c pam_namespace.h md5.c md5.h
+pam_namespace_la_LIBADD = -L$(top_builddir)/libpam -lpam @LIBSELINUX@
 
 secureconf_DATA = namespace.conf
 secureconf_SCRIPTS = namespace.init

diff --git a/modules/pam_nologin/Makefile.am b/modules/pam_nologin/Makefile.am
index dc5fe58fdf9523b1728065b21233d3d079c752e6..02840dde1803fd2749674fdce26a9b11f9ebeb62 100644 (file)
--- a/modules/pam_nologin/Makefile.am
+++ b/modules/pam_nologin/Makefile.am
@@ -15,13 +15,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_nologin.la
+pam_nologin_la_LIBADD = -L$(top_builddir)/libpam -lpam
 
 if ENABLE_REGENERATE_MAN
 noinst_DATA = README

diff --git a/modules/pam_permit/Makefile.am b/modules/pam_permit/Makefile.am
index 76e2447208c455f3a29e98a020cd40d1f1330ae2..aa6db7a1c95c4d42242774c8c5995e6c5b682e89 100644 (file)
--- a/modules/pam_permit/Makefile.am
+++ b/modules/pam_permit/Makefile.am
@@ -15,13 +15,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_permit.la
+pam_permit_la_LIBADD = -L$(top_builddir)/libpam -lpam
 
 if ENABLE_REGENERATE_MAN
 noinst_DATA = README

diff --git a/modules/pam_rhosts/Makefile.am b/modules/pam_rhosts/Makefile.am
index d4ca75782f9f5c41b4c406c7594aea174893b891..26fdf9c63ab808afbeb2a05b6111c8cfa88da84b 100644 (file)
--- a/modules/pam_rhosts/Makefile.am
+++ b/modules/pam_rhosts/Makefile.am
@@ -16,13 +16,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
+AM_LDFLAGS = -no-undefined -avoid-version -module
 if HAVE_VERSIONING
   AM_LDFLAGS += -Wl,--version-script=$(srcdir)/../modules.map
 endif
 
 securelib_LTLIBRARIES = pam_rhosts_auth.la pam_rhosts.la
+pam_rhosts_auth_la_LIBADD = -L$(top_builddir)/libpam -lpam
+pam_rhosts_la_LIBADD = -L$(top_builddir)/libpam -lpam
 
 if ENABLE_REGENERATE_MAN
 noinst_DATA = README

diff --git a/modules/pam_rootok/Makefile.am b/modules/pam_rootok/Makefile.am
index 7a97f20f60a84024fdb72481b6261446e00980af..54fe27207df7096d35785b9ff2249090df233c32 100644 (file)
--- a/modules/pam_rootok/Makefile.am
+++ b/modules/pam_rootok/Makefile.am
@@ -18,13 +18,13 @@ AM_CFLAGS = -I$(top_srcdir)/libpam/include -I$(top_srcdir)/libpamc/include
 if HAVE_LIBSELINUX
 AM_CFLAGS += -DWITH_SELINUX
 endif
-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_rootok.la
+pam_rootok_la_LIBADD = -L$(top_builddir)/libpam -lpam @LIBSELINUX@
 
 if ENABLE_REGENERATE_MAN
 noinst_DATA = README

diff --git a/modules/pam_securetty/Makefile.am b/modules/pam_securetty/Makefile.am
index ca97ef4d7c1d4cae6fa5f39f5bf16592d29d92c2..dd8d947334db3c375e95f27bb09dce8bb3326fa8 100644 (file)
--- a/modules/pam_securetty/Makefile.am
+++ b/modules/pam_securetty/Makefile.am
@@ -15,13 +15,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_securetty.la
+pam_securetty_la_LIBADD = -L$(top_builddir)/libpam -lpam
 
 if ENABLE_REGENERATE_MAN
 noinst_DATA = README

diff --git a/modules/pam_selinux/Makefile.am b/modules/pam_selinux/Makefile.am
index ee2773e9ebd302f0ebfe5c57b4ee8c6651a6a157..d11b507c3c9f474888ccb932dd7906ac9bd3d8cf 100644 (file)
--- a/modules/pam_selinux/Makefile.am
+++ b/modules/pam_selinux/Makefile.am
@@ -19,15 +19,15 @@ secureconfdir = $(SCONFIGDIR)
 
 AM_CFLAGS = -I$(top_srcdir)/libpam/include -I$(top_srcdir)/libpamc/include \
        -I$(top_srcdir)/libpam_misc/include
-AM_LDFLAGS = -no-undefined \
-       -L$(top_builddir)/libpam -lpam @LIBSELINUX@
 
-pam_selinux_check_LDFLAGS = $(AM_LDFLAGS) -L$(top_builddir)/libpam_misc -lpam_misc
+pam_selinux_check_LDFLAGS = $(AM_LDFLAGS) \
+       -L$(top_builddir)/libpam -lpam \
+       -L$(top_builddir)/libpam_misc -lpam_misc
 
-pam_selinux_la_LDFLAGS = $(AM_LDFLAGS)
+pam_selinux_la_LIBADD = -L$(top_builddir)/libpam -lpam @LIBSELINUX@
+pam_selinux_la_LDFLAGS = -no-undefined -avoid-version -module
 if HAVE_VERSIONING
-  pam_selinux_la_LDFLAGS += -avoid-version -module \
-       -Wl,--version-script=$(srcdir)/../modules.map
+  pam_selinux_la_LDFLAGS += -Wl,--version-script=$(srcdir)/../modules.map
 endif
 
 if HAVE_LIBSELINUX

diff --git a/modules/pam_shells/Makefile.am b/modules/pam_shells/Makefile.am
index 03ac8b1509fcf34f4b3c04fc99aeee81a5dfd859..543e01b407009983ec4fd1906a802b72d429bcd4 100644 (file)
--- a/modules/pam_shells/Makefile.am
+++ b/modules/pam_shells/Makefile.am
@@ -15,13 +15,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_shells.la
+pam_shells_la_LIBADD = -L$(top_builddir)/libpam -lpam
 
 if ENABLE_REGENERATE_MAN
 noinst_DATA = README

diff --git a/modules/pam_stress/Makefile.am b/modules/pam_stress/Makefile.am
index 64fe516f275746118999e2988327ea84b507878f..b5f80938b5b83ae471843eac8c29c1c042885064 100644 (file)
--- a/modules/pam_stress/Makefile.am
+++ b/modules/pam_stress/Makefile.am
@@ -12,9 +12,9 @@ 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_stress.la
+pam_stress_la_LIBADD = -L$(top_builddir)/libpam -lpam

diff --git a/modules/pam_succeed_if/Makefile.am b/modules/pam_succeed_if/Makefile.am
index d97f4c1d1a6b86f35e4889ff438d87ca775f3a63..0394f42d3d90975b2a2014525cb2f72489eeaa43 100644 (file)
--- a/modules/pam_succeed_if/Makefile.am
+++ b/modules/pam_succeed_if/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_succeed_if.la
+pam_succeed_if_la_LIBADD = -L$(top_builddir)/libpam -lpam
 
 if ENABLE_REGENERATE_MAN
 noinst_DATA = README

diff --git a/modules/pam_tally/Makefile.am b/modules/pam_tally/Makefile.am
index ffb88886a150a5384532132c9070a7c55ed1cb92..4fad738f011c7e35987bbd43f4ac2f32fd203587 100644 (file)
--- a/modules/pam_tally/Makefile.am
+++ b/modules/pam_tally/Makefile.am
@@ -1,5 +1,5 @@
 #
-# Copyright (c) 2005, 2006 Thorsten Kukuk <kukuk@suse.de>
+# Copyright (c) 2005, 2006, 2007 Thorsten Kukuk <kukuk@thkukuk.de>
 #
 
 CLEANFILES = *~
@@ -18,8 +18,8 @@ noinst_HEADERS = faillog.h
 
 AM_CFLAGS = -I$(top_srcdir)/libpam/include -I$(top_srcdir)/libpamc/include
 
-pam_tally_la_LDFLAGS = -no-undefined -avoid-version -module \
-       -L$(top_builddir)/libpam -lpam
+pam_tally_la_LDFLAGS = -no-undefined -avoid-version -module
+pam_tally_la_LIBADD = -L$(top_builddir)/libpam -lpam
 if HAVE_VERSIONING
   pam_tally_la_LDFLAGS += -Wl,--version-script=$(srcdir)/../modules.map
 endif
@@ -28,7 +28,7 @@ securelib_LTLIBRARIES = pam_tally.la
 sbin_PROGRAMS = pam_tally
 
 pam_tally_SOURCES = pam_tally_app.c
-pam_tally_LDFLAGS = -L$(top_builddir)/libpam -lpam
+pam_tally_LDADD = -L$(top_builddir)/libpam -lpam
 
 if ENABLE_REGENERATE_MAN
 noinst_DATA = README

diff --git a/modules/pam_time/Makefile.am b/modules/pam_time/Makefile.am
index 6c5ae3a2c3b70957e1d2ad7b48d286f826e6b214..9c63ee5edc68eec83e24f6376391700988eac6da 100644 (file)
--- a/modules/pam_time/Makefile.am
+++ b/modules/pam_time/Makefile.am
@@ -16,11 +16,11 @@ secureconfdir = $(SCONFIGDIR)
 
 AM_CFLAGS = -I$(top_srcdir)/libpam/include -I$(top_srcdir)/libpamc/include \
        -DPAM_TIME_CONF=\"$(SCONFIGDIR)/time.conf\"
-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
+pam_time_la_LIBADD = -L$(top_builddir)/libpam -lpam
 
 securelib_LTLIBRARIES = pam_time.la
 secureconf_DATA = time.conf

diff --git a/modules/pam_umask/Makefile.am b/modules/pam_umask/Makefile.am
index 56fa63b4f5d32613e14158853a2cf62bd26e0202..53a666aac57abdc5ac3cf8fa6627ae73eacba689 100644 (file)
--- a/modules/pam_umask/Makefile.am
+++ b/modules/pam_umask/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_umask.la
+pam_umask_la_LIBADD = -L$(top_builddir)/libpam -lpam
 
 if ENABLE_REGENERATE_MAN
 noinst_DATA = README

diff --git a/modules/pam_unix/Makefile.am b/modules/pam_unix/Makefile.am
index 83b6c0b3d7de4b31b29a175612e31e835dd044f2..f9d77f4c90414364b074dc7a793d85f086bf3062 100644 (file)
--- a/modules/pam_unix/Makefile.am
+++ b/modules/pam_unix/Makefile.am
@@ -25,12 +25,12 @@ if HAVE_LIBCRACK
   AM_CFLAGS += -D"USE_CRACKLIB"
 endif
 
-pam_unix_la_LDFLAGS = -no-undefined -avoid-version -module \
-       @LIBCRACK@ @LIBNSL@ -L$(top_builddir)/libpam -lpam \
-       @LIBCRYPT@ @LIBSELINUX@
+pam_unix_la_LDFLAGS = -no-undefined -avoid-version -module
 if HAVE_VERSIONING
   pam_unix_la_LDFLAGS += -Wl,--version-script=$(srcdir)/../modules.map
 endif
+pam_unix_la_LIBADD = @LIBCRACK@ @LIBNSL@ -L$(top_builddir)/libpam -lpam \
+       @LIBCRYPT@ @LIBSELINUX@
 
 securelib_LTLIBRARIES = pam_unix.la
 
@@ -46,12 +46,12 @@ pam_unix_la_SOURCES = bigcrypt.c pam_unix_acct.c \
 
 bigcrypt_SOURCES = bigcrypt.c bigcrypt_main.c
 bigcrypt_CFLAGS = $(AM_CFLAGS)
-bigcrypt_LDFLAGS = @LIBCRYPT@
+bigcrypt_LDADD = @LIBCRYPT@
 
 unix_chkpwd_SOURCES = unix_chkpwd.c md5_good.c md5_broken.c bigcrypt.c
 unix_chkpwd_CFLAGS = $(AM_CFLAGS) @PIE_CFLAGS@
-unix_chkpwd_LDFLAGS = @PIE_LDFLAGS@ -L$(top_builddir)/libpam -lpam \
-       @LIBCRYPT@ @LIBSELINUX@
+unix_chkpwd_LDFLAGS = @PIE_LDFLAGS@ 
+unix_chkpwd_LDADD = -L$(top_builddir)/libpam -lpam @LIBCRYPT@ @LIBSELINUX@
 
 if ENABLE_REGENERATE_MAN
 noinst_DATA = README

diff --git a/tests/Makefile.am b/tests/Makefile.am
index a5b8d08bfc24758a53b61f8728c753e4b82a58d5..de1594bdbb79ccdaec2113db982f81786e18b2e1 100644 (file)
--- a/tests/Makefile.am
+++ b/tests/Makefile.am
@@ -4,7 +4,7 @@
 
 AM_CFLAGS = -DLIBPAM_COMPILE -I$(top_srcdir)/libpam/include \
                -I$(top_srcdir)/libpam
-AM_LDFLAGS = -L$(top_builddir)/libpam -lpam
+LDADD = -L$(top_builddir)/libpam -lpam
 
 CLEANFILES = *~
 
@@ -15,5 +15,5 @@ TESTS = tst-pam_start tst-pam_end tst-pam_fail_delay tst-pam_open_session \
 
 check_PROGRAMS = ${TESTS} tst-dlopen
 
-tst_dlopen_LDADD = -L$(top_builddir)/libpam -lpam -ldl
+tst_dlopen_LDADD = -ldl