summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGünther Deschner <gd@samba.org>2010-11-30 16:25:37 +0100
committerGünther Deschner <gd@samba.org>2010-11-30 18:12:29 +0100
commit2beab2d6e5704ecbac278ecd4c00dd162cda4197 (patch)
tree3f5a4bd1a2b7b8524cb9e081914931079c42d35d
parent33c82cd5dd67c8fa509c326fed85a90045d896d0 (diff)
downloadsamba-2beab2d6e5704ecbac278ecd4c00dd162cda4197.tar.gz
samba-2beab2d6e5704ecbac278ecd4c00dd162cda4197.tar.bz2
samba-2beab2d6e5704ecbac278ecd4c00dd162cda4197.zip
s3-waf: convert PARAM_UTIL into a subsystem.
Guenther
-rw-r--r--source3/wscript_build16
1 files changed, 11 insertions, 5 deletions
diff --git a/source3/wscript_build b/source3/wscript_build
index 55782bc97e..4430c7f641 100644
--- a/source3/wscript_build
+++ b/source3/wscript_build
@@ -178,7 +178,9 @@ LIB_NONSMBD_SRC = '''${LIB_DUMMY_SRC}'''
POPT_LIB_SRC = '''lib/popt_common.c'''
-PARAM_WITHOUT_REG_SRC = '''param/loadparm.c param/util.c param/loadparm_server_role.c
+PARAM_UTIL_SRC = '''param/util.c'''
+
+PARAM_WITHOUT_REG_SRC = '''param/loadparm.c param/loadparm_server_role.c
lib/sharesec.c lib/ldap_debug_handler.c'''
KRBCLIENT_SRC = '''libads/kerberos.c libads/ads_status.c'''
@@ -835,8 +837,7 @@ NTLM_AUTH_SRC = '''${NTLM_AUTH_SRC1}
VLP_SRC = '''printing/tests/vlp.c
../lib/util/util_tdb.c
- ${LIBSAMBAUTIL_SRC}
- param/util.c'''
+ ${LIBSAMBAUTIL_SRC}'''
RPC_OPEN_TCP_SRC = 'torture/rpc_open_tcp.c'
@@ -961,8 +962,13 @@ bld.SAMBA_SUBSYSTEM('PASSDB',
deps='''GROUPDB TLDAP SECRETS SMBLDAP pdb''',
vars=locals())
+bld.SAMBA_SUBSYSTEM('PARAM_UTIL',
+ source=PARAM_UTIL_SRC)
+
bld.SAMBA_SUBSYSTEM('PARAM_WITHOUT_REG',
- source=PARAM_WITHOUT_REG_SRC)
+ source=PARAM_WITHOUT_REG_SRC,
+ deps='''PARAM_UTIL''',
+ vars=locals())
bld.SAMBA_SUBSYSTEM('PARAM',
source='',
@@ -1483,7 +1489,7 @@ bld.SAMBA_BINARY('split_tokens',
bld.SAMBA_BINARY('vlp',
source=VLP_SRC,
- deps='''talloc tdb''',
+ deps='''talloc tdb PARAM_UTIL''',
vars=locals())
swat_files=recursive_dirlist('../swat', '../swat', '*')