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.

diff --git a/src/glsl/Makefile b/src/glsl/Makefile
index a0ab1d6d401cf9823f50daddae13b3b1f75c9812..3e480685bdfa881fec284fdad4a0a997fda9e8a1 100644 (file)
--- 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 $<