4 files changed, 9 insertions, 34 deletions
diff --git a/mesalib/src/glsl/doflex.bat b/mesalib/src/glsl/doflex.bat
deleted file mode 100644
index 9a0c71200..000000000
--- a/mesalib/src/glsl/doflex.bat
+++ /dev/null
@@ -1,17 +0,0 @@
-@echo off
-setlocal
-
-cd "%~dp0"
-
-set M4=..\..\..\tools\mhmake\m4.exe
-
-set path=..\..\..\tools\mhmake;%path%
-
-copy "..\..\..\tools\mhmake\flex++.exe" flex.exe
-
-flex.exe --nounistd -oglsl_lexer.cpp glsl_lexer.ll
-flex.exe --nounistd -oglcpp/glcpp-lex.c glcpp/glcpp-lex.l
-del flex.exe
-
-endlocal
-
diff --git a/mesalib/src/glsl/dobison.bat b/mesalib/src/glsl/doflexbison.bat
index 72fde0ade..8a5e4f0a6 100644
--- a/mesalib/src/glsl/dobison.bat
+++ b/mesalib/src/glsl/doflexbison.bat
@@ -4,13 +4,18 @@ setlocal
 cd "%~dp0"
 
 set M4=..\..\..\tools\mhmake\m4.exe
-
 set BISON_PKGDATADIR=../../../tools/mhmake/src/bisondata
 
+set path=..\..\..\tools\mhmake;%path%
+
 ..\..\..\tools\mhmake\bison.exe -v -o glsl_parser.cpp -p "_mesa_glsl_" --defines=glsl_parser.h glsl_parser.yy
 
 ..\..\..\tools\mhmake\bison.exe -v -o glcpp/glcpp-parse.c --defines=glcpp/glcpp-parse.h glcpp/glcpp-parse.y
 
+copy "..\..\..\tools\mhmake\flex++.exe" flex.exe
+flex.exe --nounistd -oglsl_lexer.cpp glsl_lexer.ll
+flex.exe --nounistd -oglcpp/glcpp-lex.c glcpp/glcpp-lex.l
+del flex.exe
 
 endlocal
 
diff --git a/mesalib/src/mesa/program/dobison.bat b/mesalib/src/mesa/program/dobison.bat
deleted file mode 100644
index 33f27a235..000000000
--- a/mesalib/src/mesa/program/dobison.bat
+++ /dev/null
@@ -1,13 +0,0 @@
-@echo off
-setlocal
-
-cd "%~dp0"
-
-set M4=..\..\..\..\tools\mhmake\m4.exe
-
-set BISON_PKGDATADIR=../../../../tools/mhmake/src/bisondata
-
-..\..\..\..\tools\mhmake\bison.exe -v -d --output=program_parse.tab.c program_parse.y
-
-endlocal
-
diff --git a/mesalib/src/mesa/program/doflex.bat b/mesalib/src/mesa/program/doflexbison.bat
index bd3ccb0e0..d54e5ac65 100644
--- a/mesalib/src/mesa/program/doflex.bat
+++ b/mesalib/src/mesa/program/doflexbison.bat
@@ -4,14 +4,14 @@ setlocal
 cd "%~dp0"
 
 set M4=..\..\..\..\tools\mhmake\m4.exe
+set BISON_PKGDATADIR=../../../../tools/mhmake/src/bisondata
 
 set path=..\..\..\..\tools\mhmake;%path%
 
-copy "..\..\..\..\tools\mhmake\flex++.exe" flex.exe
+..\..\..\..\tools\mhmake\bison.exe -v -d --output=program_parse.tab.c program_parse.y
 
- 
+copy "..\..\..\..\tools\mhmake\flex++.exe" flex.exe
 flex.exe --never-interactive --outfile=lex.yy.c program_lexer.l
-
 del flex.exe
 
 endlocal