Mesa (glsl2): glsl2: Change command line options passed to flex

[Ian Romanick]

Module: Mesa
Branch: glsl2
Commit: 5a805079a8d209e843661941730ecfebb65d2913
URL:    http://cgit.freedesktop.org/mesa/mesa/commit/?id=5a805079a8d209e843661941730ecfebb65d2913

Author: Ian Romanick <ian.d.romanick at intel.com>
Date:   Wed Aug 11 17:19:05 2010 -0700

glsl2: Change command line options passed to flex

Remove --never-interactive because it is already specified in the
source using %option.  Use -o instead of --outfile.  Some of the
%option commands may also need to be removed for compatibility with
older versions (e.g., 2.5.4) of flex.

This should fix bugzilla #29209.

---

 src/glsl/Makefile |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/src/glsl/Makefile b/src/glsl/Makefile
index a0ab1d6..3e48068 100644
--- a/src/glsl/Makefile
+++ b/src/glsl/Makefile
@@ -151,7 +151,7 @@ glcpp/glcpp: $(GLCPP_OBJECTS) libglsl.a
 	$(CC) -c $(INCLUDES) $(CFLAGS) $(DEFINES) $< -o $@
 
 glsl_lexer.cpp: glsl_lexer.lpp
-	flex --never-interactive --outfile="$@"  $<
+	flex -o$@  $<
 
 glsl_parser.cpp: glsl_parser.ypp
 	bison -v -o "$@" -p "_mesa_glsl_" --defines=glsl_parser.h $<