Module: Mesa Branch: master Commit: 5a4e0f3873657d874eb5ff52819f42ea38d54b91 URL: http://cgit.freedesktop.org/mesa/mesa/commit/?id=5a4e0f3873657d874eb5ff52819f42ea38d54b91
Author: Emil Velikov <[email protected]> Date: Mon Sep 1 12:04:12 2014 +0100 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" <[email protected]> Bugzilla: https://bugs.freedesktop.org/show_bug.cgi?id=83355 Reported-by: Maarten Lankhorst <[email protected]> Signed-off-by: Emil Velikov <[email protected]> Tested-by: Maarten Lankhorst <[email protected]> Tested-by: Kai Wasserbäch <[email protected]> --- Makefile.am | 1 - src/mesa/Makefile.am | 3 +-- 2 files changed, 1 insertion(+), 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 \ _______________________________________________ mesa-commit mailing list [email protected] http://lists.freedesktop.org/mailman/listinfo/mesa-commit
