diff options
| author | Eric Engestrom <[email protected]> | 2018-08-16 14:02:44 +0100 |
|---|---|---|
| committer | Eric Engestrom <[email protected]> | 2018-08-16 17:38:31 +0100 |
| commit | 471f708ed6f4787813d0656c2457a6fc5738ddfc (patch) | |
| tree | 8dae8406c42b5eda9f781b7aafa90793a5ada72c /src | |
| parent | 9a6a6317629eb4c63d28860ded30778ac341ac63 (diff) | |
git_sha1: simplify logic
Signed-off-by: Eric Engestrom <[email protected]>
Reviewed-by: Emil Velikov <[email protected]>
Diffstat (limited to 'src')
| -rw-r--r-- | src/Makefile.am | 2 | ||||
| -rw-r--r-- | src/git_sha1.h.in | 1 | ||||
| -rw-r--r-- | src/mesa/Android.libmesa_git_sha1.mk | 2 |
3 files changed, 2 insertions, 3 deletions
diff --git a/src/Makefile.am b/src/Makefile.am index 9de0192b791..396865cbe55 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -20,7 +20,7 @@ # IN THE SOFTWARE. .PHONY: git_sha1.h -git_sha1.h: $(top_srcdir)/src/git_sha1.h.in +git_sha1.h: @echo "updating $@" @$(PYTHON2) $(top_srcdir)/bin/git_sha1_gen.py --output $@ diff --git a/src/git_sha1.h.in b/src/git_sha1.h.in deleted file mode 100644 index dc17f5e6614..00000000000 --- a/src/git_sha1.h.in +++ /dev/null @@ -1 +0,0 @@ -#define MESA_GIT_SHA1 "git-@VCS_TAG@" diff --git a/src/mesa/Android.libmesa_git_sha1.mk b/src/mesa/Android.libmesa_git_sha1.mk index d27923074dd..fbbbf2fe094 100644 --- a/src/mesa/Android.libmesa_git_sha1.mk +++ b/src/mesa/Android.libmesa_git_sha1.mk @@ -43,7 +43,7 @@ $(intermediates)/dummy.c: LOCAL_GENERATED_SOURCES += $(addprefix $(intermediates)/, git_sha1.h) -$(intermediates)/git_sha1.h: $(MESA_TOP)/src/git_sha1.h.in $(wildcard $(MESA_TOP)/.git/logs/HEAD) +$(intermediates)/git_sha1.h: $(wildcard $(MESA_TOP)/.git/logs/HEAD) @mkdir -p $(dir $@) @echo "GIT-SHA1: $(PRIVATE_MODULE) <= git" $(hide) $(MESA_PYTHON2) $(MESA_TOP)/bin/git_sha1_gen.py --output $@ |