automake: move the git_sha1.h rule a level up

This way we can reuse the header from other places like -
src/intel/vulkan and src/gallium. Only the former is hooked up atm.

Make sure .gitignore is updated, as well as all the users (the mesa
code does not need any changes).

Also ensure that the file is always created by adding it to the
BUILT_SOURCES target.

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 7db5639a5d59c9361d5aa48af13251c6446573e5..f42ca7f50ed42dfdfd9508ec9caeffc42ef56c1b 100644 (file)
--- a/.gitignore
+++ b/.gitignore
@@ -48,3 +48,5 @@ Makefile
 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 6ce57916031e05acc26504c5b3bc5371c24dfb6f..d142aeaaa5eb41b946bfaa4ca0497703dbb8d8aa 100644 (file)
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -19,6 +19,31 @@
 # 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
+       @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 ; \
+               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
 
 # include only conditionally ?

diff --git a/src/intel/vulkan/anv_device.c b/src/intel/vulkan/anv_device.c
index 046777d16f2c22c5b9b95b869cee4712098334ea..c169d73892320a6db3f44878893db8c7e26af38a 100644 (file)
--- a/src/intel/vulkan/anv_device.c
+++ b/src/intel/vulkan/anv_device.c
@@ -28,7 +28,7 @@
 #include <fcntl.h>
 
 #include "anv_private.h"
-#include "mesa/main/git_sha1.h"
+#include "git_sha1.h"
 #include "util/strtod.h"
 #include "util/debug.h"
 

diff --git a/src/mesa/Makefile.am b/src/mesa/Makefile.am
index 2c77fa80a499d810b0fed29657d2dc54615300a0..6d7a3cc9486e1e6a67a58d56bfda6010ca9d8f6f 100644 (file)
--- a/src/mesa/Makefile.am
+++ b/src/mesa/Makefile.am
@@ -36,28 +36,6 @@ endif
 gldir = $(includedir)/GL
 gl_HEADERS = $(top_srcdir)/include/GL/*.h
 
-.PHONY: main/git_sha1.h.tmp
-main/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 main/git_sha1.h.tmp
-       @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"/' \
-                       > main/git_sha1.h.tmp ; \
-               fi \
-       fi
-
-main/git_sha1.h: main/git_sha1.h.tmp
-       @echo "updating main/git_sha1.h"
-       @if ! cmp -s main/git_sha1.h.tmp main/git_sha1.h; then \
-               mv main/git_sha1.h.tmp main/git_sha1.h ;\
-       else \
-               rm main/git_sha1.h.tmp ;\
-       fi
-
 include Makefile.sources
 
 EXTRA_DIST = \
@@ -80,15 +58,13 @@ EXTRA_DIST = \
 BUILT_SOURCES = \
        main/get_hash.h \
        main/format_info.h \
-       main/git_sha1.h \
        main/format_pack.c \
        main/format_unpack.c \
        program/program_parse.tab.c \
        program/lex.yy.c
 CLEANFILES = \
        $(BUILT_SOURCES) \
-       program/program_parse.tab.h \
-       main/git_sha1.h.tmp
+       program/program_parse.tab.h
 
 PYTHON_GEN = $(AM_V_GEN)$(PYTHON2) $(PYTHON_FLAGS)
 

diff --git a/src/mesa/Makefile.sources b/src/mesa/Makefile.sources
index 5f7f46d118fbff3c81ed5d3b3b04893411cf4a2a..84db5a807feb0d8482df88d2dd234fed1c9c2948 100644 (file)
--- a/src/mesa/Makefile.sources
+++ b/src/mesa/Makefile.sources
@@ -642,6 +642,7 @@ MESA_GALLIUM_FILES = \
 
 INCLUDE_DIRS = \
        -I$(top_srcdir)/include \
+       -I$(top_builddir)/src \
        -I$(top_srcdir)/src \
        -I$(top_builddir)/src/compiler/nir \
        -I$(top_srcdir)/src/mesa \

diff --git a/src/mesa/main/.gitignore b/src/mesa/main/.gitignore
index 355b426e2e13623ebe71fb33d1304343bb6cb14f..a4da567c94ecd68ee0f9217332499def8dce0b1a 100644 (file)
--- a/src/mesa/main/.gitignore
+++ b/src/mesa/main/.gitignore
@@ -1,8 +1,6 @@
 api_exec.c
 dispatch.h
 enums.c
-git_sha1.h
-git_sha1.h.tmp
 remap_helper.h
 get_hash.h
 get_hash.h.tmp