summaryrefslogtreecommitdiff
path: root/Makefile.am
diff options
context:
space:
mode:
authorMatt Turner <mattst88@gmail.com>2013-01-14 22:00:08 -0800
committerMatt Turner <mattst88@gmail.com>2013-01-22 14:33:20 -0800
commit86d30dea3c13d29ef8d39bc18db63a0441051975 (patch)
tree39b2dd61d813609c1e8e3982cbde9ac0f93837b2 /Makefile.am
parentcc9f609cb9175e727b91f8dffa5800818be582da (diff)
glsl/build: Build glcpp via the glsl Makefile
Removing the subdirectory recursion provides a small speed up. Tested-by: Andreas Boll <andreas.boll.dev@gmail.com>
Diffstat (limited to 'Makefile.am')
-rw-r--r--Makefile.am7
1 files changed, 3 insertions, 4 deletions
diff --git a/Makefile.am b/Makefile.am
index ee733339ab..c6fc062485 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -53,9 +53,9 @@ EXTRA_FILES = \
bin/ltmain.sh \
bin/missing \
bin/ylwrap \
- src/glsl/glsl_parser.cc \
+ src/glsl/glsl_parser.cpp \
src/glsl/glsl_parser.h \
- src/glsl/glsl_lexer.cc \
+ src/glsl/glsl_lexer.cpp \
src/glsl/glcpp/glcpp-lex.c \
src/glsl/glcpp/glcpp-parse.c \
src/glsl/glcpp/glcpp-parse.h \
@@ -76,8 +76,7 @@ IGNORE_FILES = \
parsers: configure
- $(MAKE) -C src/glsl glsl_parser.cc glsl_parser.h glsl_lexer.cc
- $(MAKE) -C src/glsl/glcpp glcpp-lex.c glcpp-parse.c glcpp-parse.h
+ $(MAKE) -C src/glsl glsl_parser.cpp glsl_parser.h glsl_lexer.cpp glcpp/glcpp-lex.c glcpp/glcpp-parse.c glcpp/glcpp-parse.h
$(MAKE) -C src/mesa/program lex.yy.c program_parse.tab.c program_parse.tab.h
# Everything for new a Mesa release: