Mesa (10.2): mesa: fix make tarballs

[Emil Velikov]

Module: Mesa
Branch: 10.2
Commit: ec7d081e130f16ea9b2ad4296723e85a95636fbe
URL:    http://cgit.freedesktop.org/mesa/mesa/commit/?id=ec7d081e130f16ea9b2ad4296723e85a95636fbe

Author: Emil Velikov <emil.l.velikov at gmail.com>
Date:   Sun Aug 31 23:16:15 2014 +0100

mesa: fix make tarballs

Current method of generating distribution tar-balls involves manually
invoking make + target name in the appropriate places. This temporary
solution is used until we get 'make dist' working.

Currently it does not work, as in order to have the target (which is
also a filename) available in the final Makefile we need to add a PHONY
target + use the correct target name.

Cc: "10.2 10.3" <mesa-stable at lists.freedesktop.org>
Signed-off-by: Emil Velikov <emil.l.velikov at gmail.com>
(cherry picked from commit 88cbe3908f0ea08228a5ffb1808f98b6906c4416)

Also squashed together with:

Revert "mesa: fix make tarballs"

This reverts commit 0fbb9a599df898d4e1166d6d6f00cb34a0524bea.

Rather than adding hacks around the issue drop the sources from the
final tarball, and re-add them back with 'make dist'. This fixes a
problem when running parallel 'make install' fails as it recreates
sources and triggers partial recompilation.

Cc: "10.2 10.3" <mesa-stable at lists.freedesktop.org>
Bugzilla: https://bugs.freedesktop.org/show_bug.cgi?id=83355
Reported-by: Maarten Lankhorst <maarten.lankhorst at canonical.com>
Signed-off-by: Emil Velikov <emil.l.velikov at gmail.com>
Tested-by: Maarten Lankhorst <maarten.lankhorst at canonical.com>
Tested-by: Kai Wasserbäch <kai at dev.carbon-project.org>
(cherry picked from commit 5a4e0f3873657d874eb5ff52819f42ea38d54b91)

---

 Makefile.am |    1 -
 1 file changed, 1 deletion(-)

diff --git a/Makefile.am b/Makefile.am
index d2916da..c9aadc8 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -64,7 +64,6 @@ IGNORE_FILES = \
 
 parsers: configure
 	$(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/program_parse.tab.c program/program_parse.tab.h
 
 # Everything for new a Mesa release:
 ARCHIVES = $(PACKAGE_NAME).tar.gz \