r15331: Integrate LIBSMB and LIBCLI into new LIBCLI_SMB
authorJelmer Vernooij <jelmer@samba.org>
Sat, 29 Apr 2006 23:22:54 +0000 (23:22 +0000)
committerGerald (Jerry) Carter <jerry@samba.org>
Wed, 10 Oct 2007 19:05:18 +0000 (14:05 -0500)
source/client/config.mk
source/libcli/config.mk
source/librpc/config.mk
source/ntvfs/config.mk
source/rpc_server/config.mk
source/scripting/ejs/config.mk
source/scripting/swig/config.mk
source/torture/config.mk
source/torture/local/config.mk

index b38be8da3dd6414a05c0a2a41a452d3cc2ecda95..ebac2a4bb00c4017fc3df01579d69b74301a2a3b 100644 (file)
@@ -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
index 6e7f8b70e313ca00dd8889a30c0b10c948f2329a..e68bdf1f457e86ee8a2ddd8ee95907b76039e8a1 100644 (file)
@@ -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
index 57d6ddfbb341c8f4212e793aebe399bdf2d77b35..db74c121294216bf2198913e61da2ab530934869 100644 (file)
@@ -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 \
index ac96164347e77667825f062e631d3aae84e9ff03..a7194b049d7f4e4ca1c570be033da67819e96cee 100644 (file)
@@ -12,7 +12,7 @@ SUBSYSTEM = ntvfs
 OBJ_FILES = \
                cifs/vfs_cifs.o
 PUBLIC_DEPENDENCIES = \
-               LIBCLI
+               LIBCLI_SMB
 # End MODULE ntvfs_cifs
 ################################################
 
index 3ffc41259ddf758fa69824fc248cb131a2777953..fc96c4f73dbbb9a34b612da639f57f9325c44237 100644 (file)
@@ -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
 ################################################
 
index 3884b514c6fc5ec5088315cd1f756245bfea92a8..ca73ce279a1c67450527b6b29d20949feb532e9b 100644 (file)
@@ -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
index 2c1c57b0c1a0c056922048fc143a9321baae3b3b..282758de523693bfa90ed4df3b9a734f771a47bd 100644 (file)
@@ -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
 #######################
index 58de5bdd0b05e34e4c0a965fe6db3ab0e9668e1b..384e7f3630041303b9a7bbd9c48c526231916802 100644 (file)
@@ -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
index 3689f9bf602518492f62612707887d03b7ffa2e0..28d231ebe5dfed905a7f9030e986f4bdd36f13fa 100644 (file)
@@ -19,7 +19,7 @@ OBJ_FILES = \
                ndr.o
 PUBLIC_DEPENDENCIES = \
                RPC_NDR_ECHO \
-               LIBSMB \
+               LIBCLI_SMB \
                MESSAGING \
                registry
 # End SUBSYSTEM TORTURE_LOCAL