Relevant BUGIDs:

[linux-pam] / modules / pam_unix / Makefile.am

diff --git a/modules/pam_unix/Makefile.am b/modules/pam_unix/Makefile.am
index d7d61b5a4ac6bb4207a5aba42741aed99158c7db..fe884e77268275f1cb317f277bc5829e962db163 100644 (file)
--- a/modules/pam_unix/Makefile.am
+++ b/modules/pam_unix/Makefile.am
@@ -4,7 +4,7 @@
 
 CLEANFILES = *~
 
-EXTRA_DIST = README md5.c md5_crypt.c lckpwdf.-c $(MANS)
+EXTRA_DIST = README md5.c md5_crypt.c lckpwdf.-c $(MANS) CHANGELOG
 
 man_MANS = unix_chkpwd.8
 
@@ -12,7 +12,6 @@ securelibdir = $(SECUREDIR)
 secureconfdir = $(SCONFIGDIR)
 
 AM_CFLAGS = -I$(top_srcdir)/libpam/include -I$(top_srcdir)/libpamc/include \
-       -I$(top_srcdir)/modules/pammodutil/include/ \
        -DCHKPWD_HELPER=\"$(sbindir)/unix_chkpwd\"
 
 AM_LDFLAGS = -L$(top_builddir)/libpam -lpam @LIBCRYPT@ @LIBSELINUX@
@@ -24,9 +23,11 @@ if HAVE_LIBCRACK
   AM_CFLAGS += -D"USE_CRACKLIB"
 endif
 
-pam_unix_la_LDFLAGS = -avoid-version -module \
-       -L$(top_builddir)/modules/pammodutil -lpammodutil \
+pam_unix_la_LDFLAGS = -no-undefined -avoid-version -module \
        @LIBCRACK@ @LIBNSL@
+if HAVE_VERSIONING
+  pam_unix_la_LDFLAGS += -Wl,--version-script=$(srcdir)/../modules.map
+endif
 
 securelib_LTLIBRARIES = pam_unix.la
 
@@ -41,5 +42,7 @@ pam_unix_la_SOURCES = bigcrypt.c pam_unix_acct.c \
        yppasswd_xdr.c md5_good.c md5_broken.c
 
 bigcrypt_SOURCES = bigcrypt.c bigcrypt_main.c
+bigcrypt_CFLAGS = $(AM_CFLAGS)
 
 unix_chkpwd_SOURCES = unix_chkpwd.c md5_good.c md5_broken.c bigcrypt.c
+unix_chkpwd_CFLAGS = $(AM_CFLAGS)