android: remove log2, log2f

[android-x86/external-mesa.git] / Makefile.am

diff --git a/Makefile.am b/Makefile.am
index ee73333..29405a0 100644 (file)
--- 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: