s3-waf: make use of LIBCLI_CLDAP subsystem

metze

Autobuild-User: Günther Deschner <gd@samba.org>
Autobuild-Date: Wed Feb 23 10:17:01 CET 2011 on sn-devel-104

diff --git a/source3/wscript_build b/source3/wscript_build
index 425ca92d89432566ef054ba4e9c09bc3467d1145..c2c9deb2d02afd95e9fd0adeb44e497c8d4531d0 100644 (file)
--- a/source3/wscript_build
+++ b/source3/wscript_build
@@ -145,10 +145,6 @@ LIBSMB_SRC0 = '''
 
 LIBSAMBA_SRC = '${LIBSMB_SRC0}'
 
-CLDAP_SRC = '''libads/cldap.c
-        ../libcli/cldap/cldap.c
-        ../lib/util/idtree.c'''
-
 TLDAP_SRC = '''lib/tldap.c lib/tldap_util.c lib/util_tsock.c'''
 
 SCHANNEL_SRC = '''../libcli/auth/schannel_sign.c'''
@@ -815,8 +811,8 @@ bld.SAMBA3_SUBSYSTEM('LIBDRSUAPI',
                     vars=locals())
 
 bld.SAMBA3_SUBSYSTEM('CLDAP',
-                    source=CLDAP_SRC,
-                    deps='LIBCLI_LDAP_MESSAGE LIBCLI_LDAP_NDR LIBTSOCKET',
+                    source='libads/cldap.c',
+                    deps='LIBCLI_LDAP_MESSAGE LIBCLI_LDAP_NDR LIBCLI_CLDAP LIBTSOCKET',
                     vars=locals())
 
 bld.SAMBA3_SUBSYSTEM('SECRETS3',
@@ -1331,6 +1327,7 @@ if not bld.env.toplevel_build:
     bld.SAMBA3_SUBSYSTEM('CHARSET', source='', deps='CHARSET3')
     bld.SAMBA3_SUBSYSTEM('ldb', source='', deps='ldb3')
     bld.SAMBA3_SUBSYSTEM('dcerpc', '', deps='UTIL_TEVENT')
+    bld.SAMBA3_SUBSYSTEM('cli-ldap', '', deps='UTIL_TEVENT')
 else:
 
     # dynconfig provides this in the toplevel build
@@ -1358,6 +1355,7 @@ bld.RECURSE('../lib/async_req')
 bld.RECURSE('../libcli/auth')
 bld.RECURSE('../libcli/drsuapi')
 bld.RECURSE('../libcli/ldap')
+bld.RECURSE('../libcli/cldap')
 bld.RECURSE('../libcli/named_pipe_auth')
 bld.RECURSE('../libcli/netlogon')
 bld.RECURSE('../libcli/samsync')