summaryrefslogtreecommitdiffstats
path: root/source3
diff options
context:
space:
mode:
authorAndrew Bartlett <abartlet@samba.org>2013-10-14 13:47:27 +1300
committerStefan Metzmacher <metze@samba.org>2013-10-16 09:28:02 +0200
commit6ac33b7f2ec574af356e5286831952519026246e (patch)
treed93e3e337618fd8c449ab76507a1d72de48ead92 /source3
parent785e8d8c326eeb5f76b41584cf7ca86bee9feab4 (diff)
downloadsamba-6ac33b7f2ec574af356e5286831952519026246e.tar.gz
samba-6ac33b7f2ec574af356e5286831952519026246e.tar.xz
samba-6ac33b7f2ec574af356e5286831952519026246e.zip
build: Move loadparm-related build rules to source3/param/wscript_build
Signed-off-by: Andrew Bartlett <abartlet@samba.org> Reviewed-by: Stefan Metzmacher <metze@samba.org>
Diffstat (limited to 'source3')
-rw-r--r--source3/param/wscript_build32
-rwxr-xr-xsource3/wscript_build34
2 files changed, 34 insertions, 32 deletions
diff --git a/source3/param/wscript_build b/source3/param/wscript_build
new file mode 100644
index 0000000000..278d5f5d5f
--- /dev/null
+++ b/source3/param/wscript_build
@@ -0,0 +1,32 @@
+#!/usr/bin/env python
+
+bld.SAMBA3_SUBSYSTEM('PARAM_UTIL',
+ source='util.c',
+ deps='talloc')
+
+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',
+ rule='${PERL} ${SRC[0].abspath(env)} ${SRC[1].abspath(env)} ${SRC[2].abspath(env)} --file ${TGT} --generate-scope=GLOBAL')
+
+bld.SAMBA3_PYTHON('pys3param',
+ source='pyparam.c',
+ deps='param',
+ public_deps='samba-hostconfig pytalloc-util talloc',
+ realname='samba/samba3/param.so')
+
+bld.SAMBA3_SUBSYSTEM('param_service',
+ source='service.c',
+ deps = 'USER_UTIL param PRINTING')
+
+bld.SAMBA3_BINARY('test_lp_load',
+ source='test_lp_load.c',
+ deps='''
+ talloc
+ param
+ popt_samba3''',
+ install=False)
diff --git a/source3/wscript_build b/source3/wscript_build
index 0b3aed3d39..dd2e054e53 100755
--- a/source3/wscript_build
+++ b/source3/wscript_build
@@ -185,35 +185,12 @@ bld.SAMBA3_SUBSYSTEM('SERVER_MUTEX',
source='lib/server_mutex.c',
deps='talloc')
-bld.SAMBA3_SUBSYSTEM('PARAM_UTIL',
- source='param/util.c',
- deps='talloc')
-
-bld.SAMBA3_SUBSYSTEM('LOADPARM_CTX',
- source='param/loadparm_ctx.c',
- deps='''talloc s3_param_h param''')
-
-bld.SAMBA_GENERATOR('param/param_global_h',
- source= '../script/mkparamdefs.pl param/loadparm.c ../lib/param/param_functions.c',
- target='param/param_global.h',
- rule='${PERL} ${SRC[0].abspath(env)} ${SRC[1].abspath(env)} ${SRC[2].abspath(env)} --file ${TGT} --generate-scope=GLOBAL')
-
bld.SAMBA3_SUBSYSTEM('param',
source='''param/loadparm.c
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/param_global_h cups''')
-
-bld.SAMBA3_PYTHON('pys3param',
- source='param/pyparam.c',
- deps='param',
- public_deps='samba-hostconfig pytalloc-util talloc',
- realname='samba/samba3/param.so')
-
-bld.SAMBA3_SUBSYSTEM('param_service',
- source='param/service.c',
- deps = 'USER_UTIL param PRINTING')
+ deps='samba-util PARAM_UTIL ldap lber LOADPARM_CTX samba3core smbconf param_local_h s3_param_global_h cups''')
# this includes only the low level parse code, not stuff
# that requires knowledge of security contexts
@@ -1381,14 +1358,6 @@ bld.SAMBA3_BINARY('rpc_open_tcp',
msrpc3''',
install=False)
-bld.SAMBA3_BINARY('test_lp_load',
- source='param/test_lp_load.c',
- deps='''
- talloc
- param
- popt_samba3''',
- install=False)
-
bld.SAMBA3_BINARY('dbwrap_tool',
source='utils/dbwrap_tool.c',
deps='''
@@ -1447,6 +1416,7 @@ bld.RECURSE('librpc/idl')
bld.RECURSE('libsmb')
bld.RECURSE('modules')
bld.RECURSE('pam_smbpass')
+bld.RECURSE('param')
bld.RECURSE('passdb')
bld.RECURSE('rpc_server')
bld.RECURSE('script')