X-Git-Url: https://git.libre-soc.org/?a=blobdiff_plain;f=Makefile.am;h=453e5f672ae01b8e551a101e6651e88aed0f5370;hb=3ede67a4c6d77892296ffc5568ddf3accaa1af99;hp=b2c810aef13d4e36ca44325e92a000f6517ca5a8;hpb=68e04cc6014bf7a2c9bd0b3b783b4ec12aa2e824;p=mesa.git

diff --git a/Makefile.am b/Makefile.am
index b2c810aef13..453e5f672ae 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -21,75 +21,56 @@
 
 SUBDIRS = src
 
+ACLOCAL_AMFLAGS = -I m4
+
 doxygen:
 	cd doxygen && $(MAKE)
 
-check-local:
-	$(MAKE) -C src/mapi/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=8.1-devel
 PACKAGE_DIR = Mesa-$(PACKAGE_VERSION)
 PACKAGE_NAME = MesaLib-$(PACKAGE_VERSION)
 
 EXTRA_FILES = \
 	aclocal.m4					\
 	configure					\
-	src/glsl/glsl_parser.cc				\
+	bin/ar-lib					\
+	bin/compile					\
+	bin/config.sub					\
+	bin/config.guess				\
+	bin/depcomp					\
+	bin/install-sh					\
+	bin/ltmain.sh					\
+	bin/missing					\
+	bin/ylwrap					\
+        bin/test-driver					\
+	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
 
 # Everything for new a Mesa release:
 ARCHIVES = $(PACKAGE_NAME).tar.gz \
 	$(PACKAGE_NAME).tar.bz2 \
 	$(PACKAGE_NAME).zip
 
-tarballs: md5
+tarballs: checksums
 	rm -f ../$(PACKAGE_DIR) $(PACKAGE_NAME).tar
 
 manifest.txt: .git
@@ -116,9 +97,9 @@ $(PACKAGE_NAME).zip: parsers ../$(PACKAGE_DIR) manifest.txt
 	zip -q -@ $(PACKAGE_NAME).zip < $(PACKAGE_DIR)/manifest.txt ; \
 	mv $(PACKAGE_NAME).zip $(PACKAGE_DIR)
 
-md5: $(ARCHIVES)
-	@-md5sum $(PACKAGE_NAME).tar.gz
-	@-md5sum $(PACKAGE_NAME).tar.bz2
-	@-md5sum $(PACKAGE_NAME).zip
+checksums: $(ARCHIVES)
+	@-sha256sum $(PACKAGE_NAME).tar.gz
+	@-sha256sum $(PACKAGE_NAME).tar.bz2
+	@-sha256sum $(PACKAGE_NAME).zip
 
-.PHONY: tarballs md5
+.PHONY: tarballs checksums