diff options
| author | Emil Velikov <emil.l.velikov@gmail.com> | 2014-09-01 12:04:12 +0100 |
|---|---|---|
| committer | Emil Velikov <emil.l.velikov@gmail.com> | 2014-09-02 11:39:29 +0100 |
| commit | 5a4e0f3873657d874eb5ff52819f42ea38d54b91 (patch) | |
| tree | aa9b67c727571cd21c1ee9d5f4d3afe71087ec10 | |
| parent | 021e84f292ef4bb26631aec41a31c025ada1e8fd (diff) | |
| download | external_mesa3d-5a4e0f3873657d874eb5ff52819f42ea38d54b91.zip external_mesa3d-5a4e0f3873657d874eb5ff52819f42ea38d54b91.tar.gz external_mesa3d-5a4e0f3873657d874eb5ff52819f42ea38d54b91.tar.bz2 | |
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>
| -rw-r--r-- | Makefile.am | 1 | ||||
| -rw-r--r-- | src/mesa/Makefile.am | 3 |
2 files changed, 1 insertions, 3 deletions
diff --git a/Makefile.am b/Makefile.am index 111c1c8..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 ../../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 b23208a..e71bccb 100644 --- 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 \ |