From: Andrew Tridgell <tridge@samba.org>
Date: Mon, 21 Feb 2011 00:10:35 +0000 (+1100)
Subject: s3-waf: make version and build directory conditional
X-Git-Tag: tevent-0.9.11~412
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=c6c49d8ec4ba5dce968f300ff434c3f0e21e4127;p=thirdparty%2Fsamba.git

s3-waf: make version and build directory conditional

we don't need these when doing a toplevel build

Pair-Programmed-With: Andrew Bartlett <abartlet@samba.org>
---

diff --git a/source3/wscript_build b/source3/wscript_build
index c7bc3618217..94bebb74906 100644
--- a/source3/wscript_build
+++ b/source3/wscript_build
@@ -686,12 +686,13 @@ t.env.BUILDDIR = bld.path.abspath()
 
 bld.SETUP_BUILD_GROUPS()
 
-samba_version.load_version(bld.env)
-
-bld.SAMBA_MKVERSION('include/version.h')
+if not bld.env.toplevel_build:
+    # when using a toplevel build, these are already supplied
+    samba_version.load_version(bld.env)
+    bld.SAMBA_MKVERSION('include/version.h')
+    bld.RECURSE('../lib/replace')
+    bld.RECURSE('build')
 
-bld.RECURSE('../lib/replace')
-bld.RECURSE('build')
 
 ######################## SUBSYSTEMS #################################