summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMichael Adam <obnox@samba.org>2013-09-23 07:49:33 +0200
committerMichael Adam <obnox@samba.org>2013-09-23 20:22:34 +0200
commit928c23705e7ac9c23a2b735f8604aef7fadfb33d (patch)
treeecf0bff48941aa4494c8c9a6456708ea91785aeb
parentd49ae221d00bbff953351d23a462118f45f6073b (diff)
downloadsamba-928c23705e7ac9c23a2b735f8604aef7fadfb33d.tar.gz
samba-928c23705e7ac9c23a2b735f8604aef7fadfb33d.tar.bz2
samba-928c23705e7ac9c23a2b735f8604aef7fadfb33d.zip
build: split REG_PARSE_PRS as subsystem and list sources of REGFIO directly.
Signed-off-by: Michael Adam <obnox@samba.org> Reviewed-by: Andrew Bartlett <abartlet@samba.org>
-rwxr-xr-xsource3/wscript_build16
1 files changed, 7 insertions, 9 deletions
diff --git a/source3/wscript_build b/source3/wscript_build
index f32a923a79..b177ef0147 100755
--- a/source3/wscript_build
+++ b/source3/wscript_build
@@ -3,10 +3,6 @@
from samba_utils import *
import samba_version, samba3
-# this includes only the low level parse code, not stuff
-# that requires knowledge of security contexts
-REG_PARSE_PRS_SRC = '''registry/reg_parse_prs.c'''
-
LIB_UTIL_SRC = '''
lib/system.c
lib/sendfile.c
@@ -90,8 +86,6 @@ LIBMSRPC_SRC = '''
REG_INIT_SMBCONF_SRC = '''registry/reg_init_smbconf.c'''
REG_INIT_FULL_SRC = '''registry/reg_init_full.c'''
-REGFIO_SRC = '''registry/regfio.c ${REG_PARSE_PRS_SRC}'''
-
REG_API_REGF_SRC = '''registry/reg_api_regf.c'''
REG_BACKENDS_SMBCONF_SRC = '''registry/reg_backend_smbconf.c'''
@@ -602,10 +596,14 @@ bld.SAMBA3_SUBSYSTEM('param_service',
source='param/service.c',
deps = 'USER_UTIL param PRINTING')
+# this includes only the low level parse code, not stuff
+# that requires knowledge of security contexts
+bld.SAMBA3_SUBSYSTEM('REG_PARSE_PRS',
+ source='registry/reg_parse_prs.c')
+
bld.SAMBA3_SUBSYSTEM('REGFIO',
- source=REGFIO_SRC,
- deps='samba-util',
- vars=locals())
+ source='registry/regfio.c',
+ deps='samba-util REG_PARSE_PRS')
bld.SAMBA3_SUBSYSTEM('REG_API_REGF',
source=REG_API_REGF_SRC,