From 4ec89bce8715f35f21fe05bb738dae13fc6c3066 Mon Sep 17 00:00:00 2001 From: Jelmer Vernooij Date: Sat, 29 Apr 2006 23:22:54 +0000 Subject: [PATCH] r15331: Integrate LIBSMB and LIBCLI into new LIBCLI_SMB --- source/client/config.mk | 4 ++-- source/libcli/config.mk | 13 +++++-------- source/librpc/config.mk | 2 +- source/ntvfs/config.mk | 2 +- source/rpc_server/config.mk | 2 +- source/scripting/ejs/config.mk | 2 +- source/scripting/swig/config.mk | 2 +- source/torture/config.mk | 16 ++++++++-------- source/torture/local/config.mk | 2 +- 9 files changed, 21 insertions(+), 24 deletions(-) diff --git a/source/client/config.mk b/source/client/config.mk index b38be8da3..ebac2a4bb 100644 --- a/source/client/config.mk +++ b/source/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/source/libcli/config.mk b/source/libcli/config.mk index 6e7f8b70e..e68bdf1f4 100644 --- a/source/libcli/config.mk +++ b/source/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/source/librpc/config.mk b/source/librpc/config.mk index 57d6ddfbb..db74c1212 100644 --- a/source/librpc/config.mk +++ b/source/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/source/ntvfs/config.mk b/source/ntvfs/config.mk index ac9616434..a7194b049 100644 --- a/source/ntvfs/config.mk +++ b/source/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/source/rpc_server/config.mk b/source/rpc_server/config.mk index 3ffc41259..fc96c4f73 100644 --- a/source/rpc_server/config.mk +++ b/source/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/source/scripting/ejs/config.mk b/source/scripting/ejs/config.mk index 3884b514c..ca73ce279 100644 --- a/source/scripting/ejs/config.mk +++ b/source/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/source/scripting/swig/config.mk b/source/scripting/swig/config.mk index 2c1c57b0c..282758de5 100644 --- a/source/scripting/swig/config.mk +++ b/source/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/source/torture/config.mk b/source/torture/config.mk index 58de5bdd0..384e7f363 100644 --- a/source/torture/config.mk +++ b/source/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/source/torture/local/config.mk b/source/torture/local/config.mk index 3689f9bf6..28d231ebe 100644 --- a/source/torture/local/config.mk +++ b/source/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 -- 2.34.1