lib/util: consolidate module loading into common code

[samba.git] / source4 / param / wscript_build

diff --git a/source4/param/wscript_build b/source4/param/wscript_build
index da10565c6c8a854e33ac11549ca63b0ffea51c16..91e128f916c16a1c6ab35627f40672c4e461791f 100644 (file)
--- a/source4/param/wscript_build
+++ b/source4/param/wscript_build
@@ -5,13 +5,8 @@ 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= 'loadparm.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',
+                    source= 'loadparm.c ../../script/mkparamdefs.pl',
                     target='param_global.h',
                     rule='${PERL} ${SRC[1].abspath(env)} ${SRC[0].abspath(env)} --file ${TGT} --generate-scope=GLOBAL')
 
@@ -20,9 +15,10 @@ bld.SAMBA_LIBRARY('samba-hostconfig',
        pc_files='samba-hostconfig.pc',
        vnum='0.0.1',
        deps='DYNCONFIG',
-       public_deps='samba-util',
+       public_deps='samba-util param_local_h',
        public_headers='param.h',
        autoproto='param_proto.h',
+       autoproto_extra_source='../../lib/param/param_functions.c'
        )
 
 
@@ -36,7 +32,7 @@ bld.SAMBA_SUBSYSTEM('PROVISION',
 bld.SAMBA_SUBSYSTEM('share',
        source='share.c',
        public_headers='share.h',
-       deps='samba-util'
+       deps='samba-util samba-modules'
        )
 
 
@@ -77,6 +73,6 @@ bld.SAMBA_SUBSYSTEM('pyparam_util',
 
 bld.SAMBA_LIBRARY('shares',
                   source=[],
-                  deps='share share_classic share_ldb',
+                  deps='share',
                   grouping_library=True,
                   private_library=True)