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

Michael Adam obnox at samba.org
Tue Jul 8 15:01:32 GMT 2008


The branch, v3-3-test has been updated
       via  22735ee14a244dbda768c26dbe83a1b2aa3c03ec (commit)
       via  c4e51f5e761ab23fa08197fa9a52af6db4ab839d (commit)
      from  9be6b46f7715cdc7f77308d7613e8df73effe3c1 (commit)

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


- Log -----------------------------------------------------------------
commit 22735ee14a244dbda768c26dbe83a1b2aa3c03ec
Author: Michael Adam <obnox at samba.org>
Date:   Tue Jul 8 17:00:07 2008 +0200

    build: move definition of LIBADDNS_OBJ back up to LIBADDNS_OBJ0
    
    to keep stuff together...
    
    Michael

commit c4e51f5e761ab23fa08197fa9a52af6db4ab839d
Author: Michael Adam <obnox at samba.org>
Date:   Tue Jul 8 16:55:52 2008 +0200

    build: fix build of smbget by moving LIBSMBCLIENT_OBJ* defs up again
    
    to their original place. The problem was that LIBSMCLIENT_OBJ1 is used
    in SMBGET_OBJ and that the difinition of LIBSMBCLIENT_OBJ1 was moved
    below the bin/smbget target. Somehow it had worked for me.
    
    Thanks to Derrell for pointing that out.
    
    Michael

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

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


Changeset truncated at 500 lines:

diff --git a/source/Makefile.in b/source/Makefile.in
index b4264de..b0d2e1b 100644
--- a/source/Makefile.in
+++ b/source/Makefile.in
@@ -344,6 +344,7 @@ KRBCLIENT_OBJ = libads/kerberos.o libads/ads_status.o
 
 LIBADDNS_OBJ0 = libaddns/dnsrecord.o libaddns/dnsutils.o  libaddns/dnssock.o \
 	       libaddns/dnsgss.o libaddns/dnsmarshall.o
+LIBADDNS_OBJ = $(LIBADDNS_OBJ0) @LIBTALLOC_STATIC@
 
 GPEXT_OBJ = libgpo/gpext/gpext.o @GPEXT_STATIC@
 
@@ -763,6 +764,28 @@ RPCCLIENT_OBJ = $(RPCCLIENT_OBJ1) \
 PAM_WINBIND_OBJ = nsswitch/pam_winbind.o $(WBCOMMON_OBJ) \
 		  $(LIBREPLACE_OBJ) @BUILD_INIPARSER@
 
+LIBSMBCLIENT_OBJ0 = \
+		    libsmb/libsmb_cache.o \
+		    libsmb/libsmb_compat.o \
+		    libsmb/libsmb_context.o \
+		    libsmb/libsmb_dir.o \
+		    libsmb/libsmb_file.o \
+		    libsmb/libsmb_misc.o \
+		    libsmb/libsmb_path.o \
+		    libsmb/libsmb_printjob.o \
+		    libsmb/libsmb_server.o \
+		    libsmb/libsmb_stat.o \
+		    libsmb/libsmb_xattr.o \
+		    libsmb/libsmb_setget.o
+
+LIBSMBCLIENT_OBJ1 = $(LIBSMBCLIENT_OBJ0) \
+		    $(PARAM_OBJ) $(LIB_NONSMBD_OBJ) \
+		    $(LIBSMB_OBJ) $(KRBCLIENT_OBJ) \
+		    $(LIBMSRPC_OBJ) $(LIBMSRPC_GEN_OBJ) $(RPC_PARSE_OBJ) \
+		    $(PASSDB_OBJ) $(SMBLDAP_OBJ) $(GROUPDB_OBJ) $(LDB_OBJ)
+
+LIBSMBCLIENT_OBJ = $(LIBSMBCLIENT_OBJ1) @LIBWBCLIENT_STATIC@
+
 # This shared library is intended for linking with unit test programs
 # to test Samba internals.  It's called libbigballofmud.so to
 # discourage casual usage.
@@ -1737,7 +1760,6 @@ uninstalllibwbclient::
 #
 #-------------------------------------------------------------------
 
-LIBADDNS_OBJ = $(LIBADDNS_OBJ0) @LIBTALLOC_STATIC@
 
 LIBADDNS_SHARED_TARGET=@LIBADDNS_SHARED_TARGET@
 LIBADDNS_SOVER=@LIBADDNS_SOVER@
@@ -1872,28 +1894,6 @@ uninstalllibnetapi::
 #
 #-------------------------------------------------------------------
 
-LIBSMBCLIENT_OBJ0 = \
-		    libsmb/libsmb_cache.o \
-		    libsmb/libsmb_compat.o \
-		    libsmb/libsmb_context.o \
-		    libsmb/libsmb_dir.o \
-		    libsmb/libsmb_file.o \
-		    libsmb/libsmb_misc.o \
-		    libsmb/libsmb_path.o \
-		    libsmb/libsmb_printjob.o \
-		    libsmb/libsmb_server.o \
-		    libsmb/libsmb_stat.o \
-		    libsmb/libsmb_xattr.o \
-		    libsmb/libsmb_setget.o
-
-LIBSMBCLIENT_OBJ1 = $(LIBSMBCLIENT_OBJ0) \
-		    $(PARAM_OBJ) $(LIB_NONSMBD_OBJ) \
-		    $(LIBSMB_OBJ) $(KRBCLIENT_OBJ) \
-		    $(LIBMSRPC_OBJ) $(LIBMSRPC_GEN_OBJ) $(RPC_PARSE_OBJ) \
-		    $(PASSDB_OBJ) $(SMBLDAP_OBJ) $(GROUPDB_OBJ) $(LDB_OBJ)
-
-LIBSMBCLIENT_OBJ = $(LIBSMBCLIENT_OBJ1) @LIBWBCLIENT_STATIC@
-
 LIBSMBCLIENT_SHARED_TARGET=@LIBSMBCLIENT_SHARED_TARGET@
 LIBSMBCLIENT_SOVER=@LIBSMBCLIENT_SOVER@
 LIBSMBCLIENT_SHARED_TARGET_SONAME=$(LIBSMBCLIENT_SHARED_TARGET).$(LIBSMBCLIENT_SOVER)


-- 
Samba Shared Repository


More information about the samba-cvs mailing list