nss-pam-ldapd commit: r1504 - in nss-pam-ldapd: nslcd pam tests

[Commits of the nss-pam-ldapd project <nss-pam-ldapd-commits [at] lists.arthurdejong.org>]

Author: arthur
Date: Sun Aug 14 16:09:59 2011
New Revision: 1504
URL: http://arthurdejong.org/viewvc/nss-pam-ldapd?view=rev&revision=1504

Log:
put external libraries at the end when linking

Modified:
   nss-pam-ldapd/nslcd/Makefile.am
   nss-pam-ldapd/pam/Makefile.am
   nss-pam-ldapd/tests/Makefile.am

Modified: nss-pam-ldapd/nslcd/Makefile.am
==============================================================================
--- nss-pam-ldapd/nslcd/Makefile.am     Sun Aug 14 16:03:32 2011        (r1503)
+++ nss-pam-ldapd/nslcd/Makefile.am     Sun Aug 14 16:09:59 2011        (r1504)
@@ -33,5 +33,6 @@
                 nsswitch.c \
                 alias.c ether.c group.c host.c netgroup.c network.c \
                 passwd.c protocol.c rpc.c service.c shadow.c pam.c
-nslcd_LDADD = @nslcd_LIBS@ @PTHREAD_LIBS@ ../common/libtio.a 
../common/libdict.a \
-              ../common/libexpr.a ../compat/libcompat.a
+nslcd_LDADD = ../common/libtio.a ../common/libdict.a \
+              ../common/libexpr.a ../compat/libcompat.a \
+              @nslcd_LIBS@ @PTHREAD_LIBS@

Modified: nss-pam-ldapd/pam/Makefile.am
==============================================================================
--- nss-pam-ldapd/pam/Makefile.am       Sun Aug 14 16:03:32 2011        (r1503)
+++ nss-pam-ldapd/pam/Makefile.am       Sun Aug 14 16:09:59 2011        (r1504)
@@ -1,6 +1,6 @@
 # Makefile.am - use automake to generate Makefile.in
 #
-# Copyright (C) 2009, 2010 Arthur de Jong
+# Copyright (C) 2009, 2010, 2011 Arthur de Jong
 # Copyright (C) 2010 Symas Corporation
 #
 # This library is free software; you can redistribute it and/or
@@ -25,8 +25,9 @@
 
 pam_ldap_so_SOURCES = ../nslcd.h ../common/nslcd-prot.h \
                       ../compat/attrs.h pam.c common.h
-pam_ldap_so_LDADD = ../common/libtio.a ../common/libprot.a -lpam \
-                    ../compat/libcompat.a
+pam_ldap_so_LDADD = ../common/libtio.a ../common/libprot.a \
+                    ../compat/libcompat.a \
+                    -lpam
 
 EXTRA_DIST = pam_ldap.map
 

Modified: nss-pam-ldapd/tests/Makefile.am
==============================================================================
--- nss-pam-ldapd/tests/Makefile.am     Sun Aug 14 16:03:32 2011        (r1503)
+++ nss-pam-ldapd/tests/Makefile.am     Sun Aug 14 16:09:59 2011        (r1504)
@@ -60,9 +60,9 @@
                      ../nslcd/host.o ../nslcd/netgroup.o ../nslcd/network.o \
                      ../nslcd/passwd.o ../nslcd/protocol.o ../nslcd/rpc.o \
                      ../nslcd/service.o ../nslcd/shadow.o ../nslcd/pam.o \
-                     @nslcd_LIBS@ @PTHREAD_LIBS@ ../common/libtio.a \
-                     ../common/libdict.a ../common/libexpr.a \
-                     ../compat/libcompat.a
+                     ../common/libtio.a ../common/libdict.a \
+                     ../common/libexpr.a ../compat/libcompat.a \
+                     @nslcd_LIBS@ @PTHREAD_LIBS@
 
 test_cfg_SOURCES = test_cfg.c common.h
 test_cfg_LDADD = $(common_nslcd_LDADD)
-- 
To unsubscribe send an email to
nss-pam-ldapd-commits-unsubscribe@lists.arthurdejong.org or see
http://lists.arthurdejong.org/nss-pam-ldapd-commits