build: move dynconfig for top level build up
authorAndrew Bartlett <abartlet@samba.org>
Tue, 21 Jun 2011 02:48:22 +0000 (12:48 +1000)
committerAndrew Tridgell <tridge@samba.org>
Tue, 21 Jun 2011 05:54:22 +0000 (15:54 +1000)
Signed-off-by: Andrew Tridgell <tridge@samba.org>
dynconfig/wscript [moved from source4/dynconfig/wscript with 99% similarity]
wscript
wscript_build

similarity index 99%
rename from source4/dynconfig/wscript
rename to dynconfig/wscript
index 12fc17f..35af13d 100755 (executable)
@@ -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 1fa0d8f..4399d0e 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')
index ff4f7f3..aa37c4b 100644 (file)
@@ -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')