merging in changes from HEAD

(This used to be commit e8273549a8d92f46db1699e6a41f4618f272ee73)

diff --git a/source3/Makefile.in b/source3/Makefile.in
index 8a7b065bc74f0c4b89292596eb7ef316dce0c706..4584b9e758ca827f69258e83724fc6e5b38c6f0c 100644 (file)
--- a/source3/Makefile.in
+++ b/source3/Makefile.in
@@ -543,7 +543,7 @@ talloctort : SHOWFLAGS bin/talloctort
 
 nsswitch : SHOWFLAGS $(WINBIND_PROGS) $(WINBIND_SPROGS) $(LPROGS)
 
-wins : SHOWFLAGS nsswitch/libnss_wins.so
+wins : SHOWFLAGS nsswitch/libnss_wins.@SHLIBEXT@
 
 everything: all libsmbclient debug2html smbfilter talloctort 
 
@@ -785,20 +785,20 @@ bin/winbindd: $(WINBINDD_OBJ) bin/.dummy
        @echo Linking $@
        @$(LINK) -o $@ $(WINBINDD_OBJ) $(DYNEXP) $(LIBS)
 
-nsswitch/libns_winbind.so: $(WINBIND_NSS_PICOBJS)
+nsswitch/libns_winbind.@SHLIBEXT@: $(WINBIND_NSS_PICOBJS)
        @echo "Linking $@"
        @$(SHLD) @LDSHFLAGS@ -o $@ $(WINBIND_NSS_PICOBJS) @WINBIND_NSS_EXTRA_LIBS@ \
                @SONAMEFLAG@`basename $@`
 
-nsswitch/libnss_winbind.so: $(WINBIND_NSS_PICOBJS)
+nsswitch/libnss_winbind.@SHLIBEXT@: $(WINBIND_NSS_PICOBJS)
        @echo "Linking $@"
        @$(SHLD) $(LDSHFLAGS) -o $@ $(WINBIND_NSS_PICOBJS) @WINBIND_NSS_EXTRA_LIBS@ \
                @SONAMEFLAG@`basename $@`
 
-nsswitch/pam_winbind.so: $(PAM_WINBIND_OBJ) bin/.dummy
+nsswitch/pam_winbind.@SHLIBEXT@: $(PAM_WINBIND_OBJ) bin/.dummy
        @echo Linking $@
        @$(SHLD) $(LDSHFLAGS) -o $@ $(PAM_WINBIND_OBJ) \
-               @SONAMEFLAG@`basename $@`
+               @SONAMEFLAG@`basename $@` -lpam
 
 bin/wbinfo: $(WBINFO_OBJ) $(PARAM_OBJ) $(LIB_OBJ) \
                $(UBIQX_OBJ) $(SECRETS_OBJ) @BUILD_POPT@ bin/.dummy
@@ -839,7 +839,7 @@ installswat: installdirs
        @$(SHELL) $(srcdir)/script/installswat.sh $(SWATDIR) $(srcdir)
 
 installclientlib:
-       -$(INSTALLCMD) bin/libsmbclient.so ${prefix}/lib
+       -$(INSTALLCMD) bin/libsmbclient.@SHLIBEXT@ ${prefix}/lib
        -$(INSTALLCMD) -d ${prefix}/include
        -$(INSTALLCMD) include/libsmbclient.h ${prefix}/include
 
@@ -1004,10 +1004,10 @@ ctags:
        ctags `find $(srcdir) -name "*.[ch]" | grep -v /CVS/`
 
 realclean: clean delheaders
-       -rm -f config.log $(PROGS) $(SPROGS) bin/.dummy
-       -rmdir bin
+       -rm -f config.log $(PROGS) $(SPROGS) bin/.dummy script/findsmb
 
 distclean: realclean
+       -rm -f include/stamp-h
        -rm -f include/config.h Makefile
        -rm -f config.status config.cache so_locations
        -rm -rf .deps