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 /source4/param/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 'source4/param/wscript_build')
| -rw-r--r-- | source4/param/wscript_build | 7 |
1 files changed, 1 insertions, 6 deletions
diff --git a/source4/param/wscript_build b/source4/param/wscript_build index a56191d089..d5ca60d207 100644 --- a/source4/param/wscript_build +++ b/source4/param/wscript_build @@ -5,11 +5,6 @@ bld.SAMBA_GENERATOR('s3_param_h', target='s3_param.h', rule='${PERL} ${SRC[1].abspath(env)} ${SRC[0].abspath(env)} --file ${TGT}') -bld.SAMBA_GENERATOR('param_local_h', - source= '../../lib/param/param_functions.c ../../script/mkparamdefs.pl', - target='param_local.h', - rule='${PERL} ${SRC[1].abspath(env)} ${SRC[0].abspath(env)} --file ${TGT} --generate-scope=LOCAL') - bld.SAMBA_GENERATOR('param_global_h', source= 'loadparm.c ../../script/mkparamdefs.pl', target='param_global.h', @@ -20,7 +15,7 @@ bld.SAMBA_LIBRARY('samba-hostconfig', pc_files='samba-hostconfig.pc', vnum='0.0.1', deps='DYNCONFIG', - public_deps='samba-util bitmap', + public_deps='samba-util bitmap param_local_h', public_headers='param.h', autoproto='param_proto.h', autoproto_extra_source='../../lib/param/param_functions.c' |