softpipe: fix softpipe_delete_fs_state() failed assertion

[mesa.git] / Makefile.am

diff --git a/Makefile.am b/Makefile.am
index 008ac71290252c19819d04da4b6b7a0b32b244ff..e8c7b597c31975d1e9d7e954a186785b5877cf04 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
@@ -25,6 +25,9 @@ doxygen:
        cd doxygen && $(MAKE)
 
 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
 
@@ -42,7 +45,6 @@ clean-local:
 distclean-local:
        -rm -rf lib*
        -rm -f $(top_builddir)/configs/current
-       -rm -f $(top_builddir)/configs/autoconf
        -find . '(' -name '*.o' -o -name '*.a' -o -name '*.so' -o \
          -name depend -o -name depend.bak ')' -exec rm -f '{}' ';'
 
@@ -57,9 +59,9 @@ PACKAGE_NAME = MesaLib-$(PACKAGE_VERSION)
 EXTRA_FILES = \
        aclocal.m4                                      \
        configure                                       \
-       src/glsl/glsl_parser.cpp                        \
+       src/glsl/glsl_parser.cc                         \
        src/glsl/glsl_parser.h                          \
-       src/glsl/glsl_lexer.cpp                         \
+       src/glsl/glsl_lexer.cc                          \
        src/glsl/glcpp/glcpp-lex.c                      \
        src/glsl/glcpp/glcpp-parse.c                    \
        src/glsl/glcpp/glcpp-parse.h                    \
@@ -79,7 +81,7 @@ IGNORE_FILES = \
 
 parsers: configure
        -@touch $(top_builddir)/configs/current
-       $(MAKE) -C src/glsl glsl_parser.cpp glsl_parser.h glsl_lexer.cpp
+       $(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/mesa program/lex.yy.c program/program_parse.tab.c program/program_parse.tab.h