diff options
| author | Christian König <[email protected]> | 2011-05-21 16:43:12 +0200 |
|---|---|---|
| committer | Christian König <[email protected]> | 2011-05-21 16:43:12 +0200 |
| commit | aa63ebc48a2ee1ee9afbf2112d4d25e8a9a8d1e8 (patch) | |
| tree | c97d505614f1fd84d498484a45156e0064daf649 /src/glsl/Makefile | |
| parent | 120b55a96e30f1f74ba3448665cef3d724fed647 (diff) | |
| parent | 3c5e74186244f2d77cc711d2b487283459ed06ad (diff) | |
Merge remote-tracking branch 'origin/master' into pipe-video
Diffstat (limited to 'src/glsl/Makefile')
| -rw-r--r-- | src/glsl/Makefile | 8 |
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 $@ |