r15331: Integrate LIBSMB and LIBCLI into new LIBCLI_SMB

(This used to be commit 4ec89bce8715f35f21fe05bb738dae13fc6c3066)

9 files changed, 21 insertions, 24 deletions

diff --git a/source4/client/config.mk b/source4/client/config.mk
index b38be8da3d..ebac2a4bb0 100644
--- a/source4/client/config.mk
+++ b/source4/client/config.mk
@@ -10,7 +10,7 @@ PRIVATE_DEPENDENCIES = \
 		LIBSAMBA-CONFIG \
 		SMBREADLINE \
 		LIBSAMBA-UTIL \
-		LIBSMB \
+		LIBCLI_SMB \
 		RPC_NDR_SRVSVC \
 		LIBCLI_LSA \
 		LIBPOPT \
@@ -28,7 +28,7 @@ OBJ_FILES = \
 		cifsddio.o
 PRIVATE_DEPENDENCIES = \
 		LIBSAMBA-CONFIG \
-		LIBSMB \
+		LIBCLI_SMB \
 		LIBPOPT \
 		POPT_SAMBA \
 		POPT_CREDENTIALS
diff --git a/source4/libcli/config.mk b/source4/libcli/config.mk
index 6e7f8b70e3..e68bdf1f45 100644
--- a/source4/libcli/config.mk
+++ b/source4/libcli/config.mk
@@ -99,18 +99,12 @@ OBJ_FILES = \
 	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 @@ OBJ_FILES = clireadwrite.o \
 		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
diff --git a/source4/librpc/config.mk b/source4/librpc/config.mk
index 57d6ddfbb3..db74c12129 100644
--- a/source4/librpc/config.mk
+++ b/source4/librpc/config.mk
@@ -593,7 +593,7 @@ OBJ_FILES = \
 		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 \
diff --git a/source4/ntvfs/config.mk b/source4/ntvfs/config.mk
index ac96164347..a7194b049d 100644
--- a/source4/ntvfs/config.mk
+++ b/source4/ntvfs/config.mk
@@ -12,7 +12,7 @@ SUBSYSTEM = ntvfs
 OBJ_FILES = \
 		cifs/vfs_cifs.o
 PUBLIC_DEPENDENCIES = \
-		LIBCLI
+		LIBCLI_SMB
 # End MODULE ntvfs_cifs
 ################################################
 
diff --git a/source4/rpc_server/config.mk b/source4/rpc_server/config.mk
index 3ffc41259d..fc96c4f73d 100644
--- a/source4/rpc_server/config.mk
+++ b/source4/rpc_server/config.mk
@@ -60,7 +60,7 @@ SUBSYSTEM = dcerpc_server
 OBJ_FILES = \
 		remote/dcesrv_remote.o
 PUBLIC_DEPENDENCIES = \
-		LIBSMB NDR_TABLE
+		LIBCLI_SMB NDR_TABLE
 # End MODULE dcerpc_remote
 ################################################
 
diff --git a/source4/scripting/ejs/config.mk b/source4/scripting/ejs/config.mk
index 3884b514c6..ca73ce279a 100644
--- a/source4/scripting/ejs/config.mk
+++ b/source4/scripting/ejs/config.mk
@@ -76,7 +76,7 @@ OBJ_FILES = \
 PUBLIC_DEPENDENCIES = \
 		EJS LIBSAMBA-UTIL \
 		EJSRPC MESSAGING \
-		LIBSAMBA-NET LIBSMB LIBPOPT \
+		LIBSAMBA-NET LIBCLI_SMB LIBPOPT \
 		POPT_CREDENTIALS POPT_SAMBA \
 		dcerpc \
 		NDR_TABLE
diff --git a/source4/scripting/swig/config.mk b/source4/scripting/swig/config.mk
index 2c1c57b0c1..282758de52 100644
--- a/source4/scripting/swig/config.mk
+++ b/source4/scripting/swig/config.mk
@@ -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
 #######################
diff --git a/source4/torture/config.mk b/source4/torture/config.mk
index 58de5bdd0b..384e7f3630 100644
--- a/source4/torture/config.mk
+++ b/source4/torture/config.mk
@@ -51,7 +51,7 @@ OBJ_FILES = \
 		basic/attr.o \
 		basic/properties.o 
 PUBLIC_DEPENDENCIES = \
-		LIBSMB 
+		LIBCLI_SMB 
 # End SUBSYSTEM TORTURE_BASIC
 #################################
 
@@ -85,7 +85,7 @@ OBJ_FILES = \
 		raw/seek.o \
 		raw/composite.o
 PUBLIC_DEPENDENCIES = \
-		LIBSMB LIBCLI_LSA
+		LIBCLI_SMB LIBCLI_LSA
 # End SUBSYSTEM TORTURE_RAW
 #################################
 
@@ -163,7 +163,7 @@ PRIVATE_PROTO_HEADER = \
 OBJ_FILES = \
 		rap/rap.o
 PUBLIC_DEPENDENCIES = \
-		LIBSMB
+		LIBCLI_SMB
 # End SUBSYSTEM TORTURE_RAP
 #################################
 
@@ -176,7 +176,7 @@ OBJ_FILES = \
 		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 @@ OBJ_FILES = \
 		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 @@ PRIVATE_DEPENDENCIES = \
 		LIBPOPT \
 		POPT_SAMBA \
 		POPT_CREDENTIALS \
-		LIBSMB
+		LIBCLI_SMB
 MANPAGE = man/gentest.1
 # End BINARY gentest
 #################################
@@ -291,7 +291,7 @@ PRIVATE_DEPENDENCIES = \
 		LIBPOPT \
 		POPT_SAMBA \
 		POPT_CREDENTIALS \
-		LIBSMB
+		LIBCLI_SMB
 MANPAGE = man/masktest.1
 # End BINARY masktest
 #################################
@@ -303,7 +303,7 @@ INSTALLDIR = BINDIR
 OBJ_FILES = \
 		locktest.o
 PRIVATE_DEPENDENCIES = \
-		LIBSMB \
+		LIBCLI_SMB \
 		LIBSAMBA-CONFIG \
 		LIBSAMBA-UTIL
 MANPAGE = man/locktest.1
diff --git a/source4/torture/local/config.mk b/source4/torture/local/config.mk
index 3689f9bf60..28d231ebe5 100644
--- a/source4/torture/local/config.mk
+++ b/source4/torture/local/config.mk
@@ -19,7 +19,7 @@ OBJ_FILES = \
 		ndr.o
 PUBLIC_DEPENDENCIES = \
 		RPC_NDR_ECHO \
-		LIBSMB \
+		LIBCLI_SMB \
 		MESSAGING \
 		registry
 # End SUBSYSTEM TORTURE_LOCAL