summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTim Potter <tpot@samba.org>2003-09-05 03:05:37 +0000
committerTim Potter <tpot@samba.org>2003-09-05 03:05:37 +0000
commit5bbdf6a5d0266129925112fbbdd480c0f683557b (patch)
treefa69a500a9909726da3b05c7d6f42f5e0d1fafb2
parentff78c21f51263ea7f6108acddb610bbd775efc87 (diff)
downloadsamba-5bbdf6a5d0266129925112fbbdd480c0f683557b.tar.gz
samba-5bbdf6a5d0266129925112fbbdd480c0f683557b.tar.bz2
samba-5bbdf6a5d0266129925112fbbdd480c0f683557b.zip
Move $(KRBCLIENT_OBJ) to libnss_wins PICOBJ variable so it is converted to
relocatable form. Added a comment about this in the hope that it won't happen again. Renamed PAM_WINBIND_OBJ to PAM_WINBIND_PICOBJ to make it a bit clearer. (This used to be commit 04797e12d85a4b4d616397dd1283e5a65af5adab)
-rw-r--r--source3/Makefile.in13
1 files changed, 8 insertions, 5 deletions
diff --git a/source3/Makefile.in b/source3/Makefile.in
index 94b7fb4531..6232bf62da 100644
--- a/source3/Makefile.in
+++ b/source3/Makefile.in
@@ -446,7 +446,7 @@ RPCCLIENT_OBJ = $(RPCCLIENT_OBJ1) \
$(LIBADS_OBJ) $(SECRETS_OBJ) $(POPT_LIB_OBJ) \
$(SMBLDAP_OBJ) $(DCUTIL_OBJ) lib/dummyroot.o
-PAM_WINBIND_OBJ = nsswitch/pam_winbind.po nsswitch/wb_common.po lib/replace1.po lib/snprintf.po
+PAM_WINBIND_PICOBJ = nsswitch/pam_winbind.po nsswitch/wb_common.po lib/replace1.po lib/snprintf.po
SMBW_OBJ1 = smbwrapper/smbw.o \
smbwrapper/smbw_dir.o smbwrapper/smbw_stat.o \
@@ -576,7 +576,7 @@ PROTO_OBJ = $(SMBD_OBJ_MAIN) \
$(RPC_ECHO_OBJ) $(SMBLDAP_OBJ) $(IDMAP_OBJ) libsmb/spnego.o
WINBIND_WINS_NSS_OBJ = nsswitch/wins.o $(PARAM_OBJ) $(UBIQX_OBJ) \
- $(LIBSMB_OBJ) $(LIB_OBJ) $(NSSWINS_OBJ)
+ $(LIBSMB_OBJ) $(LIB_OBJ) $(NSSWINS_OBJ) $(KRBCLIENT_OBJ)
WINBIND_WINS_NSS_PICOBJS = $(WINBIND_WINS_NSS_OBJ:.o=.po)
@@ -1000,6 +1000,9 @@ bin/winbindd@EXEEXT@: $(WINBINDD_OBJ) @BUILD_POPT@ bin/.dummy
@echo "Linking $@"
@$(LINK) -o $@ $(WINBINDD_OBJ) $(DYNEXP) $(LIBS) @POPTLIBS@ $(KRB5LIBS) $(LDAPLIBS)
+# Please don't add .o files to libnss_winbind, libnss_wins, or the pam_winbind
+# libraries. Add to the appropriate PICOBJ variable instead.
+
@WINBIND_NSS@: $(WINBIND_NSS_PICOBJS)
@echo "Linking $@"
@$(SHLD) $(WINBIND_NSS_LDSHFLAGS) -o $@ $(WINBIND_NSS_PICOBJS) \
@@ -1008,12 +1011,12 @@ bin/winbindd@EXEEXT@: $(WINBINDD_OBJ) @BUILD_POPT@ bin/.dummy
@WINBIND_WINS_NSS@: $(WINBIND_WINS_NSS_PICOBJS)
@echo "Linking $@"
@$(SHLD) $(LDSHFLAGS) -o $@ $(WINBIND_WINS_NSS_PICOBJS) \
- $(KRBCLIENT_OBJ) $(LDAPLIBS) $(KRB5LIBS) -lc \
+ $(LDAPLIBS) $(KRB5LIBS) -lc \
@SONAMEFLAG@`basename $@`
-nsswitch/pam_winbind.@SHLIBEXT@: $(PAM_WINBIND_OBJ) bin/.dummy
+nsswitch/pam_winbind.@SHLIBEXT@: $(PAM_WINBIND_PICOBJ) bin/.dummy
@echo "Linking $@"
- @$(SHLD) $(LDSHFLAGS) -o $@ $(PAM_WINBIND_OBJ) \
+ @$(SHLD) $(LDSHFLAGS) -o $@ $(PAM_WINBIND_PICOBJ) \
@SONAMEFLAG@`basename $@` -lpam
bin/rhosts.@SHLIBEXT@: $(AUTH_RHOSTS_OBJ:.o=.po)