summaryrefslogtreecommitdiff
path: root/source4/build/scons/et.py
diff options
context:
space:
mode:
authorJelmer Vernooij <jelmer@samba.org>2005-09-20 22:10:40 +0000
committerGerald (Jerry) Carter <jerry@samba.org>2007-10-10 13:38:32 -0500
commit8db177b652cdede2f509d6c96d1c99e875c2d284 (patch)
tree1226f1b334f60088a164d985bfc0f72942bb496e /source4/build/scons/et.py
parent0e2c62451d4463aecc5ff01d56b48521e9f59ffb (diff)
downloadsamba-8db177b652cdede2f509d6c96d1c99e875c2d284.tar.gz
samba-8db177b652cdede2f509d6c96d1c99e875c2d284.tar.bz2
samba-8db177b652cdede2f509d6c96d1c99e875c2d284.zip
r10366: More scons fixes. Building et, asn1, lex and yacc files sort-of works now
(This used to be commit 22f18a84242e5e68a2d57b6d7ff77c089ee7434a)
Diffstat (limited to 'source4/build/scons/et.py')
-rw-r--r--source4/build/scons/et.py18
1 files changed, 3 insertions, 15 deletions
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'])