summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorStefan Metzmacher <metze@sernet.private>2010-03-24 10:54:31 +0100
committerAndrew Tridgell <tridge@samba.org>2010-04-06 20:27:05 +1000
commit988bc0cdc2604b9d309af9895f3716e4bca59d47 (patch)
treebd6f764cdb1940b5fd46e254f6193013eebf6b5a
parent17f4485722d507f04e95c358d22570c499d14c62 (diff)
downloadsamba-988bc0cdc2604b9d309af9895f3716e4bca59d47.tar.gz
samba-988bc0cdc2604b9d309af9895f3716e4bca59d47.tar.bz2
samba-988bc0cdc2604b9d309af9895f3716e4bca59d47.zip
build: make use on_results=True for some build rules
This makes sure we generate a checksum over the result. In practice it means we no longer recompile when a proto header is triggers a rebuild if it hasn't changed its md5sum. metze
-rw-r--r--buildtools/wafsamba/samba_asn1.py1
-rw-r--r--buildtools/wafsamba/samba_autoproto.py2
-rw-r--r--buildtools/wafsamba/samba_errtable.py1
-rw-r--r--buildtools/wafsamba/samba_patterns.py1
-rw-r--r--buildtools/wafsamba/samba_pidl.py2
5 files changed, 7 insertions, 0 deletions
diff --git a/buildtools/wafsamba/samba_asn1.py b/buildtools/wafsamba/samba_asn1.py
index 4d8c74f3f9..63000ebd5b 100644
--- a/buildtools/wafsamba/samba_asn1.py
+++ b/buildtools/wafsamba/samba_asn1.py
@@ -45,6 +45,7 @@ def SAMBA_ASN1(bld, name, source,
t = bld(rule=asn1_rule,
ext_out = '.x',
before = 'cc',
+ on_results = True,
shell = True,
source = source,
target = out_files,
diff --git a/buildtools/wafsamba/samba_autoproto.py b/buildtools/wafsamba/samba_autoproto.py
index a2a103d1cf..7e003cbf3f 100644
--- a/buildtools/wafsamba/samba_autoproto.py
+++ b/buildtools/wafsamba/samba_autoproto.py
@@ -11,6 +11,7 @@ def HEIMDAL_AUTOPROTO(bld, header, source, options=None, group='prototypes'):
t = bld(rule='${PERL} -W ../heimdal/cf/make-proto.pl ${OPTIONS} ${TGT[0].abspath(env)} ${SRC}',
source=source,
target=header,
+ on_results=True,
ext_out='.c',
before='cc')
t.env.OPTIONS = options
@@ -27,6 +28,7 @@ def SAMBA_AUTOPROTO(bld, header, source):
bld(
source = source,
target = header,
+ on_results=True,
ext_out='.c',
before ='cc',
rule = '../script/mkproto.pl --srcdir=.. --builddir=. --public=/dev/null --private=${TGT} ${SRC}'
diff --git a/buildtools/wafsamba/samba_errtable.py b/buildtools/wafsamba/samba_errtable.py
index d324a3541b..8f0980220f 100644
--- a/buildtools/wafsamba/samba_errtable.py
+++ b/buildtools/wafsamba/samba_errtable.py
@@ -19,6 +19,7 @@ def SAMBA_ERRTABLE(bld, name, source):
t = bld(rule='${SRC[0].abspath(env)} . ${TGT[0].parent.abspath(env)} default/source4/heimdal_build/compile_et ${SRC[2].abspath(env)} ${TGT[0].bldpath(env)}',
ext_out = '.c',
before = 'cc',
+ on_results = True,
shell = True,
source = ['et_compile_wrapper.sh', 'compile_et', source],
target = out_files,
diff --git a/buildtools/wafsamba/samba_patterns.py b/buildtools/wafsamba/samba_patterns.py
index fa1b70de7a..ccd82159a9 100644
--- a/buildtools/wafsamba/samba_patterns.py
+++ b/buildtools/wafsamba/samba_patterns.py
@@ -11,6 +11,7 @@ def SAMBA_MKVERSION(bld, target):
source= [ "script/mkversion.sh", 'VERSION' ],
target=target,
shell=True,
+ on_results=True,
before="cc")
# force this rule to be constructed now
t.post()
diff --git a/buildtools/wafsamba/samba_pidl.py b/buildtools/wafsamba/samba_pidl.py
index 6e47686105..a56a6743de 100644
--- a/buildtools/wafsamba/samba_pidl.py
+++ b/buildtools/wafsamba/samba_pidl.py
@@ -57,6 +57,7 @@ def SAMBA_PIDL(bld, pname, source,
t = bld(rule='cd .. && ${PIDL} ${OPTIONS} --outputdir ${OUTPUTDIR} -- ${SRC[0].abspath(env)}',
ext_out = '.c',
before = 'cc',
+ on_results = True,
shell = True,
source = source,
target = out_files,
@@ -124,6 +125,7 @@ def SAMBA_PIDL_TABLES(bld, name, target):
rule = '${SRC} --output ${TGT} | sed "s|default/||" > ${TGT}',
ext_out = '.c',
before = 'cc',
+ on_results = True,
shell = True,
source = '../../librpc/tables.pl',
target = target,