summaryrefslogtreecommitdiff
path: root/buildtools
diff options
context:
space:
mode:
authorAndrew Tridgell <tridge@samba.org>2010-05-06 14:51:28 +0200
committerAndrew Tridgell <tridge@samba.org>2010-05-06 14:56:43 +0200
commitc61f4dcc0f9611448e726e203d65c674e4d74427 (patch)
tree5b650eb9c09c9d5f42b984c9e41791abed0ce56c /buildtools
parent049416c285026c03fffc2e27225bfef5c2f16469 (diff)
downloadsamba-c61f4dcc0f9611448e726e203d65c674e4d74427.tar.gz
samba-c61f4dcc0f9611448e726e203d65c674e4d74427.tar.bz2
samba-c61f4dcc0f9611448e726e203d65c674e4d74427.zip
build: added a reconfigure target
this is meant to be used by the s3 build, to allow jelmers work on smbtorture4 in s3 to avoid re-running configure unless its needed
Diffstat (limited to 'buildtools')
-rw-r--r--buildtools/scripts/Makefile.waf3
-rw-r--r--buildtools/wafsamba/samba_utils.py10
2 files changed, 13 insertions, 0 deletions
diff --git a/buildtools/scripts/Makefile.waf b/buildtools/scripts/Makefile.waf
index 1345f19e91..5af4fd4239 100644
--- a/buildtools/scripts/Makefile.waf
+++ b/buildtools/scripts/Makefile.waf
@@ -29,6 +29,9 @@ clean:
distclean:
$(WAF) distclean
+reconfigure: configure
+ $(WAF) reconfigure
+
# some compatibility make targets
everything: all
diff --git a/buildtools/wafsamba/samba_utils.py b/buildtools/wafsamba/samba_utils.py
index 335313e5dc..f0360688ba 100644
--- a/buildtools/wafsamba/samba_utils.py
+++ b/buildtools/wafsamba/samba_utils.py
@@ -507,3 +507,13 @@ def load_file(filename):
except:
return None
return r
+
+
+def reconfigure(ctx):
+ '''rerun configure if necessary'''
+ import Configure, samba_wildcard, Scripting
+ if not os.path.exists(".lock-wscript"):
+ raise Utils.WafError('configure has not been run')
+ bld = samba_wildcard.fake_build_environment()
+ Configure.autoconfig = True
+ Scripting.check_configured(bld)