summaryrefslogtreecommitdiff
path: root/src/glsl/Makefile
diff options
context:
space:
mode:
authorBrian Paul <brianp@vmware.com>2011-05-18 07:50:21 -0600
committerBrian Paul <brianp@vmware.com>2011-05-18 07:51:33 -0600
commitde1df26b5c11a45f2b1ff2ddc7b8ec764356aa94 (patch)
tree3ad505018f3628b917cd45998c5edf966640d15c /src/glsl/Makefile
parent3e0bb02358d627e784a2b7041d6e2e23e3dfd2c5 (diff)
mesa: check that flex/bison are installed
Fixes https://bugs.freedesktop.org/show_bug.cgi?id=36651 NOTE: This is a candidate for the 7.10 branch.
Diffstat (limited to 'src/glsl/Makefile')
-rw-r--r--src/glsl/Makefile8
1 files changed, 4 insertions, 4 deletions
diff --git a/src/glsl/Makefile b/src/glsl/Makefile
index e4b992dbc11..4100414a37d 100644
--- a/src/glsl/Makefile
+++ b/src/glsl/Makefile
@@ -192,16 +192,16 @@ $(DRICORE_OBJ_DIR)/%.o : %.c
$(CC) -c $(INCLUDES) $(DRI_CFLAGS) $(DEFINES) $< -o $@
glsl_lexer.cpp: glsl_lexer.ll
- flex --nounistd -o$@ $<
+ $(FLEX) --nounistd -o$@ $<
glsl_parser.cpp: glsl_parser.yy
- bison -v -o "$@" -p "_mesa_glsl_" --defines=glsl_parser.h $<
+ $(BISON) -v -o "$@" -p "_mesa_glsl_" --defines=glsl_parser.h $<
glcpp/glcpp-lex.c: glcpp/glcpp-lex.l
- flex --nounistd -o$@ $<
+ $(FLEX) --nounistd -o$@ $<
glcpp/glcpp-parse.c: glcpp/glcpp-parse.y
- bison -v -o "$@" --defines=glcpp/glcpp-parse.h $<
+ $(BISON) -v -o "$@" --defines=glcpp/glcpp-parse.h $<
builtin_compiler: $(GLSL2_OBJECTS) $(OBJECTS) builtin_stubs.o
$(APP_CXX) $(INCLUDES) $(CXXFLAGS) $(LDFLAGS) $(OBJECTS) $(GLSL2_OBJECTS) builtin_stubs.o -o $@