glsl: Refactor AST-to-HIR code handling variable initializers

[mesa.git] / src / glsl / Makefile

diff --git a/src/glsl/Makefile b/src/glsl/Makefile
index cf8d4b1a70798772f18761ece4150eebb96b1c57..cd7c41a2abc065b74848e8543d2451b8db3a38c8 100644 (file)
--- a/src/glsl/Makefile
+++ b/src/glsl/Makefile
@@ -191,10 +191,10 @@ $(DRICORE_OBJ_DIR)/%.o : %.c
        @mkdir -p $(dir $@)
        $(CC) -c $(INCLUDES) $(DRI_CFLAGS) $(DEFINES) $< -o $@
 
-glsl_lexer.cpp: glsl_lexer.lpp
+glsl_lexer.cpp: glsl_lexer.ll
        flex --nounistd -o$@  $<
 
-glsl_parser.cpp: glsl_parser.ypp
+glsl_parser.cpp: glsl_parser.yy
        bison -v -o "$@" -p "_mesa_glsl_" --defines=glsl_parser.h $<
 
 glcpp/glcpp-lex.c: glcpp/glcpp-lex.l
@@ -208,6 +208,6 @@ builtin_compiler: $(GLSL2_OBJECTS) $(OBJECTS) builtin_stubs.o
 
 builtin_function.cpp: builtins/profiles/* builtins/ir/* builtins/tools/generate_builtins.py builtins/tools/texture_builtins.py builtin_compiler
        @echo Regenerating builtin_function.cpp...
-       $(PYTHON2) $(PYTHON_FLAGS) builtins/tools/generate_builtins.py $(PWD)/builtin_compiler > builtin_function.cpp
+       $(PYTHON2) $(PYTHON_FLAGS) builtins/tools/generate_builtins.py ./builtin_compiler > builtin_function.cpp || rm -f builtin_function.cpp
 
 -include depend