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@lists.freedesktop.org>
Bugzilla: https://bugs.freedesktop.org/show_bug.cgi?id=83355
Reported-by: Maarten Lankhorst <maarten.lankhorst@canonical.com>
Signed-off-by: Emil Velikov <emil.l.velikov@gmail.com>
Tested-by: Maarten Lankhorst <maarten.lankhorst@canonical.com>
Tested-by: Kai Wasserbäch <kai@dev.carbon-project.org>

diff --git a/Makefile.am b/Makefile.am
index 111c1c8c813038d36268d6e02673966c2cdc8c2b..c9aadc827d903cdae8cd6c1d5e2a576a40949a4c 100644 (file)
--- 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 ../../src/mesa/program/lex.yy.c ../../src/mesa/program/program_parse.tab.c ../../src/mesa/program/program_parse.tab.h
 
 # Everything for new a Mesa release:
 ARCHIVES = $(PACKAGE_NAME).tar.gz \

diff --git a/src/mesa/Makefile.am b/src/mesa/Makefile.am
index b23208ae815e5800b00fb34cd0ea2768a9904e38..e71bccbbe6467fb5108123fbad19db76599a84cf 100644 (file)
--- a/src/mesa/Makefile.am
+++ b/src/mesa/Makefile.am
@@ -36,8 +36,7 @@ endif
 gldir = $(includedir)/GL
 gl_HEADERS = $(top_srcdir)/include/GL/*.h
 
-.PHONY: $(BUILDDIR)main/git_sha1.h.tmp $(BUILDDIR)program/lex.yy.c $(BUILDDIR)program/program_parse.tab.c $(BUILDDIR)program/program_parse.tab.h
-
+.PHONY: $(BUILDDIR)main/git_sha1.h.tmp
 $(BUILDDIR)main/git_sha1.h.tmp:
        @touch main/git_sha1.h.tmp
        @if test -d $(top_srcdir)/.git; then \