svn commit: samba r15331 - in branches/SAMBA_4_0/source: client libcli librpc ntvfs rpc_server scripting/ejs scripting/swig torture torture/local

jelmer at samba.org jelmer at samba.org
Sat Apr 29 23:22:55 GMT 2006 

Author: jelmer
Date: 2006-04-29 23:22:54 +0000 (Sat, 29 Apr 2006)
New Revision: 15331

WebSVN: http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=rev&root=samba&rev=15331

Log:
Integrate LIBSMB and LIBCLI into new LIBCLI_SMB

Modified:
   branches/SAMBA_4_0/source/client/config.mk
   branches/SAMBA_4_0/source/libcli/config.mk
   branches/SAMBA_4_0/source/librpc/config.mk
   branches/SAMBA_4_0/source/ntvfs/config.mk
   branches/SAMBA_4_0/source/rpc_server/config.mk
   branches/SAMBA_4_0/source/scripting/ejs/config.mk
   branches/SAMBA_4_0/source/scripting/swig/config.mk
   branches/SAMBA_4_0/source/torture/config.mk
   branches/SAMBA_4_0/source/torture/local/config.mk


Changeset:
Modified: branches/SAMBA_4_0/source/client/config.mk
===================================================================
--- branches/SAMBA_4_0/source/client/config.mk	2006-04-29 20:59:46 UTC (rev 15330)
+++ branches/SAMBA_4_0/source/client/config.mk	2006-04-29 23:22:54 UTC (rev 15331)
@@ -10,7 +10,7 @@
 		LIBSAMBA-CONFIG \
 		SMBREADLINE \
 		LIBSAMBA-UTIL \
-		LIBSMB \
+		LIBCLI_SMB \
 		RPC_NDR_SRVSVC \
 		LIBCLI_LSA \
 		LIBPOPT \
@@ -28,7 +28,7 @@
 		cifsddio.o
 PRIVATE_DEPENDENCIES = \
 		LIBSAMBA-CONFIG \
-		LIBSMB \
+		LIBCLI_SMB \
 		LIBPOPT \
 		POPT_SAMBA \
 		POPT_CREDENTIALS

Modified: branches/SAMBA_4_0/source/libcli/config.mk
===================================================================
--- branches/SAMBA_4_0/source/libcli/config.mk	2006-04-29 20:59:46 UTC (rev 15330)
+++ branches/SAMBA_4_0/source/libcli/config.mk	2006-04-29 23:22:54 UTC (rev 15331)
@@ -99,18 +99,12 @@
 	finddcs.o
 PUBLIC_DEPENDENCIES = LIBCLI_NBT MESSAGING
 
-[LIBRARY::LIBCLI]
+[LIBRARY::LIBCLI_SMB]
 PUBLIC_HEADERS = libcli.h
+PUBLIC_PROTO_HEADER = libcli_proto.h
 VERSION = 0.0.1
 SO_VERSION = 0
 DESCRIPTION = SMB/CIFS client library
-PUBLIC_DEPENDENCIES = LIBCLI_RAW LIBSAMBA-ERRORS LIBCLI_AUTH \
-	LIBCLI_SMB_COMPOSITE LIBCLI_NBT LIBSECURITY LIBCLI_RESOLVE \
-	LIBCLI_DGRAM LIBCLI_SMB2 LIBCLI_FINDDCS
-
-[SUBSYSTEM::LIBSMB]
-PUBLIC_DEPENDENCIES = LIBCLI SOCKET LIBCLI_RESOLVE
-PUBLIC_PROTO_HEADER = libcli_proto.h
 OBJ_FILES = clireadwrite.o \
 		cliconnect.o \
 		clifile.o \
@@ -118,6 +112,9 @@
 		clitrans2.o \
 		climessage.o \
 		clideltree.o
+PUBLIC_DEPENDENCIES = LIBCLI_RAW LIBSAMBA-ERRORS LIBCLI_AUTH \
+	LIBCLI_SMB_COMPOSITE LIBCLI_NBT LIBSECURITY LIBCLI_RESOLVE \
+	LIBCLI_DGRAM LIBCLI_SMB2 LIBCLI_FINDDCS
 
 [SUBSYSTEM::LIBCLI_RAW]
 PRIVATE_PROTO_HEADER = raw/raw_proto.h

Modified: branches/SAMBA_4_0/source/librpc/config.mk
===================================================================
--- branches/SAMBA_4_0/source/librpc/config.mk	2006-04-29 20:59:46 UTC (rev 15330)
+++ branches/SAMBA_4_0/source/librpc/config.mk	2006-04-29 23:22:54 UTC (rev 15331)
@@ -593,7 +593,7 @@
 		rpc/dcerpc_sock.o \
 		rpc/dcerpc_connect.o
 PUBLIC_DEPENDENCIES = \
-		SOCKET LIBCLI_RESOLVE LIBSMB LIBCLI_SMB2 \
+		SOCKET LIBCLI_RESOLVE LIBCLI_SMB LIBCLI_SMB2 \
 		LIBNDR NDR_DCERPC \
 		RPC_NDR_EPMAPPER \
 		NDR_SCHANNEL RPC_NDR_NETLOGON \

Modified: branches/SAMBA_4_0/source/ntvfs/config.mk
===================================================================
--- branches/SAMBA_4_0/source/ntvfs/config.mk	2006-04-29 20:59:46 UTC (rev 15330)
+++ branches/SAMBA_4_0/source/ntvfs/config.mk	2006-04-29 23:22:54 UTC (rev 15331)
@@ -12,7 +12,7 @@
 OBJ_FILES = \
 		cifs/vfs_cifs.o
 PUBLIC_DEPENDENCIES = \
-		LIBCLI
+		LIBCLI_SMB
 # End MODULE ntvfs_cifs
 ################################################
 

Modified: branches/SAMBA_4_0/source/rpc_server/config.mk
===================================================================
--- branches/SAMBA_4_0/source/rpc_server/config.mk	2006-04-29 20:59:46 UTC (rev 15330)
+++ branches/SAMBA_4_0/source/rpc_server/config.mk	2006-04-29 23:22:54 UTC (rev 15331)
@@ -60,7 +60,7 @@
 OBJ_FILES = \
 		remote/dcesrv_remote.o
 PUBLIC_DEPENDENCIES = \
-		LIBSMB NDR_TABLE
+		LIBCLI_SMB NDR_TABLE
 # End MODULE dcerpc_remote
 ################################################
 

Modified: branches/SAMBA_4_0/source/scripting/ejs/config.mk
===================================================================
--- branches/SAMBA_4_0/source/scripting/ejs/config.mk	2006-04-29 20:59:46 UTC (rev 15330)
+++ branches/SAMBA_4_0/source/scripting/ejs/config.mk	2006-04-29 23:22:54 UTC (rev 15331)
@@ -76,7 +76,7 @@
 PUBLIC_DEPENDENCIES = \
 		EJS LIBSAMBA-UTIL \
 		EJSRPC MESSAGING \
-		LIBSAMBA-NET LIBSMB LIBPOPT \
+		LIBSAMBA-NET LIBCLI_SMB LIBPOPT \
 		POPT_CREDENTIALS POPT_SAMBA \
 		dcerpc \
 		NDR_TABLE

Modified: branches/SAMBA_4_0/source/scripting/swig/config.mk
===================================================================
--- branches/SAMBA_4_0/source/scripting/swig/config.mk	2006-04-29 20:59:46 UTC (rev 15330)
+++ branches/SAMBA_4_0/source/scripting/swig/config.mk	2006-04-29 23:22:54 UTC (rev 15331)
@@ -2,7 +2,7 @@
 # Start LIBRARY swig_dcerpc
 [LIBRARY::swig_dcerpc]
 LIBRARY_REALNAME = _dcerpc.$(SHLIBEXT)
-PUBLIC_DEPENDENCIES = LIBCLI NDR_MISC LIBSAMBA-UTIL LIBSAMBA-CONFIG RPC_NDR_SAMR RPC_NDR_LSA DYNCONFIG
+PUBLIC_DEPENDENCIES = LIBCLI_SMB NDR_MISC LIBSAMBA-UTIL LIBSAMBA-CONFIG RPC_NDR_SAMR RPC_NDR_LSA DYNCONFIG
 OBJ_FILES = dcerpc_wrap.o
 # End LIBRARY swig_dcerpc
 #######################

Modified: branches/SAMBA_4_0/source/torture/config.mk
===================================================================
--- branches/SAMBA_4_0/source/torture/config.mk	2006-04-29 20:59:46 UTC (rev 15330)
+++ branches/SAMBA_4_0/source/torture/config.mk	2006-04-29 23:22:54 UTC (rev 15331)
@@ -51,7 +51,7 @@
 		basic/attr.o \
 		basic/properties.o 
 PUBLIC_DEPENDENCIES = \
-		LIBSMB 
+		LIBCLI_SMB 
 # End SUBSYSTEM TORTURE_BASIC
 #################################
 
@@ -85,7 +85,7 @@
 		raw/seek.o \
 		raw/composite.o
 PUBLIC_DEPENDENCIES = \
-		LIBSMB LIBCLI_LSA
+		LIBCLI_SMB LIBCLI_LSA
 # End SUBSYSTEM TORTURE_RAW
 #################################
 
@@ -163,7 +163,7 @@
 OBJ_FILES = \
 		rap/rap.o
 PUBLIC_DEPENDENCIES = \
-		LIBSMB
+		LIBCLI_SMB
 # End SUBSYSTEM TORTURE_RAP
 #################################
 
@@ -176,7 +176,7 @@
 		auth/ntlmssp.o \
 		auth/pac.o
 PUBLIC_DEPENDENCIES = \
-		LIBSMB gensec auth LIBSAMBA3
+		LIBCLI_SMB gensec auth LIBSAMBA3
 # End SUBSYSTEM TORTURE_AUTH
 #################################
 
@@ -222,7 +222,7 @@
 		nbt/dgram.o \
 		nbt/browse.o
 PUBLIC_DEPENDENCIES = \
-		LIBSMB LIBCLI_NBT LIBCLI_WREPL
+		LIBCLI_SMB LIBCLI_NBT LIBCLI_WREPL
 # End SUBSYSTEM TORTURE_NBT
 #################################
 
@@ -274,7 +274,7 @@
 		LIBPOPT \
 		POPT_SAMBA \
 		POPT_CREDENTIALS \
-		LIBSMB
+		LIBCLI_SMB
 MANPAGE = man/gentest.1
 # End BINARY gentest
 #################################
@@ -291,7 +291,7 @@
 		LIBPOPT \
 		POPT_SAMBA \
 		POPT_CREDENTIALS \
-		LIBSMB
+		LIBCLI_SMB
 MANPAGE = man/masktest.1
 # End BINARY masktest
 #################################
@@ -303,7 +303,7 @@
 OBJ_FILES = \
 		locktest.o
 PRIVATE_DEPENDENCIES = \
-		LIBSMB \
+		LIBCLI_SMB \
 		LIBSAMBA-CONFIG \
 		LIBSAMBA-UTIL
 MANPAGE = man/locktest.1

Modified: branches/SAMBA_4_0/source/torture/local/config.mk
===================================================================
--- branches/SAMBA_4_0/source/torture/local/config.mk	2006-04-29 20:59:46 UTC (rev 15330)
+++ branches/SAMBA_4_0/source/torture/local/config.mk	2006-04-29 23:22:54 UTC (rev 15331)
@@ -19,7 +19,7 @@
 		ndr.o
 PUBLIC_DEPENDENCIES = \
 		RPC_NDR_ECHO \
-		LIBSMB \
+		LIBCLI_SMB \
 		MESSAGING \
 		registry
 # End SUBSYSTEM TORTURE_LOCAL

More information about the samba-cvs mailing list