1
0
mirror of https://github.com/samba-team/samba.git synced 2025-03-01 04:58:35 +03:00

r15331: Integrate LIBSMB and LIBCLI into new LIBCLI_SMB

(This used to be commit 4ec89bce8715f35f21fe05bb738dae13fc6c3066)
This commit is contained in:
Jelmer Vernooij 2006-04-29 23:22:54 +00:00 committed by Gerald (Jerry) Carter
parent de74d11322
commit f7c86b912d
9 changed files with 21 additions and 24 deletions

View File

@ -10,7 +10,7 @@ PRIVATE_DEPENDENCIES = \
LIBSAMBA-CONFIG \ LIBSAMBA-CONFIG \
SMBREADLINE \ SMBREADLINE \
LIBSAMBA-UTIL \ LIBSAMBA-UTIL \
LIBSMB \ LIBCLI_SMB \
RPC_NDR_SRVSVC \ RPC_NDR_SRVSVC \
LIBCLI_LSA \ LIBCLI_LSA \
LIBPOPT \ LIBPOPT \
@ -28,7 +28,7 @@ OBJ_FILES = \
cifsddio.o cifsddio.o
PRIVATE_DEPENDENCIES = \ PRIVATE_DEPENDENCIES = \
LIBSAMBA-CONFIG \ LIBSAMBA-CONFIG \
LIBSMB \ LIBCLI_SMB \
LIBPOPT \ LIBPOPT \
POPT_SAMBA \ POPT_SAMBA \
POPT_CREDENTIALS POPT_CREDENTIALS

View File

@ -99,18 +99,12 @@ OBJ_FILES = \
finddcs.o finddcs.o
PUBLIC_DEPENDENCIES = LIBCLI_NBT MESSAGING PUBLIC_DEPENDENCIES = LIBCLI_NBT MESSAGING
[LIBRARY::LIBCLI] [LIBRARY::LIBCLI_SMB]
PUBLIC_HEADERS = libcli.h PUBLIC_HEADERS = libcli.h
PUBLIC_PROTO_HEADER = libcli_proto.h
VERSION = 0.0.1 VERSION = 0.0.1
SO_VERSION = 0 SO_VERSION = 0
DESCRIPTION = SMB/CIFS client library 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 \ OBJ_FILES = clireadwrite.o \
cliconnect.o \ cliconnect.o \
clifile.o \ clifile.o \
@ -118,6 +112,9 @@ OBJ_FILES = clireadwrite.o \
clitrans2.o \ clitrans2.o \
climessage.o \ climessage.o \
clideltree.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] [SUBSYSTEM::LIBCLI_RAW]
PRIVATE_PROTO_HEADER = raw/raw_proto.h PRIVATE_PROTO_HEADER = raw/raw_proto.h

View File

@ -593,7 +593,7 @@ OBJ_FILES = \
rpc/dcerpc_sock.o \ rpc/dcerpc_sock.o \
rpc/dcerpc_connect.o rpc/dcerpc_connect.o
PUBLIC_DEPENDENCIES = \ PUBLIC_DEPENDENCIES = \
SOCKET LIBCLI_RESOLVE LIBSMB LIBCLI_SMB2 \ SOCKET LIBCLI_RESOLVE LIBCLI_SMB LIBCLI_SMB2 \
LIBNDR NDR_DCERPC \ LIBNDR NDR_DCERPC \
RPC_NDR_EPMAPPER \ RPC_NDR_EPMAPPER \
NDR_SCHANNEL RPC_NDR_NETLOGON \ NDR_SCHANNEL RPC_NDR_NETLOGON \

View File

@ -12,7 +12,7 @@ SUBSYSTEM = ntvfs
OBJ_FILES = \ OBJ_FILES = \
cifs/vfs_cifs.o cifs/vfs_cifs.o
PUBLIC_DEPENDENCIES = \ PUBLIC_DEPENDENCIES = \
LIBCLI LIBCLI_SMB
# End MODULE ntvfs_cifs # End MODULE ntvfs_cifs
################################################ ################################################

View File

@ -60,7 +60,7 @@ SUBSYSTEM = dcerpc_server
OBJ_FILES = \ OBJ_FILES = \
remote/dcesrv_remote.o remote/dcesrv_remote.o
PUBLIC_DEPENDENCIES = \ PUBLIC_DEPENDENCIES = \
LIBSMB NDR_TABLE LIBCLI_SMB NDR_TABLE
# End MODULE dcerpc_remote # End MODULE dcerpc_remote
################################################ ################################################

View File

@ -76,7 +76,7 @@ OBJ_FILES = \
PUBLIC_DEPENDENCIES = \ PUBLIC_DEPENDENCIES = \
EJS LIBSAMBA-UTIL \ EJS LIBSAMBA-UTIL \
EJSRPC MESSAGING \ EJSRPC MESSAGING \
LIBSAMBA-NET LIBSMB LIBPOPT \ LIBSAMBA-NET LIBCLI_SMB LIBPOPT \
POPT_CREDENTIALS POPT_SAMBA \ POPT_CREDENTIALS POPT_SAMBA \
dcerpc \ dcerpc \
NDR_TABLE NDR_TABLE

View File

@ -2,7 +2,7 @@
# Start LIBRARY swig_dcerpc # Start LIBRARY swig_dcerpc
[LIBRARY::swig_dcerpc] [LIBRARY::swig_dcerpc]
LIBRARY_REALNAME = _dcerpc.$(SHLIBEXT) 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 OBJ_FILES = dcerpc_wrap.o
# End LIBRARY swig_dcerpc # End LIBRARY swig_dcerpc
####################### #######################

View File

@ -51,7 +51,7 @@ OBJ_FILES = \
basic/attr.o \ basic/attr.o \
basic/properties.o basic/properties.o
PUBLIC_DEPENDENCIES = \ PUBLIC_DEPENDENCIES = \
LIBSMB LIBCLI_SMB
# End SUBSYSTEM TORTURE_BASIC # End SUBSYSTEM TORTURE_BASIC
################################# #################################
@ -85,7 +85,7 @@ OBJ_FILES = \
raw/seek.o \ raw/seek.o \
raw/composite.o raw/composite.o
PUBLIC_DEPENDENCIES = \ PUBLIC_DEPENDENCIES = \
LIBSMB LIBCLI_LSA LIBCLI_SMB LIBCLI_LSA
# End SUBSYSTEM TORTURE_RAW # End SUBSYSTEM TORTURE_RAW
################################# #################################
@ -163,7 +163,7 @@ PRIVATE_PROTO_HEADER = \
OBJ_FILES = \ OBJ_FILES = \
rap/rap.o rap/rap.o
PUBLIC_DEPENDENCIES = \ PUBLIC_DEPENDENCIES = \
LIBSMB LIBCLI_SMB
# End SUBSYSTEM TORTURE_RAP # End SUBSYSTEM TORTURE_RAP
################################# #################################
@ -176,7 +176,7 @@ OBJ_FILES = \
auth/ntlmssp.o \ auth/ntlmssp.o \
auth/pac.o auth/pac.o
PUBLIC_DEPENDENCIES = \ PUBLIC_DEPENDENCIES = \
LIBSMB gensec auth LIBSAMBA3 LIBCLI_SMB gensec auth LIBSAMBA3
# End SUBSYSTEM TORTURE_AUTH # End SUBSYSTEM TORTURE_AUTH
################################# #################################
@ -222,7 +222,7 @@ OBJ_FILES = \
nbt/dgram.o \ nbt/dgram.o \
nbt/browse.o nbt/browse.o
PUBLIC_DEPENDENCIES = \ PUBLIC_DEPENDENCIES = \
LIBSMB LIBCLI_NBT LIBCLI_WREPL LIBCLI_SMB LIBCLI_NBT LIBCLI_WREPL
# End SUBSYSTEM TORTURE_NBT # End SUBSYSTEM TORTURE_NBT
################################# #################################
@ -274,7 +274,7 @@ PRIVATE_DEPENDENCIES = \
LIBPOPT \ LIBPOPT \
POPT_SAMBA \ POPT_SAMBA \
POPT_CREDENTIALS \ POPT_CREDENTIALS \
LIBSMB LIBCLI_SMB
MANPAGE = man/gentest.1 MANPAGE = man/gentest.1
# End BINARY gentest # End BINARY gentest
################################# #################################
@ -291,7 +291,7 @@ PRIVATE_DEPENDENCIES = \
LIBPOPT \ LIBPOPT \
POPT_SAMBA \ POPT_SAMBA \
POPT_CREDENTIALS \ POPT_CREDENTIALS \
LIBSMB LIBCLI_SMB
MANPAGE = man/masktest.1 MANPAGE = man/masktest.1
# End BINARY masktest # End BINARY masktest
################################# #################################
@ -303,7 +303,7 @@ INSTALLDIR = BINDIR
OBJ_FILES = \ OBJ_FILES = \
locktest.o locktest.o
PRIVATE_DEPENDENCIES = \ PRIVATE_DEPENDENCIES = \
LIBSMB \ LIBCLI_SMB \
LIBSAMBA-CONFIG \ LIBSAMBA-CONFIG \
LIBSAMBA-UTIL LIBSAMBA-UTIL
MANPAGE = man/locktest.1 MANPAGE = man/locktest.1

View File

@ -19,7 +19,7 @@ OBJ_FILES = \
ndr.o ndr.o
PUBLIC_DEPENDENCIES = \ PUBLIC_DEPENDENCIES = \
RPC_NDR_ECHO \ RPC_NDR_ECHO \
LIBSMB \ LIBCLI_SMB \
MESSAGING \ MESSAGING \
registry registry
# End SUBSYSTEM TORTURE_LOCAL # End SUBSYSTEM TORTURE_LOCAL