summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAndrew Bartlett <abartlet@samba.org>2011-06-21 12:48:22 +1000
committerAndrew Tridgell <tridge@samba.org>2011-06-21 15:54:22 +1000
commit35a9c23a016e76df7b5647e1b9285f70d15db807 (patch)
tree5d275d3f7d7e8ff504ca984a1ff534eef39ee80e
parent894b0273fcff28dfaef80ce7be1bcc35d47aed65 (diff)
downloadsamba-35a9c23a016e76df7b5647e1b9285f70d15db807.tar.gz
samba-35a9c23a016e76df7b5647e1b9285f70d15db807.tar.bz2
samba-35a9c23a016e76df7b5647e1b9285f70d15db807.zip
build: move dynconfig for top level build up
Signed-off-by: Andrew Tridgell <tridge@samba.org>
-rwxr-xr-xdynconfig/wscript (renamed from source4/dynconfig/wscript)2
-rwxr-xr-xwscript4
-rw-r--r--wscript_build2
3 files changed, 4 insertions, 4 deletions
diff --git a/source4/dynconfig/wscript b/dynconfig/wscript
index 12fc17fe0e..35af13db7e 100755
--- a/source4/dynconfig/wscript
+++ b/dynconfig/wscript
@@ -108,7 +108,7 @@ Build.BuildContext.dynconfig_cflags = dynconfig_cflags
def build(bld):
cflags = bld.dynconfig_cflags()
bld.SAMBA_SUBSYSTEM('DYNCONFIG',
- '../../dynconfig/dynconfig.c',
+ 'dynconfig.c',
deps='replace talloc',
public_headers=os_path_relpath(os.path.join(Options.launch_dir, 'version.h'), bld.curdir),
header_path='samba',
diff --git a/wscript b/wscript
index 1fa0d8f543..4399d0e67a 100755
--- a/wscript
+++ b/wscript
@@ -32,7 +32,7 @@ def set_options(opt):
opt.BUILTIN_DEFAULT('NONE')
opt.PRIVATE_EXTENSION_DEFAULT('samba4')
opt.RECURSE('lib/replace')
- opt.RECURSE('source4/dynconfig')
+ opt.RECURSE('dynconfig')
opt.RECURSE('source4/lib/ldb')
opt.RECURSE('selftest')
opt.RECURSE('source4/lib/tls')
@@ -89,7 +89,7 @@ def configure(conf):
if int(conf.env['PYTHON_VERSION'][0]) >= 3:
raise Utils.WafError('Python version 3.x is not supported by Samba yet')
- conf.RECURSE('source4/dynconfig')
+ conf.RECURSE('dynconfig')
conf.RECURSE('source4/lib/ldb')
conf.RECURSE('source4/heimdal_build')
conf.RECURSE('source4/lib/tls')
diff --git a/wscript_build b/wscript_build
index ff4f7f323c..aa37c4bbc7 100644
--- a/wscript_build
+++ b/wscript_build
@@ -39,7 +39,7 @@ bld.RECURSE('lib/tevent')
bld.RECURSE('lib/ccan')
bld.RECURSE('lib/tdb_compat')
bld.RECURSE('source4/lib/ldb')
-bld.RECURSE('source4/dynconfig')
+bld.RECURSE('dynconfig')
bld.RECURSE('lib/util/charset')
bld.RECURSE('source4/scripting/python')
bld.RECURSE('source4/param')