diff options
| author | Andrew Bartlett <abartlet@samba.org> | 2011-07-08 09:19:43 +1000 |
|---|---|---|
| committer | Andrew Bartlett <abartlet@samba.org> | 2011-07-08 12:35:56 +0200 |
| commit | cda86869400285afe17db87a9a666fbcc5b918a8 (patch) | |
| tree | d5e36a1f276729a827c2303bdfad56b8aacff55f /source3/wscript_build | |
| parent | cf406f7e7d58b9c993ba1ddc6471fa85e445ba88 (diff) | |
| download | samba-cda86869400285afe17db87a9a666fbcc5b918a8.tar.gz samba-cda86869400285afe17db87a9a666fbcc5b918a8.tar.bz2 samba-cda86869400285afe17db87a9a666fbcc5b918a8.zip | |
lib/param: Merge struct loadparm_service into common
This is handled by a common header and a .c file that is included into
both loadparm.c files.
In the process, _lp functions were renamed to lp__ to allow the common
function definition declarations to be used by source3 and source4
(which have different macro definitions).
The only parameter to change type is 'strict_locking' which was a
bool, and is now an int, to accommodate the 'Auto' value from source3.
Andrew Bartlett
Autobuild-User: Andrew Bartlett <abartlet@samba.org>
Autobuild-Date: Fri Jul 8 12:35:56 CEST 2011 on sn-devel-104
Diffstat (limited to 'source3/wscript_build')
| -rwxr-xr-x | source3/wscript_build | 8 |
1 files changed, 2 insertions, 6 deletions
diff --git a/source3/wscript_build b/source3/wscript_build index b471445c94..35b0b1d521 100755 --- a/source3/wscript_build +++ b/source3/wscript_build @@ -744,11 +744,6 @@ if bld.env.toplevel_build: deps='''s3_param_h param''', vars=locals()) -bld.SAMBA_GENERATOR('param/param_local_h', - source= 'param/loadparm.c ../script/mkparamdefs.pl', - target='param/param_local.h', - rule='${PERL} ${SRC[1].abspath(env)} ${SRC[0].abspath(env)} --file ${TGT} --generate-scope=LOCAL') - bld.SAMBA_GENERATOR('param/param_global_h', source= 'param/loadparm.c ../script/mkparamdefs.pl', target='param/param_global.h', @@ -756,7 +751,7 @@ bld.SAMBA_GENERATOR('param/param_global_h', bld.SAMBA3_SUBSYSTEM('param', source=PARAM_WITHOUT_REG_SRC, - deps='samba-util PARAM_UTIL smbd_conn ldap lber LOADPARM_CTX samba3core smbconf param/param_local_h param/param_global_h''') + deps='samba-util PARAM_UTIL smbd_conn ldap lber LOADPARM_CTX samba3core smbconf param_local_h param/param_global_h''') bld.SAMBA3_SUBSYSTEM('param_service', source='param/service.c', @@ -1429,6 +1424,7 @@ bld.RECURSE('../lib/addns') bld.RECURSE('../lib/async_req') bld.RECURSE('../lib/ccan') bld.RECURSE('../lib/socket') +bld.RECURSE('../lib/param') bld.RECURSE('../libcli/auth') bld.RECURSE('../libcli/drsuapi') bld.RECURSE('../libcli/ldap') |