X-Git-Url: https://git.libre-soc.org/?a=blobdiff_plain;f=Makefile.am;h=29405a0fd31ef4fe869f3d06c1d28ba41e9fca2f;hb=6fddd375d79e9f94668dace0d50f571654792222;hp=ee733339ab82d474e8dc5099fd20303e5c624f60;hpb=c87474089d4941e660e1cadde5cdb0716303105c;p=mesa.git

diff --git a/Makefile.am b/Makefile.am
index ee733339ab8..29405a0fd31 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -30,14 +30,12 @@ check-local:
 	$(MAKE) -C src/mapi/glapi/tests check
 	$(MAKE) -C src/mapi/shared-glapi/tests check
 	$(MAKE) -C src/mesa/main/tests check
-	$(MAKE) -C src/glsl/tests check
 	$(MAKE) -C src/glx/tests check
 
 .PHONY: doxygen
 
 # Rules for making release tarballs
 
-PACKAGE_VERSION=9.1-devel
 PACKAGE_DIR = Mesa-$(PACKAGE_VERSION)
 PACKAGE_NAME = MesaLib-$(PACKAGE_VERSION)
 
@@ -53,9 +51,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 +74,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: