build: move dynconfig for top level build up

Signed-off-by: Andrew Tridgell <tridge@samba.org>

diff --git a/source4/dynconfig/wscript b/dynconfig/wscript
similarity index 99%
rename from source4/dynconfig/wscript
rename to dynconfig/wscript
index 12fc17fe0ef9345acd82d87a21cbe87d7a1d08af..35af13db7ece13805436c976a757595676a02bfc 100755 (executable)
--- 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 1fa0d8f543956c402d89f78acae095b294c37f3e..4399d0e67a3f3bd2cf92c014436fc5e2a6ecfe06 100755 (executable)
--- 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 ff4f7f323c2002dfdd0ffeda2b58c11a5682218e..aa37c4bbc703e5330995ef884b6116308b95d301 100644 (file)
--- 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')