diff --git a/MathEval/Makefile b/MathEval/Makefile
index 5e3c7850dc3ddda82371bbbcf6d619bce485bb90..58e2c969484fcabcf440cb073b8c606310ba0ad1 100644
--- a/MathEval/Makefile
+++ b/MathEval/Makefile
@@ -1,4 +1,4 @@
-# $Id: Makefile,v 1.4 2005-06-03 17:32:29 geuzaine Exp $
+# $Id: Makefile,v 1.5 2005-06-20 16:35:30 geuzaine Exp $
 #
 # Copyright (C) 1997-2005 C. Geuzaine, J.-F. Remacle
 #
@@ -28,8 +28,8 @@ CFLAGS  = ${OPTIM} ${FLAGS} ${INCLUDE}
 
 SRC = matheval.cpp\
       node.cpp\
-      scanner.cpp\
-      parser.cpp\
+      scanner.yy.cpp\
+      parser.tab.cpp\
       symbol_table.cpp\
       xmath.cpp
 
@@ -45,10 +45,9 @@ ${LIB}: ${OBJ}
 	${CXX} ${CFLAGS} -c $<
 
 parser:
-	bison --output parser.cpp -pme -d parser.y 
-	flex -oscanner.cpp -Pme scanner.l
-	if [ -r parser.cpp.h ]; then mv parser.cpp.h parser.h ; fi
-	if [ -r parser.hpp ]; then mv parser.hpp parser.h ; fi
+	bison --output parser.tab.cpp -pme -d parser.y
+	if [ -r parser.tab.cpp.h ]; then mv parser.tab.cpp.h parser.tab.hpp ; fi
+	flex -oscanner.yy.cpp -Pme scanner.l
 
 clean:
 	rm -f *.o
diff --git a/MathEval/parser.cpp b/MathEval/parser.tab.cpp
similarity index 100%
rename from MathEval/parser.cpp
rename to MathEval/parser.tab.cpp
diff --git a/MathEval/parser.h b/MathEval/parser.tab.hpp
similarity index 100%
rename from MathEval/parser.h
rename to MathEval/parser.tab.hpp
diff --git a/MathEval/scanner.l b/MathEval/scanner.l
index 33d859f4bf4936ecd635418c67dad9f6b7c95608..0b92fa78c8a4ecc725888b7557ea0da72547d324 100644
--- a/MathEval/scanner.l
+++ b/MathEval/scanner.l
@@ -24,7 +24,7 @@
 
 #include "common.h"
 #include "node.h"
-#include "parser.h"
+#include "parser.tab.hpp"
 #include "symbol_table.h"
 
 #define YY_ALWAYS_INTERACTIVE 1
diff --git a/MathEval/scanner.cpp b/MathEval/scanner.yy.cpp
similarity index 99%
rename from MathEval/scanner.cpp
rename to MathEval/scanner.yy.cpp
index 7f6b21511cff59d7d5a4f78ad245a752ad97beea..e4bb1ff00ba3b8e4cbfe858b7d84a815c13f4ee7 100644
--- a/MathEval/scanner.cpp
+++ b/MathEval/scanner.yy.cpp
@@ -16,11 +16,11 @@
 #define yytext metext
 #define yywrap mewrap
 
-#line 20 "scanner.cpp"
+#line 20 "scanner.yy.cpp"
 /* A lexical scanner generated by flex */
 
 /* Scanner skeleton version:
- * $Header: /cvsroot/gmsh/MathEval/scanner.cpp,v 1.7 2005-03-17 22:45:00 geuzaine Exp $
+ * $Header: /cvsroot/gmsh/MathEval/scanner.yy.cpp,v 1.1 2005-06-20 16:35:30 geuzaine Exp $
  */
 
 #define FLEX_SCANNER
@@ -455,7 +455,7 @@ char *yytext;
 
 #include "common.h"
 #include "node.h"
-#include "parser.h"
+#include "parser.tab.hpp"
 #include "symbol_table.h"
 
 #define YY_ALWAYS_INTERACTIVE 1
@@ -472,7 +472,7 @@ extern char *matheval_input_string; /* String representing function.  */
 /* Read next max_size character from string into buffer.  */
 static int input_from_string (char *buffer, int max_size);
 /* Token definitions.  */
-#line 476 "scanner.cpp"
+#line 476 "scanner.yy.cpp"
 
 /* Macros after this point can all be overridden by user definitions in
  * section 1.
@@ -626,7 +626,7 @@ YY_DECL
 #line 52 "scanner.l"
 
 
-#line 630 "scanner.cpp"
+#line 630 "scanner.yy.cpp"
 
 	if ( yy_init )
 		{
@@ -804,7 +804,7 @@ YY_RULE_SETUP
 #line 108 "scanner.l"
 ECHO;
 	YY_BREAK
-#line 808 "scanner.cpp"
+#line 808 "scanner.yy.cpp"
 case YY_STATE_EOF(INITIAL):
 	yyterminate();