From bcfda0a1fe10bbe35a8c798a3e05b9fdc8802c70 Mon Sep 17 00:00:00 2001 From: Emil Velikov Date: Mon, 6 Jun 2016 19:39:40 +0100 Subject: mesa: automake: distclean git_sha1.h when building OOT In the case of out-of-tree (OOT) builds, in particular when building from tarball, we'll end up with the file in both srcdir and builddir. We want the former to remain intact (since we need it on rebuild) while the latter should be removed otherwise `make distclean' gets angry at us. Ideally there'll be a solution that feels a bit less of a hack. Until then this does the job exactly as expected. Cc: Signed-off-by: Emil Velikov (cherry picked from commit b7f7ec78435771ab02f7d9a61bb1d4a11df720b8) --- src/Makefile.am | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/src/Makefile.am b/src/Makefile.am index a5c54ffc03b..0527a315955 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -46,6 +46,12 @@ git_sha1.h: git_sha1.h.tmp BUILT_SOURCES = git_sha1.h +# We want to keep the srcdir file since we need it on rebuild from tarball. +# At the same time `make distclean' gets angry at us if we don't cleanup the +# builddir one. +distclean-local: + test $(top_srcdir) != $(top_builddir) && rm $(builddir)/git_sha1.h + SUBDIRS = . gtest util mapi/glapi/gen mapi # include only conditionally ? -- cgit v1.2.3