summaryrefslogtreecommitdiff
path: root/source4/build/scons/asn1.py
diff options
context:
space:
mode:
authorJelmer Vernooij <jelmer@samba.org>2005-09-23 16:32:52 +0000
committerGerald (Jerry) Carter <jerry@samba.org>2007-10-10 13:38:48 -0500
commit4be0ae794e4af2354d678fddd7bf1e822ffa9148 (patch)
tree128989d970334e4a896329992e827c4f09b8c035 /source4/build/scons/asn1.py
parentda46c9252ee887602b3e629065ca87b9ed11466f (diff)
downloadsamba-4be0ae794e4af2354d678fddd7bf1e822ffa9148.tar.gz
samba-4be0ae794e4af2354d678fddd7bf1e822ffa9148.tar.bz2
samba-4be0ae794e4af2354d678fddd7bf1e822ffa9148.zip
r10456: More SCons fixes:
- Add framework for fallback generating code - Move pread / pwrite replacement functions to libreplace - Support pidl builds correctly - Support asn1 builds correctly - Move OS-specific checks to lib/replace/SConscript (This used to be commit fbbfad0a1f7dedbf48e835a864f8285f283d72f3)
Diffstat (limited to 'source4/build/scons/asn1.py')
-rw-r--r--source4/build/scons/asn1.py9
1 files changed, 6 insertions, 3 deletions
diff --git a/source4/build/scons/asn1.py b/source4/build/scons/asn1.py
index f0068e20dd..b8b7073151 100644
--- a/source4/build/scons/asn1.py
+++ b/source4/build/scons/asn1.py
@@ -17,17 +17,20 @@ def asn1_emitter(target,source,env):
contents = node.get_contents()
for j in output_re.findall(contents):
targets.append(str(node.get_dir()) + '/asn1_' + j + '.c')
+ targets.append("%s/%s.h" % (str(node.get_dir()), env['ASN1PREFIX']))
return targets, source
asn1_builder = SCons.Builder.Builder(action='$ASN1COM',
src_suffix = '.asn1',
suffix='.c',
+ single_source=True,
emitter = asn1_emitter)
def generate(env):
- env['ASN1'] = './bin/asn1_compile'
- env['ASN1COM'] = '$ASN1 $SOURCE'
- env['BUILDERS']['ASN1'] = asn1_builder
+ env['ASN1'] = './bin/asn1_compile'
+ env['ASN1PREFIX'] = 'asn1'
+ env['ASN1COM'] = 'cd ${SOURCE.dir} && $ASN1 $ASN1PREFIX ${SOURCE.file}'
+ env['BUILDERS']['ASN1'] = asn1_builder
def exists(env):
return env.Detect('asn1_compile')