summaryrefslogtreecommitdiff
path: root/source4/nsswitch
diff options
context:
space:
mode:
authorJelmer Vernooij <jelmer@samba.org>2008-04-14 17:22:58 +0200
committerJelmer Vernooij <jelmer@samba.org>2008-04-14 17:22:58 +0200
commite9017ba418202b4b191c5a9ad4a96857558ce606 (patch)
tree7a5069a59fde6de060a8946fa1b04a22333b3078 /source4/nsswitch
parentffc5cbfe803326a1c3bf55684717af910d091c5a (diff)
downloadsamba-e9017ba418202b4b191c5a9ad4a96857558ce606.tar.gz
samba-e9017ba418202b4b191c5a9ad4a96857558ce606.tar.bz2
samba-e9017ba418202b4b191c5a9ad4a96857558ce606.zip
Use _OBJ_FILES variables in a couple more places.
(This used to be commit 92856d5054106894b65cd1a1b5119c0facfc4cff)
Diffstat (limited to 'source4/nsswitch')
-rw-r--r--source4/nsswitch/config.m43
-rw-r--r--source4/nsswitch/config.mk12
2 files changed, 8 insertions, 7 deletions
diff --git a/source4/nsswitch/config.m4 b/source4/nsswitch/config.m4
index a3b7412841..207b7fa53f 100644
--- a/source4/nsswitch/config.m4
+++ b/source4/nsswitch/config.m4
@@ -4,8 +4,7 @@ case "$host_os" in
*linux*)
SMB_LIBRARY(nss_winbind,
[nsswitch/winbind_nss_linux.o],
- [LIBWINBIND-CLIENT],
- [2],[2])
+ [LIBWINBIND-CLIENT])
;;
*)
;;
diff --git a/source4/nsswitch/config.mk b/source4/nsswitch/config.mk
index c7c70c141e..a0ceff0033 100644
--- a/source4/nsswitch/config.mk
+++ b/source4/nsswitch/config.mk
@@ -1,13 +1,12 @@
[SUBSYSTEM::LIBWINBIND-CLIENT]
-OBJ_FILES = wb_common.o
PRIVATE_DEPENDENCIES = SOCKET_WRAPPER
+LIBWINBIND-CLIENT_OBJ_FILES = nsswitch/wb_common.o
+
#################################
# Start BINARY nsstest
[BINARY::nsstest]
INSTALLDIR = BINDIR
-OBJ_FILES = \
- nsstest.o
PRIVATE_DEPENDENCIES = \
LIBSAMBA-UTIL \
LIBREPLACE_EXT \
@@ -15,12 +14,12 @@ PRIVATE_DEPENDENCIES = \
# End BINARY nsstest
#################################
+nsstest_OBJ_FILES = nsswitch/nsstest.o
+
#################################
# Start BINARY wbinfo
[BINARY::wbinfo]
INSTALLDIR = BINDIR
-OBJ_FILES = \
- wbinfo.o
PRIVATE_DEPENDENCIES = \
LIBSAMBA-UTIL \
LIBREPLACE_EXT \
@@ -30,3 +29,6 @@ PRIVATE_DEPENDENCIES = \
LIBWINBIND-CLIENT
# End BINARY nsstest
#################################
+
+wbinfo_OBJ_FILES = \
+ nsswitch/wbinfo.o