From 845422c10c93f124d04372ad5f56bd4ddb23df66 Mon Sep 17 00:00:00 2001 From: Michael Adam Date: Mon, 23 Sep 2013 08:38:45 +0200 Subject: build: list sources of subsys REG_SMBCONF directly in def, remove vars=locals() Signed-off-by: Michael Adam Reviewed-by: Andrew Bartlett --- source3/wscript_build | 17 +++++------------ 1 file changed, 5 insertions(+), 12 deletions(-) diff --git a/source3/wscript_build b/source3/wscript_build index 6bb86610fe..f4f57ab858 100755 --- a/source3/wscript_build +++ b/source3/wscript_build @@ -7,13 +7,10 @@ import samba_version, samba3 # registry-related objects # -REG_INIT_SMBCONF_SRC = '''registry/reg_init_smbconf.c''' REG_INIT_FULL_SRC = '''registry/reg_init_full.c''' REG_API_REGF_SRC = '''registry/reg_api_regf.c''' -REG_BACKENDS_SMBCONF_SRC = '''registry/reg_backend_smbconf.c''' - REG_BACKENDS_EXTRA_SRC = '''registry/reg_backend_printing.c registry/reg_backend_shares.c registry/reg_backend_netlogon_params.c @@ -23,12 +20,6 @@ REG_BACKENDS_EXTRA_SRC = '''registry/reg_backend_printing.c registry/reg_backend_current_version.c registry/reg_backend_perflib.c''' -REG_SMBCONF_SRC = ''' - ${REG_BACKENDS_SMBCONF_SRC} - ${REG_INIT_SMBCONF_SRC} - registry/reg_util_token.c - registry/reg_api_util.c''' - REG_FULL_SRC = ''' ${REG_BACKENDS_EXTRA_SRC} ${REG_INIT_FULL_SRC} @@ -554,9 +545,11 @@ bld.SAMBA3_LIBRARY('smbregistry', private_library=True) bld.SAMBA3_SUBSYSTEM('REG_SMBCONF', - source=REG_SMBCONF_SRC, - deps='smbregistry', - vars=locals()) + source='''registry/reg_backend_smbconf.c + registry/reg_init_smbconf.c + registry/reg_util_token.c + registry/reg_api_util.c''', + deps='smbregistry') bld.SAMBA3_SUBSYSTEM('REG_FULL', source=REG_FULL_SRC, -- cgit