diff options
| author | Emil Velikov <emil.l.velikov@gmail.com> | 2014-08-31 23:16:15 +0100 |
|---|---|---|
| committer | Emil Velikov <emil.l.velikov@gmail.com> | 2014-09-01 00:23:45 +0100 |
| commit | 0fbb9a599df898d4e1166d6d6f00cb34a0524bea (patch) | |
| tree | 768348c4778746942844d7b2e128bf00ab638288 | |
| parent | 2310a4b4cf0fd7a4cd04dd9aba5c89f52070e5d2 (diff) | |
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@lists.freedesktop.org>
Signed-off-by: Emil Velikov <emil.l.velikov@gmail.com>
(cherry picked from commit 88cbe3908f0ea08228a5ffb1808f98b6906c4416)
| -rw-r--r-- | Makefile.am | 2 | ||||
| -rw-r--r-- | src/mesa/Makefile.am | 3 |
2 files changed, 3 insertions, 2 deletions
diff --git a/Makefile.am b/Makefile.am index d2916da43b..111c1c8c81 100644 --- a/Makefile.am +++ b/Makefile.am @@ -64,7 +64,7 @@ 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 + $(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 e71bccbbe6..b23208ae81 100644 --- a/src/mesa/Makefile.am +++ b/src/mesa/Makefile.am @@ -36,7 +36,8 @@ endif gldir = $(includedir)/GL gl_HEADERS = $(top_srcdir)/include/GL/*.h -.PHONY: $(BUILDDIR)main/git_sha1.h.tmp +.PHONY: $(BUILDDIR)main/git_sha1.h.tmp $(BUILDDIR)program/lex.yy.c $(BUILDDIR)program/program_parse.tab.c $(BUILDDIR)program/program_parse.tab.h + $(BUILDDIR)main/git_sha1.h.tmp: @touch main/git_sha1.h.tmp @if test -d $(top_srcdir)/.git; then \ |