From 2ddcd7833aeb4330cc7c18b1ae1e0845ddc6620e Mon Sep 17 00:00:00 2001 From: Michael Adam Date: Mon, 23 Sep 2013 08:40:46 +0200 Subject: build: list sources of subsys REG_FULL directly in def, remov vars=locals() Signed-off-by: Michael Adam Reviewed-by: Andrew Bartlett --- source3/wscript_build | 30 +++++++++++------------------- 1 file changed, 11 insertions(+), 19 deletions(-) (limited to 'source3') diff --git a/source3/wscript_build b/source3/wscript_build index f4f57ab858..26ad3ee253 100755 --- a/source3/wscript_build +++ b/source3/wscript_build @@ -7,24 +7,8 @@ import samba_version, samba3 # registry-related objects # -REG_INIT_FULL_SRC = '''registry/reg_init_full.c''' - REG_API_REGF_SRC = '''registry/reg_api_regf.c''' -REG_BACKENDS_EXTRA_SRC = '''registry/reg_backend_printing.c - registry/reg_backend_shares.c - registry/reg_backend_netlogon_params.c - registry/reg_backend_prod_options.c - registry/reg_backend_tcpip_params.c - registry/reg_backend_hkpt_params.c - registry/reg_backend_current_version.c - registry/reg_backend_perflib.c''' - -REG_FULL_SRC = ''' - ${REG_BACKENDS_EXTRA_SRC} - ${REG_INIT_FULL_SRC} - registry/reg_perfcount.c''' - SERVICES_SRC = '''services/svc_spoolss.c services/svc_rcinit.c services/svc_winreg_glue.c @@ -552,9 +536,17 @@ bld.SAMBA3_SUBSYSTEM('REG_SMBCONF', deps='smbregistry') bld.SAMBA3_SUBSYSTEM('REG_FULL', - source=REG_FULL_SRC, - deps='REG_SMBCONF tdb-wrap3', - vars=locals()) + source='''registry/reg_backend_printing.c + registry/reg_backend_shares.c + registry/reg_backend_netlogon_params.c + registry/reg_backend_prod_options.c + registry/reg_backend_tcpip_params.c + registry/reg_backend_hkpt_params.c + registry/reg_backend_current_version.c + registry/reg_backend_perflib.c + registry/reg_init_full.c + registry/reg_perfcount.c''', + deps='REG_SMBCONF tdb-wrap3') bld.SAMBA3_LIBRARY('popt_samba3', source='lib/popt_common.c', -- cgit