[SCM] Samba Shared Repository - branch v3-2-test updated - release-3-2-0pre2-2916-g41d440c

Michael Adam obnox at samba.org
Fri Aug 15 11:10:46 GMT 2008


The branch, v3-2-test has been updated
       via  41d440c3198752281556699cc9744b490b9b0a5e (commit)
      from  40e58351472689dbefb02e185d958bee5ca83937 (commit)

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


- Log -----------------------------------------------------------------
commit 41d440c3198752281556699cc9744b490b9b0a5e
Author: Derrell Lipman <derrell.lipman at unwireduniverse.com>
Date:   Wed Jul 16 09:47:06 2008 -0400

    Static libsmbclient library needs to include all objects
    
      LIBSMBCLIENT_OBJ0 contains only the libsmb/libsmb_*.o files.  We need the
      more inclusive set of object files defined by LIBSMBCLIENT_OBJ1.
    
    Derrell
    (cherry picked from commit 6c33c620072d641fc19ca0224c16af75f6cd7e9e)

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

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


Changeset truncated at 500 lines:

diff --git a/source/Makefile.in b/source/Makefile.in
index cf0c98a..8df9d66 100644
--- a/source/Makefile.in
+++ b/source/Makefile.in
@@ -1900,9 +1900,9 @@ $(LIBSMBCLIENT_SHARED_TARGET): $(LIBSMBCLIENT_SHARED_TARGET_SONAME)
 	@rm -f $@
 	@ln -s `basename $(LIBSMBCLIENT_SHARED_TARGET_SONAME)` $@
 
-$(LIBSMBCLIENT_STATIC_TARGET): $(BINARY_PREREQS) $(LIBSMBCLIENT_OBJ0)
+$(LIBSMBCLIENT_STATIC_TARGET): $(BINARY_PREREQS) $(LIBSMBCLIENT_OBJ1)
 	@echo Linking non-shared library $@
-	@-$(AR) -rc $@ $(LIBSMBCLIENT_OBJ0)
+	@-$(AR) -rc $@ $(LIBSMBCLIENT_OBJ1)
 
 libsmbclient: $(LIBSMBCLIENT)
 


-- 
Samba Shared Repository


More information about the samba-cvs mailing list