diff options
| author | Jelmer Vernooij <jelmer@samba.org> | 2010-10-16 17:08:27 +0200 |
|---|---|---|
| committer | Jelmer Vernooij <jelmer@samba.org> | 2010-10-16 17:33:20 +0200 |
| commit | c3009ac689bf91e7a9cb1cc9c34e2b0e8ae246e2 (patch) | |
| tree | 29a1d3d05aee72d7f8e5f1afadf7a32061257ec9 /source4 | |
| parent | 953d25374869f177dab72807fef83651ef7e811a (diff) | |
| download | samba-c3009ac689bf91e7a9cb1cc9c34e2b0e8ae246e2.tar.gz samba-c3009ac689bf91e7a9cb1cc9c34e2b0e8ae246e2.tar.bz2 samba-c3009ac689bf91e7a9cb1cc9c34e2b0e8ae246e2.zip | |
heimdal: Add convenience functions for finding heimdal paths.
Diffstat (limited to 'source4')
| -rw-r--r-- | source4/heimdal_build/wscript_build | 9 |
1 files changed, 6 insertions, 3 deletions
diff --git a/source4/heimdal_build/wscript_build b/source4/heimdal_build/wscript_build index 8d078cba1b..b4d253198f 100644 --- a/source4/heimdal_build/wscript_build +++ b/source4/heimdal_build/wscript_build @@ -7,6 +7,9 @@ from samba_autoconf import CURRENT_CFLAGS def heimdal_path(p): return os.path.join("../heimdal", p) +def heimdal_paths(ps): + return [heimdal_path(p) for p in TO_LIST(ps)] + # waf build tool for building .et files with compile_et def HEIMDAL_ASN1(name, source, @@ -145,7 +148,7 @@ def HEIMDAL_AUTOPROTO(header, source, options=None, group='prototypes'): if options is None: options='-q -P comment -o' SET_TARGET_TYPE(bld, header, 'PROTOTYPE') - source = [os.path.join("../heimdal", x) for x in TO_LIST(source)] + source = heimdal_paths(source) t = bld(rule='${PERL} ${HEIMDAL}/cf/make-proto.pl ${OPTIONS} ${TGT[0].abspath(env)} ${SRC}', source=source, target=header, @@ -244,7 +247,7 @@ def HEIMDAL_SUBSYSTEM(modname, source, if not SET_TARGET_TYPE(bld, modname, 'SUBSYSTEM'): return - source = [os.path.join("../heimdal", x) for x in TO_LIST(source)] + source = heimdal_paths(source) bld.set_group(group) @@ -664,7 +667,7 @@ if not bld.CONFIG_SET("USING_SYSTEM_ASN1"): HEIMDAL_SUBSYSTEM('HEIMDAL_HCRYPTO_IMATH', 'lib/hcrypto/imath/imath.c lib/hcrypto/imath/iprime.c', - includes='../heimdal/lib/hcrypto/imath', + includes='../heimdal/lib/hcrypto/imath', deps='roken' ) if not bld.CONFIG_SET("USING_SYSTEM_TOMMATH"): |