From 98985b4eb520918e54f0c985a07a044f2096d992 Mon Sep 17 00:00:00 2001 From: Gerald Carter Date: Tue, 8 Apr 2003 14:01:09 +0000 Subject: [PATCH] oopss. message for previous commit should have been * smbpasswd : s/getpass/get_pass/ * add EXEEXT patches from Paul Green --- source/Makefile.in | 105 +++++++++++++++++++++++++++-------------------------- 1 file changed, 54 insertions(+), 51 deletions(-) diff --git a/source/Makefile.in b/source/Makefile.in index 093f4058ac8..584911e7594 100644 --- a/source/Makefile.in +++ b/source/Makefile.in @@ -17,6 +17,7 @@ CPPFLAGS=@CPPFLAGS@ LDFLAGS=@LDFLAGS@ AWK=@AWK@ DYNEXP=@DYNEXP@ +EXEEXT=@EXEEXT@ TERMLDFLAGS=@TERMLDFLAGS@ TERMLIBS=@TERMLIBS@ @@ -96,13 +97,15 @@ WINBIND_SPROGS = @WINBIND_STARGETS@ WINBIND_PAM_PROGS = @WINBIND_PAM_TARGETS@ WINBIND_LPROGS = @WINBIND_LTARGETS@ -SPROGS = bin/smbd bin/nmbd bin/swat -PROGS1 = bin/smbclient bin/smbspool bin/testparm bin/testprns bin/smbstatus bin/smbcontrol bin/tdbbackup bin/make_printerdef @RUNPROG@ -PROGS2 = bin/smbpasswd bin/make_smbcodepage bin/rpcclient bin/make_unicodemap bin/smbcacls @WRAPPROG@ @WRAP@ @WRAP32@ @PAM_MOD@ @PDBEDIT@ @LIBSMBCLIENT@ +SPROGS = bin/smbd$(EXEEXT) bin/nmbd$(EXEEXT) bin/swat$(EXEEXT) +PROGS1 = bin/smbclient$(EXEEXT) bin/smbspool$(EXEEXT) bin/testparm$(EXEEXT) bin/testprns$(EXEEXT) bin/smbstatus$(EXEEXT) \ + bin/smbcontrol$(EXEEXT) bin/tdbbackup$(EXEEXT) bin/make_printerdef$(EXEEXT) @RUNPROG@ +PROGS2 = bin/smbpasswd$(EXEEXT) bin/make_smbcodepage$(EXEEXT) bin/rpcclient$(EXEEXT) bin/make_unicodemap$(EXEEXT) \ + bin/smbcacls$(EXEEXT) @WRAPPROG@ @WRAP@ @WRAP32@ @PAM_MOD@ @PDBEDIT@ @LIBSMBCLIENT@ MPROGS = @MPROGS@ LPROGS = $(WINBIND_PAM_PROGS) $(WINBIND_LPROGS) -PROGS = $(PROGS1) $(PROGS2) $(MPROGS) bin/nmblookup -TORTURE_PROGS = bin/smbtorture bin/msgtest bin/masktest bin/locktest bin/locktest2 +PROGS = $(PROGS1) $(PROGS2) $(MPROGS) bin/nmblookup$(EXEEXT) +TORTURE_PROGS = bin/smbtorture$(EXEEXT) bin/msgtest$(EXEEXT) bin/masktest$(EXEEXT) bin/locktest$(EXEEXT) bin/locktest2$(EXEEXT) SHLIBS = @LIBSMBCLIENT@ SCRIPTS = $(srcdir)/script/smbtar $(srcdir)/script/findsmb @@ -438,27 +441,28 @@ libsmbclient : CHECK bin/libsmbclient.a @LIBSMBCLIENT_SHARED@ torture : CHECK $(TORTURE_PROGS) -smbtorture : CHECK bin/smbtorture +smbtorture : CHECK bin/smbtorture$(EXEEXT) +bin/smbtorture : CHECK bin/smbtorture$(EXEEXT) -masktest : CHECK bin/masktest +masktest : CHECK bin/masktest$(EXEEXT) -msgtest : CHECK bin/msgtest +msgtest : CHECK bin/msgtest$(EXEEXT) -locktest : CHECK bin/locktest +locktest : CHECK bin/locktest$(EXEEXT) -smbcacls : CHECK bin/smbcacls +smbcacls : CHECK bin/smbcacls$(EXEEXT) -locktest2 : CHECK bin/locktest2 +locktest2 : CHECK bin/locktest2$(EXEEXT) -rpctorture : CHECK bin/rpctorture +rpctorture : CHECK bin/rpctorture$(EXEEXT) -bin/rpccheck: $(RPCCHECK_OBJ) bin/.dummy +bin/rpccheck$(EXEEXT): $(RPCCHECK_OBJ) bin/.dummy @echo Linking $@ @$(CC) $(FLAGS) -o $@ $(RPCCHECK_OBJ) $(LDFLAGS) $(LIBS) -debug2html : CHECK bin/debug2html +debug2html : CHECK bin/debug2html$(EXEEXT) -smbfilter : CHECK bin/smbfilter +smbfilter : CHECK bin/smbfilter$(EXEEXT) nsswitch : CHECK $(WINBIND_PROGS) $(WINBIND_SPROGS) $(LPROGS) @@ -512,128 +516,127 @@ bin/.dummy: dir=bin $(MAKEDIR); fi @: >> $@ || : > $@ # what a fancy emoticon! -bin/smbd: $(SMBD_OBJ) bin/.dummy +bin/smbd$(EXEEXT): $(SMBD_OBJ) bin/.dummy @echo Linking $@ @$(CC) $(FLAGS) -o $@ $(SMBD_OBJ) $(LDFLAGS) $(DYNEXP) $(LIBS) $(LDAPLIBS) -bin/nmbd: $(NMBD_OBJ) bin/.dummy +bin/nmbd$(EXEEXT): $(NMBD_OBJ) bin/.dummy @echo Linking $@ @$(CC) $(FLAGS) -o $@ $(NMBD_OBJ) $(LDFLAGS) $(LIBS) -bin/swat: $(SWAT_OBJ) bin/.dummy +bin/swat$(EXEEXT): $(SWAT_OBJ) bin/.dummy @echo Linking $@ @$(CC) $(FLAGS) -o $@ $(SWAT_OBJ) $(LDFLAGS) $(DYNEXP) $(LIBS) $(LDAPLIBS) -bin/rpcclient: $(RPCCLIENT_OBJ) bin/.dummy +bin/rpcclient$(EXEEXT): $(RPCCLIENT_OBJ) bin/.dummy @echo Linking $@ @$(CC) $(FLAGS) -o $@ $(RPCCLIENT_OBJ) $(LDFLAGS) $(DYNEXP) $(TERMLDFLAGS) $(TERMLIBS) $(LIBS) $(LDAPLIBS) -bin/smbclient: $(CLIENT_OBJ) bin/.dummy +bin/smbclient$(EXEEXT): $(CLIENT_OBJ) bin/.dummy @echo Linking $@ @$(CC) $(FLAGS) -o $@ $(CLIENT_OBJ) $(LDFLAGS) $(TERMLDFLAGS) $(TERMLIBS) $(LIBS) -bin/smbspool: $(CUPS_OBJ) bin/.dummy +bin/smbspool$(EXEEXT): $(CUPS_OBJ) bin/.dummy @echo Linking $@ @$(CC) $(FLAGS) -o $@ $(CUPS_OBJ) $(LDFLAGS) $(LIBS) -bin/smbmount: $(MOUNT_OBJ) bin/.dummy +bin/smbmount$(EXEEXT): $(MOUNT_OBJ) bin/.dummy @echo Linking $@ @$(CC) $(FLAGS) -o $@ $(MOUNT_OBJ) $(LDFLAGS) $(LIBS) -bin/smbmnt: $(MNT_OBJ) bin/.dummy +bin/smbmnt$(EXEEXT): $(MNT_OBJ) bin/.dummy @echo Linking $@ @$(CC) $(FLAGS) -o $@ $(MNT_OBJ) $(LDFLAGS) $(LIBS) -bin/smbumount: $(UMOUNT_OBJ) bin/.dummy +bin/smbumount$(EXEEXT): $(UMOUNT_OBJ) bin/.dummy @echo Linking $@ @$(CC) $(FLAGS) -o $@ $(UMOUNT_OBJ) $(LDFLAGS) $(LIBS) -bin/testparm: $(TESTPARM_OBJ) bin/.dummy +bin/testparm$(EXEEXT): $(TESTPARM_OBJ) bin/.dummy @echo Linking $@ @$(CC) $(FLAGS) -o $@ $(TESTPARM_OBJ) $(LDFLAGS) $(LIBS) -bin/testprns: $(TESTPRNS_OBJ) bin/.dummy +bin/testprns$(EXEEXT): $(TESTPRNS_OBJ) bin/.dummy @echo Linking $@ @$(CC) $(FLAGS) -o $@ $(TESTPRNS_OBJ) $(LDFLAGS) $(LIBS) -bin/smbstatus: $(STATUS_OBJ) bin/.dummy +bin/smbstatus$(EXEEXT): $(STATUS_OBJ) bin/.dummy @echo Linking $@ @$(CC) $(FLAGS) -o $@ $(STATUS_OBJ) $(LDFLAGS) $(LIBS) -bin/smbcontrol: $(SMBCONTROL_OBJ) bin/.dummy +bin/smbcontrol$(EXEEXT): $(SMBCONTROL_OBJ) bin/.dummy @echo Linking $@ @$(CC) $(FLAGS) -o $@ $(SMBCONTROL_OBJ) $(LDFLAGS) $(LIBS) -bin/smbpasswd: $(SMBPASSWD_OBJ) bin/.dummy +bin/smbpasswd$(EXEEXT): $(SMBPASSWD_OBJ) bin/.dummy @echo Linking $@ @$(CC) $(FLAGS) -o $@ $(SMBPASSWD_OBJ) $(LDFLAGS) $(DYNEXP) $(LIBS) $(LDAPLIBS) -bin/pdbedit: $(PDBEDIT_OBJ) bin/.dummy +bin/pdbedit$(EXEEXT): $(PDBEDIT_OBJ) bin/.dummy @echo Linking $@ @$(CC) $(FLAGS) -o $@ $(PDBEDIT_OBJ) $(LDFLAGS) $(DYNEXP) $(LIBS) $(LDAPLIBS) -bin/make_smbcodepage: $(MAKE_SMBCODEPAGE_OBJ) bin/.dummy +bin/make_smbcodepage$(EXEEXT): $(MAKE_SMBCODEPAGE_OBJ) bin/.dummy @echo Linking $@ @$(CC) $(FLAGS) -o $@ $(MAKE_SMBCODEPAGE_OBJ) $(LDFLAGS) $(LIBS) -bin/make_unicodemap: $(MAKE_UNICODEMAP_OBJ) bin/.dummy +bin/make_unicodemap$(EXEEXT): $(MAKE_UNICODEMAP_OBJ) bin/.dummy @echo Linking $@ @$(CC) $(FLAGS) -o $@ $(MAKE_UNICODEMAP_OBJ) $(LDFLAGS) $(LIBS) -bin/nmblookup: $(NMBLOOKUP_OBJ) bin/.dummy +bin/nmblookup$(EXEEXT): $(NMBLOOKUP_OBJ) bin/.dummy @echo Linking $@ @$(CC) $(FLAGS) -o $@ $(NMBLOOKUP_OBJ) $(LDFLAGS) $(LIBS) -bin/make_printerdef: $(MAKE_PRINTERDEF_OBJ) bin/.dummy +bin/make_printerdef$(EXEEXT): $(MAKE_PRINTERDEF_OBJ) bin/.dummy @echo Linking $@ @$(CC) $(FLAGS) -o $@ $(MAKE_PRINTERDEF_OBJ) $(LDFLAGS) $(LIBS) -bin/smbtorture: $(SMBTORTURE_OBJ) bin/.dummy +bin/smbtorture$(EXEEXT): $(SMBTORTURE_OBJ) bin/.dummy @echo Linking $@ @$(CC) $(FLAGS) -o $@ $(SMBTORTURE_OBJ) $(LDFLAGS) $(LIBS) -bin/masktest: $(MASKTEST_OBJ) bin/.dummy +bin/masktest$(EXEEXT): $(MASKTEST_OBJ) bin/.dummy @echo Linking $@ @$(CC) $(FLAGS) -o $@ $(MASKTEST_OBJ) $(LDFLAGS) $(LIBS) -bin/msgtest: $(MSGTEST_OBJ) bin/.dummy +bin/msgtest$(EXEEXT): $(MSGTEST_OBJ) bin/.dummy @echo Linking $@ @$(CC) $(FLAGS) -o $@ $(MSGTEST_OBJ) $(LDFLAGS) $(LIBS) -bin/smbcacls: $(SMBCACLS_OBJ) bin/.dummy +bin/smbcacls$(EXEEXT): $(SMBCACLS_OBJ) bin/.dummy @echo Linking $@ @$(CC) $(FLAGS) -o $@ $(SMBCACLS_OBJ) $(LDFLAGS) $(DYNEXP) $(LIBS) $(LDAPLIBS) -bin/locktest: $(LOCKTEST_OBJ) bin/.dummy +bin/locktest$(EXEEXT): $(LOCKTEST_OBJ) bin/.dummy @echo Linking $@ @$(CC) $(FLAGS) -o $@ $(LOCKTEST_OBJ) $(LDFLAGS) $(LIBS) -bin/locktest2: $(LOCKTEST2_OBJ) bin/.dummy +bin/locktest2$(EXEEXT): $(LOCKTEST2_OBJ) bin/.dummy @echo Linking $@ @$(CC) $(FLAGS) -o $@ $(LOCKTEST2_OBJ) $(LDFLAGS) $(LIBS) -bin/nsstest: $(NSSTEST_OBJ) bin/.dummy +bin/nsstest$(EXEEXT): $(NSSTEST_OBJ) bin/.dummy @echo Linking $@ @$(CC) $(FLAGS) -o $@ $(NSSTEST_OBJ) $(LDFLAGS) $(LIBS) -bin/rpctorture: $(RPCTORTURE_OBJ) bin/.dummy +bin/rpctorture$(EXEEXT): $(RPCTORTURE_OBJ) bin/.dummy @echo Linking $@ @$(CC) $(FLAGS) -o $@ $(RPCTORTURE_OBJ) $(LDFLAGS) $(DYNEXP) $(LIBS) -bin/debug2html: $(DEBUG2HTML_OBJ) bin/.dummy +bin/debug2html$(EXEEXT): $(DEBUG2HTML_OBJ) bin/.dummy @echo Linking $@ @$(CC) $(FLAGS) -o $@ $(DEBUG2HTML_OBJ) $(LDFLAGS) $(LIBS) -bin/smbfilter: $(SMBFILTER_OBJ) bin/.dummy +bin/smbfilter$(EXEEXT): $(SMBFILTER_OBJ) bin/.dummy @echo Linking $@ @$(CC) $(FLAGS) -o $@ $(SMBFILTER_OBJ) $(LDFLAGS) $(LIBS) - -bin/smbw_sample: $(SMBW_OBJ) utils/smbw_sample.o bin/.dummy +bin/smbw_sample$(EXEEXT): $(SMBW_OBJ) utils/smbw_sample.o bin/.dummy @echo Linking $@ @$(CC) $(FLAGS) -o $@ $(SMBW_OBJ) utils/smbw_sample.o $(LDFLAGS) $(LIBS) -bin/smbsh: $(SMBSH_OBJ) bin/.dummy +bin/smbsh$(EXEEXT): $(SMBSH_OBJ) bin/.dummy @echo Linking $@ @$(CC) $(FLAGS) -o $@ $(SMBSH_OBJ) $(LDFLAGS) $(LIBS) @@ -666,7 +669,7 @@ nsswitch/libnss_wins.so: $(NSS_OBJ) @$(SHLD) @LDSHFLAGS@ -o $@ $(NSS_OBJ) -lc \ @SONAMEFLAG@`basename $@` -bin/winbindd: $(WINBINDD_OBJ) bin/.dummy +bin/winbindd$(EXEEXT): $(WINBINDD_OBJ) bin/.dummy @echo Linking $@ @$(LINK) -o $@ $(WINBINDD_OBJ) $(DYNEXP) $(LIBS) $(LDAPLIBS) @@ -685,17 +688,17 @@ nsswitch/pam_winbind.so: $(PAM_WINBIND_OBJ) @$(SHLD) @LDSHFLAGS@ -o $@ $(PAM_WINBIND_OBJ) \ @SONAMEFLAG@`basename $@` -bin/wbinfo: $(WBINFO_OBJ) $(PARAM_OBJ) $(LIB_OBJ) $(NOPROTO_OBJ) \ +bin/wbinfo$(EXEEXT): $(WBINFO_OBJ) $(PARAM_OBJ) $(LIB_OBJ) $(NOPROTO_OBJ) \ $(UBIQX_OBJ) @BUILD_POPT@ bin/.dummy @echo Linking $@ @$(LINK) -o $@ $(WBINFO_OBJ) $(PARAM_OBJ) $(LIB_OBJ) $(NOPROTO_OBJ) \ $(UBIQX_OBJ) $(LIBS) @BUILD_POPT@ -bin/tdbbackup: $(TDBBACKUP_OBJ) bin/.dummy +bin/tdbbackup$(EXEEXT): $(TDBBACKUP_OBJ) bin/.dummy @echo Linking $@ @$(CC) $(FLAGS) -o $@ $(TDBBACKUP_OBJ) -bin/tdbdump: $(TDBDUMP_OBJ) bin/.dummy +bin/tdbdump$(EXEEXT): $(TDBDUMP_OBJ) bin/.dummy @echo Linking $@ @$(CC) $(FLAGS) -o $@ $(TDBDUMP_OBJ) -- 2.11.4.GIT