[SCM] Samba Shared Repository - branch v3-2-test updated - initial-v3-2-test-1377-g561e529

[Stefan Metzmacher]

The branch, v3-2-test has been updated
       via  561e529a711338b2a3191f1b04f384f5ab3413ac (commit)
       via  58c806dbf85fd634c8f3559a035751a4cd0b5c4b (commit)
      from  15d0e574386e39a4d2fa61cd268b48dfa5c84dcb (commit)

http://gitweb.samba.org/?p=samba.git;a=shortlog;h=v3-2-test


- Log -----------------------------------------------------------------
commit 561e529a711338b2a3191f1b04f384f5ab3413ac
Author: Stefan Metzmacher <metze at samba.org>
Date:   Tue Jan 15 14:59:46 2008 +0100

    libwbclient: don't link talloc.o into libwbclient.a
    
    hopefully fix the build...(and hopefully the correct fix)
    
    metze

commit 58c806dbf85fd634c8f3559a035751a4cd0b5c4b
Author: Stefan Metzmacher <metze at samba.org>
Date:   Tue Jan 15 15:56:58 2008 +0100

    Revert "libwbclient: don't link talloc.o into libwbclient.a"
    
    This reverts commit 9a4b6fd3e21f54a0ff83f1fd0d0d5331a2cfdd0a.
    
    Sorry...
    
    metze

-----------------------------------------------------------------------

Summary of changes:
 source/Makefile.in |    8 ++++----
 1 files changed, 4 insertions(+), 4 deletions(-)


Changeset truncated at 500 lines:

diff --git a/source/Makefile.in b/source/Makefile.in
index a734109..d65b10e 100644
--- a/source/Makefile.in
+++ b/source/Makefile.in
@@ -1404,9 +1404,9 @@ bin/libwbclient. at SHLIBEXT@: $(BINARY_PREREQS) $(LIBWBCLIENT_OBJ)
 		@SONAMEFLAG@`basename $@`.$(SONAME_VER)
 	@ln -s -f `basename $@` $@.$(SONAME_VER)
 
-bin/libwbclient.a: $(BINARY_PREREQS) $(LIBWBCLIENT_OBJ)
+bin/libwbclient.a: $(BINARY_PREREQS) $(LIBWBCLIENT_OBJ0)
 	@echo Linking non-shared library $@
-	@-$(AR) -rc $@ $(LIBWBCLIENT_OBJ)
+	@-$(AR) -rc $@ $(LIBWBCLIENT_OBJ0)
 
 bin/libaddns. at SHLIBEXT@: $(BINARY_PREREQS) $(LIBADDNS_OBJ)
 	@echo Linking shared library $@
@@ -1434,9 +1434,9 @@ bin/libsmbclient. at SHLIBEXT@: $(BINARY_PREREQS) $(LIBSMBCLIENT_OBJ)
 		$(KRB5LIBS) $(LDAP_LIBS) $(NSCD_LIBS) \
 		@SONAMEFLAG@`basename $@`.$(SONAME_VER)
 
-bin/libsmbclient.a: $(BINARY_PREREQS) $(LIBSMBCLIENT_OBJ0)
+bin/libsmbclient.a: $(BINARY_PREREQS) $(LIBSMBCLIENT_OBJ)
 	@echo Linking non-shared library $@
-	@-$(AR) -rc $@ $(LIBSMBCLIENT_OBJ0)
+	@-$(AR) -rc $@ $(LIBSMBCLIENT_OBJ)
 
 bin/libsmbsharemodes. at SHLIBEXT@: $(BINARY_PREREQS) $(LIBSMBSHAREMODES_OBJ)
 	@echo Linking shared library $@


-- 
Samba Shared Repository