diff options
-rw-r--r-- | buildtools/wafsamba/samba_autoproto.py | 2 | ||||
-rw-r--r-- | buildtools/wafsamba/samba_pidl.py | 4 | ||||
-rw-r--r-- | buildtools/wafsamba/wafsamba.py | 2 | ||||
-rw-r--r-- | source4/heimdal_build/wscript_build | 14 |
4 files changed, 11 insertions, 11 deletions
diff --git a/buildtools/wafsamba/samba_autoproto.py b/buildtools/wafsamba/samba_autoproto.py index 2d8ea546ab2..bad627aa4de 100644 --- a/buildtools/wafsamba/samba_autoproto.py +++ b/buildtools/wafsamba/samba_autoproto.py @@ -13,7 +13,7 @@ def SAMBA_AUTOPROTO(bld, header, source): name = name, source = source, target = header, - on_results=True, + update_outputs=True, ext_out='.c', before ='cc', rule = '${PERL} "${SCRIPT}/mkproto.pl" --srcdir=.. --builddir=. --public=/dev/null --private="${TGT}" ${SRC}' diff --git a/buildtools/wafsamba/samba_pidl.py b/buildtools/wafsamba/samba_pidl.py index 2393c72c692..110b15e98fe 100644 --- a/buildtools/wafsamba/samba_pidl.py +++ b/buildtools/wafsamba/samba_pidl.py @@ -78,7 +78,7 @@ def SAMBA_PIDL(bld, pname, source, t = bld(rule='cd .. && %s %s ${PERL} "${PIDL}" --quiet ${OPTIONS} --outputdir ${OUTPUTDIR} -- "${SRC[0].abspath(env)}"' % (cpp, cc), ext_out = '.c', before = 'cc', - on_results = True, + update_outputs = True, shell = True, source = source, target = out_files, @@ -135,7 +135,7 @@ def SAMBA_PIDL_TABLES(bld, name, target): rule = '${PERL} ${SRC} --output ${TGT} | sed "s|default/||" > ${TGT}', ext_out = '.c', before = 'cc', - on_results = True, + update_outputs = True, shell = True, source = '../../librpc/tables.pl', target = target, diff --git a/buildtools/wafsamba/wafsamba.py b/buildtools/wafsamba/wafsamba.py index c05431568ab..c423e6025ff 100644 --- a/buildtools/wafsamba/wafsamba.py +++ b/buildtools/wafsamba/wafsamba.py @@ -638,7 +638,7 @@ def SAMBA_GENERATOR(bld, name, rule, source='', target='', source=bld.EXPAND_VARIABLES(source, vars=vars), target=target, shell=isinstance(rule, str), - on_results=True, + update_outputs=True, before='cc', ext_out='.c', samba_type='GENERATOR', diff --git a/source4/heimdal_build/wscript_build b/source4/heimdal_build/wscript_build index 0eb1e38d386..99345ec1de6 100644 --- a/source4/heimdal_build/wscript_build +++ b/source4/heimdal_build/wscript_build @@ -70,7 +70,7 @@ def HEIMDAL_ASN1(name, source, t = bld(rule=asn1_rule, ext_out = '.x', before = 'cc', - on_results = True, + update_outputs = True, shell = True, source = source, target = out_files, @@ -92,7 +92,7 @@ def HEIMDAL_ASN1(name, source, source = out_files[0], target = cfile, shell = True, - on_results=True, + update_outputs=True, ext_out = '.c', ext_in = '.x', depends_on = name + '_ASN1', @@ -103,7 +103,7 @@ def HEIMDAL_ASN1(name, source, source = out_files[1], ext_out = '.c', ext_in = '.x', - on_results=True, + update_outputs=True, target = hfile, depends_on = name + '_ASN1', name = name + '_H') @@ -113,7 +113,7 @@ def HEIMDAL_ASN1(name, source, source = out_files[2], ext_out = '.c', ext_in = '.x', - on_results=True, + update_outputs=True, target = hpriv, depends_on = name + '_ASN1', name = name + '_PRIV_H') @@ -158,7 +158,7 @@ def HEIMDAL_ERRTABLE(name, source): t = bld(rule='"${SRC[1].abspath(env)}" "${TGT[0].parent.abspath(env)}" "${COMPILE_ET}" "${SRC[0].abspath(env)}" ${TGT[0].bldpath(env)}', ext_out = '.c', before = 'cc', - on_results = True, + update_outputs = True, shell = True, source = sources, target = out_files, @@ -176,7 +176,7 @@ def HEIMDAL_AUTOPROTO(header, source, options=None, group='prototypes'): t = bld(rule='${PERL} "${HEIMDAL}/cf/make-proto.pl" ${OPTIONS} "${TGT[0].abspath(env)}" ${SRC}', source=source, target=header, - on_results=True, + update_outputs=True, ext_out='.c', before='cc') t.env.HEIMDAL = os.path.join(bld.srcnode.abspath(), 'source4/heimdal') @@ -201,7 +201,7 @@ def HEIMDAL_GENERATOR(name, rule, source='', target='', source=source, target=target, shell=isinstance(rule, str), - on_results=True, + update_outputs=True, before='cc', ext_out='.c', vars=[rule], |