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@intel.com>
Cc: Kristian Høgsberg Kristensen <krh@bitplanet.net>
Signed-off-by: Emil Velikov <emil.velikov@collabora.com>

diff --git a/.gitignore b/.gitignore
index f42ca7f50ed42dfdfd9508ec9caeffc42ef56c1b..90abe10c2ebe3795ce9c8f5a8a7284cc61b8b4bf 100644 (file)
--- 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 d142aeaaa5eb41b946bfaa4ca0497703dbb8d8aa..f5c07739deabc97108593bddeda53f1ed5049548 100644 (file)
--- 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)