summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGünther Deschner <gd@samba.org>2010-12-14 22:09:44 +0100
committerGünther Deschner <gd@samba.org>2010-12-14 22:42:19 +0100
commit9e6736cafd5ea86294b780f32511a1317df94b3f (patch)
treeb00ec6ef0ce3c58b1aaaabb134cd2df13dcfcfa2
parent3e6d507246705be877eda61c38868ef29bef6265 (diff)
downloadsamba-9e6736cafd5ea86294b780f32511a1317df94b3f.tar.gz
samba-9e6736cafd5ea86294b780f32511a1317df94b3f.tar.bz2
samba-9e6736cafd5ea86294b780f32511a1317df94b3f.zip
s3-waf: recurse into ../libcli/ldap.
Guenther
-rw-r--r--source3/wscript_build20
1 files changed, 7 insertions, 13 deletions
diff --git a/source3/wscript_build b/source3/wscript_build
index 75db1093f6..b71d2b7cd4 100644
--- a/source3/wscript_build
+++ b/source3/wscript_build
@@ -153,12 +153,11 @@ LIBNMB_SRC = '''libsmb/unexpected.c libsmb/namecache.c libsmb/nmblib.c
libsmb/namequery.c ../libcli/nbt/lmhosts.c libsmb/conncache.c
libads/dns.c libads/sitename_cache.c'''
-NTERR_SRC = '''libsmb/nterr.c libsmb/smberr.c'''
-DOSERR_SRC = '../libcli/util/doserr.c'
+NTERR_SRC = '''libsmb/smberr.c'''
ERRORMAP_SRC = 'libsmb/errormap.c'
DCE_RPC_ERR_SRC = '../librpc/rpc/dcerpc_error.c'
-LIBSMB_ERR_SRC = '''${NTERR_SRC} ${DOSERR_SRC} ${ERRORMAP_SRC} ${DCE_RPC_ERR_SRC}'''
+LIBSMB_ERR_SRC = '''${NTERR_SRC} ${ERRORMAP_SRC} ${DCE_RPC_ERR_SRC}'''
LIBSMB_SRC0 = '''
libsmb/ntlmssp.c
@@ -170,9 +169,6 @@ LIBSMB_SRC0 = '''
LIBSAMBA_SRC = '${LIBSMB_SRC0}'
-LIBCLI_LDAP_MESSAGE_SRC = '''../libcli/ldap/ldap_message.c'''
-LIBCLI_LDAP_NDR_SRC = '''../libcli/ldap/ldap_ndr.c lib/ldb_compat.c'''
-
CLDAP_SRC = '''libads/cldap.c
../libcli/cldap/cldap.c
../lib/util/idtree.c'''
@@ -817,12 +813,6 @@ bld.SAMBA_SUBSYSTEM('ASN1_UTIL',
deps='talloc',
local_include=False)
-bld.SAMBA_SUBSYSTEM('LIBCLI_LDAP_MESSAGE',
- source=LIBCLI_LDAP_MESSAGE_SRC)
-
-bld.SAMBA_SUBSYSTEM('LIBCLI_LDAP_NDR',
- source=LIBCLI_LDAP_NDR_SRC)
-
bld.SAMBA_SUBSYSTEM('AVAHI',
source=AVAHI_SRC,
deps='avahi-common avahi-client',
@@ -900,7 +890,7 @@ bld.SAMBA_SUBSYSTEM('LIB_NONSMBD',
bld.SAMBA_SUBSYSTEM('LIBSMB_ERR',
source=LIBSMB_ERR_SRC,
- deps='SECRETS ldap lber MSRPC_PARSE LIBCLI_AUTH',
+ deps='errors SECRETS ldap lber MSRPC_PARSE LIBCLI_AUTH',
vars=locals())
bld.SAMBA_SUBSYSTEM('LIBSAMBA',
@@ -1085,6 +1075,9 @@ bld.SAMBA_SUBSYSTEM('ndr-standard',
#FIXME
bld.SAMBA_SUBSYSTEM('dcerpc', '')
+bld.SAMBA_SUBSYSTEM('ldb',
+ source='lib/ldb_compat.c')
+
bld.SAMBA_SUBSYSTEM('LZXPRESS',
deps='replace',
source='../lib/compression/lzxpress.c')
@@ -1518,6 +1511,7 @@ bld.RECURSE('../libcli/drsuapi')
bld.RECURSE('../libcli/samsync')
bld.RECURSE('../libcli/named_pipe_auth')
bld.RECURSE('../libcli/smb')
+bld.RECURSE('../libcli/ldap')
bld.RECURSE('modules')
bld.RECURSE('auth')
bld.RECURSE('passdb')