From: Kai Blin <kai@samba.org>
Date: Tue, 11 May 2010 15:11:41 +0000 (+0200)
Subject: s3-waf: create a SECRETS subsystem
X-Git-Url: http://git.samba.org/?a=commitdiff_plain;h=3ea211feb4b77633e22ecd09c8d653ccf892ec9f;p=mat%2Fsamba.git

s3-waf: create a SECRETS subsystem
---

diff --git a/source3/wscript_build b/source3/wscript_build
index cd438a5158..2c1cb5bf8b 100644
--- a/source3/wscript_build
+++ b/source3/wscript_build
@@ -210,8 +210,6 @@ LIBADS_SERVER_SRC = '''libads/kerberos_verify.c libads/authdata.c
                     ../librpc/ndr/ndr_krb5pac.c
                     ../librpc/gen_ndr/ndr_krb5pac.c'''
 
-SECRETS_SRC = '''librpc/gen_ndr/ndr_secrets.c'''
-
 LIBNBT_SRC = '''../libcli/nbt/nbtname.c
              ../libcli/netlogon.c
              ../libcli/ndr_netlogon.c
@@ -232,9 +230,7 @@ LIBSMB_ERR_SRC0 = '''${NTERR_SRC} ${DOSERR_SRC} ${ERRORMAP_SRC} ${DCE_RPC_ERR_SR
 
 LIBSMB_ERR_SRC1 = '''../libcli/auth/smbdes.c ../libcli/auth/smbencrypt.c ../libcli/auth/msrpc_parse.c ../libcli/auth/session.c'''
 
-LIBSMB_ERR_SRC = '''${LIBSMB_ERR_SRC0} ${LIBSMB_ERR_SRC1}
-                 ${RPC_PARSE_SRC1}
-                 ${SECRETS_SRC}'''
+LIBSMB_ERR_SRC = '${LIBSMB_ERR_SRC0} ${LIBSMB_ERR_SRC1} ${RPC_PARSE_SRC1}'
 
 LIBSMB_SRC0 = '''
                ../libcli/auth/ntlm_check.c
@@ -857,7 +853,7 @@ bld.SAMBA_SUBSYSTEM('TLDAP',
 
 bld.SAMBA_SUBSYSTEM('PASSDB',
                     source=PASSDB_SRC,
-                    deps='GROUPDB TLDAP',
+                    deps='GROUPDB TLDAP SECRETS',
                     vars=locals())
 
 bld.SAMBA_SUBSYSTEM('LDB',
@@ -893,6 +889,7 @@ bld.SAMBA_SUBSYSTEM('LIB_NONSMBD',
 
 bld.SAMBA_SUBSYSTEM('LIBSMB_ERR',
                     source=LIBSMB_ERR_SRC,
+                    deps='SECRETS',
                     vars=locals())
 
 bld.SAMBA_SUBSYSTEM('LIBSAMBA',
@@ -905,6 +902,10 @@ bld.SAMBA_SUBSYSTEM('LIBSMB',
                     deps='LIBSAMBA ZLIB',
                     vars=locals())
 
+bld.SAMBA_SUBSYSTEM('SECRETS',
+                    source=SECRETS_SRC,
+                    vars=locals())
+
 ########################## BINARIES #################################
 
 bld.SAMBA_BINARY('smbd/smbd',