i915g: Fix the sampler bind function

[mesa.git] / Makefile.am

diff --git a/Makefile.am b/Makefile.am
index 36bcf1f0bd37acc040311df59545ac7b9b374e30..343badef4b79abcfd2b386b5c5f623cbd7226b2f 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
@@ -21,69 +21,50 @@
 
 SUBDIRS = src
 
+ACLOCAL_AMFLAGS = -I m4
+
 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
-
-clean-local:
-       -@touch $(top_builddir)/configs/current
-       -@for dir in $(SUBDIRS) ; do \
-               if [ -d $$dir ] ; then \
-                       (cd $$dir && $(MAKE) clean) ; \
-               fi \
-       done
-       -@test -s $(top_builddir)/configs/current || rm -f $(top_builddir)/configs/current
-
-
-
-distclean-local:
-       -rm -rf lib*
-       -rm -f $(top_builddir)/configs/current
-       -find . '(' -name '*.o' -o -name '*.a' -o -name '*.so' -o \
-         -name depend -o -name depend.bak ')' -exec rm -f '{}' ';'
-
 .PHONY: doxygen
 
 # Rules for making release tarballs
 
-PACKAGE_VERSION=9.0-devel
 PACKAGE_DIR = Mesa-$(PACKAGE_VERSION)
 PACKAGE_NAME = MesaLib-$(PACKAGE_VERSION)
 
 EXTRA_FILES = \
        aclocal.m4                                      \
        configure                                       \
-       src/glsl/glsl_parser.cc                         \
+       VERSION                                 \
+       bin/ar-lib                                      \
+       bin/compile                                     \
+       bin/config.sub                                  \
+       bin/config.guess                                \
+       bin/depcomp                                     \
+       bin/install-sh                                  \
+       bin/ltmain.sh                                   \
+       bin/missing                                     \
+       bin/ylwrap                                      \
+       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                    \
-       src/mesa/main/api_exec_es1.c                    \
-       src/mesa/main/api_exec_es1_dispatch.h           \
-       src/mesa/main/api_exec_es1_remap_helper.h       \
-       src/mesa/main/api_exec_es2.c                    \
-       src/mesa/main/api_exec_es2_dispatch.h           \
-       src/mesa/main/api_exec_es2_remap_helper.h       \
        src/mesa/program/lex.yy.c                       \
        src/mesa/program/program_parse.tab.c            \
-       src/mesa/program/program_parse.tab.h
+       src/mesa/program/program_parse.tab.h            \
+       `git ls-files | grep "Makefile.am" | sed -e "s/Makefile.am/Makefile.in/"`
+
 
 IGNORE_FILES = \
        -x autogen.sh
 
 
 parsers: configure
-       -@touch $(top_builddir)/configs/current
-       $(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
+       $(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:
 ARCHIVES = $(PACKAGE_NAME).tar.gz \