... patch ...
--
The majority of the stupid is invincible and guaranteed for all time. The
terror of their tyranny, however, is alleviated by their lack of consistency.
-- Albert Einstein
Index: wafadmin/Tools/flex.py
===================================================================
--- wafadmin/Tools/flex.py (revision 589740)
+++ wafadmin/Tools/flex.py (working copy)
@@ -11,9 +11,9 @@
flex_str = '${FLEX} -o ${TGT} ${FLEXFLAGS} ${SRC}'
# we register our extensions to global variables
-set_globals('EXT_FLEX_C', '.lex.c')
-set_globals('EXT_FLEX_CC', '.lex.cc')
-set_globals('EXT_FLEX_OUT', '.lex.o')
+set_globals('EXT_FLEX_C', '.c')
+set_globals('EXT_FLEX_CC', '.cc')
+set_globals('EXT_FLEX_OUT', '.o')
def l_file(self, node):
if self.__class__.__name__ == 'ccobj':
Index: wafadmin/Tools/bison.py
===================================================================
--- wafadmin/Tools/bison.py (revision 589740)
+++ wafadmin/Tools/bison.py (working copy)
@@ -7,12 +7,12 @@
import Action, Object, os
from Params import set_globals
-bison_str = 'cd ${SRC[0].bld_dir(env)} && ${BISON} ${BISONFLAGS}
${SRC[0].abspath()}'
+bison_str = '${BISON} ${BISONFLAGS} -o ${TGT[0].bldbase(env)}${EXT_BISON_C}
${SRC[0].abspath()}'
# we register our extensions to global variables
-set_globals('EXT_BISON_C', '.tab.c')
-set_globals('EXT_BISON_H', '.tab.h')
-set_globals('EXT_BISON_OUT', '.tab.o')
+set_globals('EXT_BISON_C', '.c')
+set_globals('EXT_BISON_H', '.h')
+set_globals('EXT_BISON_OUT', '.o')
def yc_file(self, node):
yctask = self.create_task('bison', nice=4)
_______________________________________________
Warzone-dev mailing list
[email protected]
https://mail.gna.org/listinfo/warzone-dev
