Mesa (master): automake: rework the git_sha1.h rule, include in tarball

[Emil Velikov]

Module: Mesa
Branch: master
Commit: 3689ef32afdafbb030069e560aac0e563fc29048
URL:    http://cgit.freedesktop.org/mesa/mesa/commit/?id=3689ef32afdafbb030069e560aac0e563fc29048

Author: Emil Velikov <emil.velikov at collabora.com>
Date:   Mon May 30 12:32:05 2016 +0100

automake: rework the git_sha1.h rule, include in tarball

As we'll need the file in the release tarball, rework the rule so that
the file is regenerated _only_ if we're in a git repository.

With this in place we can build vulkan (anv) from a release tarball.

Cc: Jason Ekstrand <jason.ekstrand at intel.com>
Cc: Kristian Høgsberg Kristensen <krh at bitplanet.net>
Signed-off-by: Emil Velikov <emil.velikov at collabora.com>

---

 .gitignore      |  1 -
 src/Makefile.am | 20 +++-----------------
 2 files changed, 3 insertions(+), 18 deletions(-)

diff --git a/.gitignore b/.gitignore
index f42ca7f..90abe10 100644
--- a/.gitignore
+++ b/.gitignore
@@ -49,4 +49,3 @@ Makefile.in
 .install-mesa-links
 .install-gallium-links
 /src/git_sha1.h
-/src/git_sha1.h.tmp
diff --git a/src/Makefile.am b/src/Makefile.am
index d142aea..f5c0773 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -19,30 +19,16 @@
 # FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS
 # IN THE SOFTWARE.
 
-.PHONY: git_sha1.h.tmp
-git_sha1.h.tmp:
-	@# Don't assume that $(top_srcdir)/.git is a directory. It may be
-	@# a gitlink file if $(top_srcdir) is a submodule checkout or a linked
-	@# worktree.
-	@touch git_sha1.h.tmp
+git_sha1.h:
 	@if test -e $(top_srcdir)/.git; then \
 		if which git > /dev/null; then \
 		    git --git-dir=$(top_srcdir)/.git log -n 1 --oneline | \
 			sed 's/^\([^ ]*\) .*/#define MESA_GIT_SHA1 "git-\1"/' \
-			> git_sha1.h.tmp ; \
+			> git_sha1.h ; \
 		fi \
 	fi
 
-git_sha1.h: git_sha1.h.tmp
-	@echo "updating git_sha1.h"
-	@if ! cmp -s git_sha1.h.tmp git_sha1.h; then \
-		mv git_sha1.h.tmp git_sha1.h ;\
-	else \
-		rm git_sha1.h.tmp ;\
-	fi
-
 BUILT_SOURCES = git_sha1.h
-CLEANFILES = $(BUILT_SOURCES)
 
 SUBDIRS = . gtest util mapi/glapi/gen mapi
 
@@ -92,7 +78,7 @@ SUBDIRS += gallium
 endif
 
 EXTRA_DIST = \
-	getopt hgl SConscript
+	getopt hgl SConscript git_sha1.h
 
 AM_CFLAGS = $(VISIBILITY_CFLAGS)
 AM_CXXFLAGS = $(VISIBILITY_CXXFLAGS)