summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLars Müller <lmuelle@samba.org>2007-04-06 15:39:34 +0000
committerGerald (Jerry) Carter <jerry@samba.org>2007-10-10 12:19:12 -0500
commit0fea15acb3952b8ce5b4f0439de72e09c9e51d38 (patch)
tree23f22bddc8a3639c157d6760119037952bc950d7
parent826d6e4b7f34dbee3e6c3d0bdc08f2497e46d2f6 (diff)
downloadsamba-0fea15acb3952b8ce5b4f0439de72e09c9e51d38.tar.gz
samba-0fea15acb3952b8ce5b4f0439de72e09c9e51d38.tar.bz2
samba-0fea15acb3952b8ce5b4f0439de72e09c9e51d38.zip
r22099: Revert parts of revision 22056 as proto_exists is not required by
@WINBIND_NSS@, bin/pam_winbind.@SHLIBEXT@, and bin/pam_smbpass.@SHLIBEXT@. (This used to be commit 641edac6ece16aa51fef240a5356c1aa5afaa644)
-rw-r--r--source3/Makefile.in6
1 files changed, 3 insertions, 3 deletions
diff --git a/source3/Makefile.in b/source3/Makefile.in
index 17b3e387b8..fbd42c1065 100644
--- a/source3/Makefile.in
+++ b/source3/Makefile.in
@@ -1383,7 +1383,7 @@ bin/winbindd@EXEEXT@: proto_exists $(WINBINDD_OBJ) @BUILD_POPT@ bin/.dummy
@$(CC) $(FLAGS) -o $@ $(WINBINDD_OBJ) $(LDFLAGS) $(DYNEXP) $(LIBS) \
@POPTLIBS@ $(KRB5LIBS) $(LDAP_LIBS) $(PASSDB_LIBS)
-@WINBIND_NSS@: proto_exists $(WINBIND_NSS_OBJ)
+@WINBIND_NSS@: $(WINBIND_NSS_OBJ)
@echo "Linking $@"
@$(SHLD) $(WINBIND_NSS_LDSHFLAGS) -o $@ $(WINBIND_NSS_OBJ) \
@WINBIND_NSS_EXTRA_LIBS@ @SONAMEFLAG@`basename $@`@NSSSONAMEVERSIONSUFFIX@
@@ -1400,7 +1400,7 @@ bin/winbindd@EXEEXT@: proto_exists $(WINBINDD_OBJ) @BUILD_POPT@ bin/.dummy
$(LDAP_LIBS) $(LIBS) -lcom_err \
@SONAMEFLAG@`basename $@`
-bin/pam_winbind.@SHLIBEXT@: proto_exists $(PAM_WINBIND_OBJ) bin/.dummy
+bin/pam_winbind.@SHLIBEXT@: $(PAM_WINBIND_OBJ) bin/.dummy
@echo "Linking shared library $@"
@$(SHLD) $(LDSHFLAGS) -o $@ $(PAM_WINBIND_OBJ) -lpam @INIPARSERLIBS@ $(GPLIBS) \
@SONAMEFLAG@`basename $@`
@@ -1623,7 +1623,7 @@ bin/ntlm_auth@EXEEXT@: proto_exists $(NTLM_AUTH_OBJ) $(PARAM_OBJ) $(LIB_NONSMBD_
$(PARAM_OBJ) $(LIB_NONSMBD_OBJ) $(LIBS) \
@POPTLIBS@ $(KRB5LIBS) $(LDAP_LIBS) $(NSCD_LIBS)
-bin/pam_smbpass.@SHLIBEXT@: proto_exists $(PAM_SMBPASS_OBJ)
+bin/pam_smbpass.@SHLIBEXT@: $(PAM_SMBPASS_OBJ)
@echo "Linking shared library $@"
@$(SHLD) $(LDSHFLAGS) -o $@ $(PAM_SMBPASS_OBJ) -lpam $(DYNEXP) $(LIBS) $(LDAP_LIBS) $(KRB5LIBS) $(NSCD_LIBS)