diff options
| author | Garming Sam <garming@catalyst.net.nz> | 2014-01-15 17:45:46 +1300 |
|---|---|---|
| committer | Andrew Bartlett <abartlet@samba.org> | 2014-02-12 13:17:13 +1300 |
| commit | ac16049f7419b97bcfe91c1312feec38694fffb3 (patch) | |
| tree | 5e46b46eb2102de1f25bcbc727e4fe89c459b7bf | |
| parent | b1de1abf7bf3de70faa279bd0617f48434d550e2 (diff) | |
param: use generate_param.py to generate param_local.h
Pair-programmed-with: Andrew Bartlett <abartlet@samba.org>
Signed-off-by: Garming Sam <garming@catalyst.net.nz>
Reviewed-by: Andrew Bartlett <abartlet@samba.org>
Reviewed-by: Michael Adam <obnox@samba.org>
| -rw-r--r-- | lib/param/wscript_build | 9 | ||||
| -rwxr-xr-x | source3/wscript_build | 2 |
2 files changed, 5 insertions, 6 deletions
diff --git a/lib/param/wscript_build b/lib/param/wscript_build index 3d216c4913..c0b612bfcb 100644 --- a/lib/param/wscript_build +++ b/lib/param/wscript_build @@ -12,12 +12,11 @@ bld.SAMBA_GENERATOR('param_functions.h', group='build_source', rule='${PYTHON} ${SRC[0].abspath(env)} --file ${SRC[1].abspath(env)} --output ${TGT} --mode=LIBPROTO') -bld.SAMBA_GENERATOR('param_local_h', - source= '../../script/mkparamdefs.pl loadparm.c param_functions.c ', +bld.SAMBA_GENERATOR('param_local.h', + source= '../../script/generate_param.py ../../docs-xml/smbdotconf/parameters.all.xml', target='param_local.h', group='build_source', - rule='${PERL} ${SRC[0].abspath(env)} ${SRC[1].abspath(env)} ${SRC[2].abspath(env)} --file ${TGT} --generate-scope=LOCAL') - + rule='${PYTHON} ${SRC[0].abspath(env)} --file ${SRC[1].abspath(env)} --output ${TGT} --mode=PARAMDEFS --scope=LOCAL') bld.SAMBA_GENERATOR('s3_param_h', source= ' ../../script/mks3param.pl loadparm.c param_functions.c', @@ -41,7 +40,7 @@ bld.SAMBA_LIBRARY('samba-hostconfig', pc_files='samba-hostconfig.pc', vnum='0.0.1', deps='DYNCONFIG server-role', - public_deps='samba-util param_local_h', + public_deps='samba-util param_local.h', public_headers='param.h', autoproto='param_proto.h' ) diff --git a/source3/wscript_build b/source3/wscript_build index 9b6111930d..12e473f0f2 100755 --- a/source3/wscript_build +++ b/source3/wscript_build @@ -190,7 +190,7 @@ bld.SAMBA3_SUBSYSTEM('param', lib/sharesec.c lib/ldap_debug_handler.c lib/util_names.c''', - deps='samba-util PARAM_UTIL ldap lber LOADPARM_CTX samba3core smbconf param_local_h param_global.h cups''') + deps='samba-util PARAM_UTIL ldap lber LOADPARM_CTX samba3core smbconf param_local.h param_global.h cups''') # this includes only the low level parse code, not stuff # that requires knowledge of security contexts |