diff options
| author | Andrew Tridgell <tridge@samba.org> | 2011-02-21 11:10:35 +1100 |
|---|---|---|
| committer | Andrew Tridgell <tridge@samba.org> | 2011-02-22 02:51:09 +0100 |
| commit | c6c49d8ec4ba5dce968f300ff434c3f0e21e4127 (patch) | |
| tree | cb5d9916ca708b02701027906caccc01156ae997 | |
| parent | effc76db100e37fb2f6824ba12a9e256aecedd48 (diff) | |
| download | samba-c6c49d8ec4ba5dce968f300ff434c3f0e21e4127.tar.gz samba-c6c49d8ec4ba5dce968f300ff434c3f0e21e4127.tar.bz2 samba-c6c49d8ec4ba5dce968f300ff434c3f0e21e4127.zip | |
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>
| -rw-r--r-- | source3/wscript_build | 11 |
1 files changed, 6 insertions, 5 deletions
diff --git a/source3/wscript_build b/source3/wscript_build index c7bc361821..94bebb7490 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 ################################# |