From 8db177b652cdede2f509d6c96d1c99e875c2d284 Mon Sep 17 00:00:00 2001 From: Jelmer Vernooij Date: Tue, 20 Sep 2005 22:10:40 +0000 Subject: r10366: More scons fixes. Building et, asn1, lex and yacc files sort-of works now (This used to be commit 22f18a84242e5e68a2d57b6d7ff77c089ee7434a) --- source4/build/scons/et.py | 18 +++--------------- 1 file changed, 3 insertions(+), 15 deletions(-) (limited to 'source4/build/scons/et.py') diff --git a/source4/build/scons/et.py b/source4/build/scons/et.py index ea251cd142..2864b32957 100644 --- a/source4/build/scons/et.py +++ b/source4/build/scons/et.py @@ -13,21 +13,9 @@ et_builder = SCons.Builder.Builder(action='$ETCOM', suffix='.c') def generate(env): - env['ET'] = env.Detect('et_compile') + env['ET'] = './bin/compile_et' env['ETCOM'] = '$ET $SOURCE' - env['BUILDERS']['ET'] = et_builder + env['BUILDERS']['ErrorTable'] = et_builder def exists(env): - return env.Detect(['et_compile']) - -def generate(env): - """Add Builders and construction variables for lex to an Environment.""" - c_file, cxx_file = SCons.Tool.createCFileBuilders(env) - - c_file.add_action('.l', SCons.Defaults.LexAction) - cxx_file.add_action('.ll', SCons.Defaults.LexAction) - - env['LEX'] = env.Detect('flex') or 'lex' - env['LEXFLAGS'] = SCons.Util.CLVar('') - env['LEXCOM'] = '$LEX $LEXFLAGS -t $SOURCES > $TARGET' - + return env.Detect(['./bin/compile_et']) -- cgit