Mesa (robust-tarballs): make: Apply several of Dan Nicholson's suggestions.

[Jose Fonseca]

Module: Mesa
Branch: robust-tarballs
Commit: d1ae72d0bd14e820ecfe9f8f27b316f9566ceb0c
URL:    http://cgit.freedesktop.org/mesa/mesa/commit/?id=d1ae72d0bd14e820ecfe9f8f27b316f9566ceb0c

Author: José Fonseca <jose.r.fonseca at gmail.com>
Date:   Tue Jul 12 23:38:21 2011 +0100

make: Apply several of Dan Nicholson's suggestions.

---

 Makefile |    8 ++++----
 1 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/Makefile b/Makefile
index 9f459ae..10374f0 100644
--- a/Makefile
+++ b/Makefile
@@ -190,18 +190,18 @@ LIB_NAME = MesaLib-$(VERSION)
 EXTRA_FILES = \
 	aclocal.m4					\
 	configure					\
-	configure.ac					\
 	src/glsl/glsl_parser.cpp			\
 	src/glsl/glsl_parser.h				\
 	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/depend					\
 	src/mesa/program/lex.yy.c			\
 	src/mesa/program/program_parse.tab.c		\
 	src/mesa/program/program_parse.tab.h
 
+IGNORE_FILES = \
+	-x autogen.sh
 
 DEPEND_FILES = \
 	src/mesa/depend		\
@@ -243,7 +243,7 @@ rm_depend:
 manifest.txt: .git
 	( \
 		ls -1 $(EXTRA_FILES) ; \
-		git ls-files -x autogen.sh \
+		git ls-files $(IGNORE_FILES) \
 	) | sed -e '/^\(.*\/\)\?\./d' -e "s@^@$(DIRECTORY)/@" > $@
 
 ../$(DIRECTORY):
@@ -258,7 +258,7 @@ $(LIB_NAME).tar.gz: $(LIB_NAME).tar ../$(DIRECTORY)
 $(LIB_NAME).tar.bz2: $(LIB_NAME).tar
 	bzip2 --stdout --best $(LIB_NAME).tar > $(LIB_NAME).tar.bz2
 
-$(LIB_NAME).zip: parsers ../$(DIRECTORY)
+$(LIB_NAME).zip: parsers ../$(DIRECTORY) manifest.txt
 	rm -f $(LIB_NAME).zip ; \
 	cd .. ; \
 	zip -q -@ $(LIB_NAME).zip < $(DIRECTORY)/manifest.txt ; \