diff options
| author | Garming Sam <garming@catalyst.net.nz> | 2014-01-15 17:39:48 +1300 |
|---|---|---|
| committer | Andrew Bartlett <abartlet@samba.org> | 2014-02-12 13:17:13 +1300 |
| commit | b1de1abf7bf3de70faa279bd0617f48434d550e2 (patch) | |
| tree | 7c6caf889add9bd7c86e2ff45e7532f28f98d33a /source3 | |
| parent | 0c7ed5a8ab99aa2a5c9c40e3cea8ce1e58cfe30c (diff) | |
| download | samba-b1de1abf7bf3de70faa279bd0617f48434d550e2.tar.gz samba-b1de1abf7bf3de70faa279bd0617f48434d550e2.tar.xz samba-b1de1abf7bf3de70faa279bd0617f48434d550e2.zip | |
param: use generate_param.py to generate param_global.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>
Diffstat (limited to 'source3')
| -rw-r--r-- | source3/param/loadparm.c | 2 | ||||
| -rw-r--r-- | source3/param/wscript_build | 6 | ||||
| -rwxr-xr-x | source3/wscript_build | 2 |
3 files changed, 2 insertions, 8 deletions
diff --git a/source3/param/loadparm.c b/source3/param/loadparm.c index c464861fffe..be18f10921f 100644 --- a/source3/param/loadparm.c +++ b/source3/param/loadparm.c @@ -130,7 +130,7 @@ static bool defaults_saved = false; char *tls_crlfile; \ char *tls_dhpfile; -#include "param/param_global.h" +#include "lib/param/param_global.h" static struct loadparm_global Globals; diff --git a/source3/param/wscript_build b/source3/param/wscript_build index 5c0635c03ed..f0c6ddae843 100644 --- a/source3/param/wscript_build +++ b/source3/param/wscript_build @@ -8,12 +8,6 @@ bld.SAMBA3_SUBSYSTEM('LOADPARM_CTX', source='loadparm_ctx.c', deps='''talloc s3_param_h param''') -bld.SAMBA_GENERATOR('s3_param_global_h', - source= '../../script/mkparamdefs.pl loadparm.c ../../lib/param/param_functions.c', - target='param_global.h', - group='build_source', - rule='${PERL} ${SRC[0].abspath(env)} ${SRC[1].abspath(env)} ${SRC[2].abspath(env)} --file ${TGT} --generate-scope=GLOBAL') - bld.SAMBA_GENERATOR('s3_param_proto_h', source= '../../script/generate_param.py ../../docs-xml/smbdotconf/parameters.all.xml', target='param_proto.h', diff --git a/source3/wscript_build b/source3/wscript_build index 61e7935c98b..9b6111930d0 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 s3_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 |