X-Git-Url: https://git.libre-soc.org/?a=blobdiff_plain;f=Makefile.am;h=96ab4495228bc9dd7826feeede223cd02bb21a78;hb=bc08f26485c77b3ef3ee7b07d67fd43f2644f1ac;hp=3721d1eaac533fd49c4f509c2b33cb416e61d748;hpb=8fecdcc587a192c0ea4e13d59321691b8981c249;p=mesa.git

diff --git a/Makefile.am b/Makefile.am
index 3721d1eaac5..96ab4495228 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -21,10 +21,14 @@
 
 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
@@ -43,7 +47,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 '{}' ';'
 
@@ -51,16 +54,19 @@ distclean-local:
 
 # Rules for making release tarballs
 
-PACKAGE_VERSION=8.1-devel
+PACKAGE_VERSION=9.1-devel
 PACKAGE_DIR = Mesa-$(PACKAGE_VERSION)
 PACKAGE_NAME = MesaLib-$(PACKAGE_VERSION)
 
 EXTRA_FILES = \
 	aclocal.m4					\
 	configure					\
-	src/glsl/glsl_parser.cpp			\
+	bin/config.sub					\
+	bin/config.guess				\
+	bin/install-sh					\
+	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			\
@@ -72,7 +78,56 @@ EXTRA_FILES = \
 	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		\
+	src/gallium/drivers/r600/Makefile.in		\
+	src/gallium/drivers/r300/Makefile.in		\
+	src/gallium/drivers/Makefile.in			\
+	src/gallium/Makefile.in				\
+	src/gallium/auxiliary/pipe-loader/Makefile.in	\
+	src/gallium/targets/opencl/Makefile.in		\
+	src/gallium/state_trackers/clover/Makefile.in	\
+	src/mapi/glapi/tests/Makefile.in		\
+	src/mapi/glapi/Makefile.in			\
+	src/mapi/glapi/gen/Makefile.in			\
+	src/mapi/es1api/Makefile.in			\
+	src/mapi/shared-glapi/tests/Makefile.in		\
+	src/mapi/shared-glapi/Makefile.in		\
+	src/mapi/vgapi/Makefile.in			\
+	src/mapi/es2api/Makefile.in			\
+	src/glsl/tests/Makefile.in			\
+	src/glsl/glcpp/Makefile.in			\
+	src/glsl/Makefile.in				\
+	src/gtest/Makefile.in				\
+	src/egl/drivers/Makefile.in			\
+	src/egl/drivers/glx/Makefile.in			\
+	src/egl/drivers/dri2/Makefile.in		\
+	src/egl/Makefile.in				\
+	src/egl/main/Makefile.in			\
+	src/egl/wayland/Makefile.in			\
+	src/egl/wayland/wayland-drm/Makefile.in		\
+	src/egl/wayland/wayland-egl/Makefile.in		\
+	src/Makefile.in					\
+	src/glx/tests/Makefile.in			\
+	src/glx/Makefile.in				\
+	src/gbm/Makefile.in				\
+	src/mesa/drivers/Makefile.in			\
+	src/mesa/drivers/dri/common/Makefile.in		\
+	src/mesa/drivers/dri/i965/Makefile.in		\
+	src/mesa/drivers/dri/r200/Makefile.in		\
+	src/mesa/drivers/dri/Makefile.in		\
+	src/mesa/drivers/dri/radeon/Makefile.in		\
+	src/mesa/drivers/dri/swrast/Makefile.in		\
+	src/mesa/drivers/dri/nouveau/Makefile.in	\
+	src/mesa/drivers/dri/i915/Makefile.in		\
+	src/mesa/drivers/osmesa/Makefile.in		\
+	src/mesa/drivers/x11/Makefile.in		\
+	src/mesa/Makefile.in				\
+	src/mesa/libdricore/Makefile.in			\
+	src/mesa/x86-64/Makefile.in			\
+	src/mesa/main/tests/Makefile.in			\
+	src/mesa/x86/Makefile.in			\
+	Makefile.in
+
 
 IGNORE_FILES = \
 	-x autogen.sh
@@ -80,7 +135,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