Arthur de Jong

Open Source / Free Software developer

summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--nslcd/Makefile.am5
-rw-r--r--pam/Makefile.am7
-rw-r--r--tests/Makefile.am6
3 files changed, 10 insertions, 8 deletions
diff --git a/nslcd/Makefile.am b/nslcd/Makefile.am
index 2f259dd..7a1d4c7 100644
--- a/nslcd/Makefile.am
+++ b/nslcd/Makefile.am
@@ -33,5 +33,6 @@ nslcd_SOURCES = nslcd.c ../nslcd.h ../common/nslcd-prot.h \
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@
diff --git a/pam/Makefile.am b/pam/Makefile.am
index e2145ba..ce2fabf 100644
--- a/pam/Makefile.am
+++ b/pam/Makefile.am
@@ -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 @@ AM_CFLAGS = -fPIC
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
diff --git a/tests/Makefile.am b/tests/Makefile.am
index 42fd0eb..328b181 100644
--- a/tests/Makefile.am
+++ b/tests/Makefile.am
@@ -60,9 +60,9 @@ common_nslcd_LDADD = ../nslcd/log.o ../nslcd/common.o \
../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)