diff options
author | Thomas Wood <thomas.wood@intel.com> | 2014-07-22 14:53:18 +0100 |
---|---|---|
committer | Thomas Wood <thomas.wood@intel.com> | 2014-07-23 16:43:05 +0100 |
commit | 743dc7997aa9f5210055896940d87c88983dcda6 (patch) | |
tree | 493416bfc91a0f8f69e7275a5a93848e0f2dec4a /lib/Android.mk | |
parent | 784344ef8896e47af13fbb4377b020f33ce4c93c (diff) |
build: improve version.h generation
Move version.h generation into lib/Makefile.sources so that it can be
shared between the Autotools and Android build systems. Also make sure the
"updating version.h" message is only displayed when version.h actually
changes and remove unnecessary includes of version.h.
This also includes changes from Tvrtko Ursulin to prevent a build from
within the git repository failing when git is not available.
Signed-off-by: Thomas Wood <thomas.wood@intel.com>
Cc: Tvrtko Ursulin <tvrtko.ursulin@linux.intel.com>
Diffstat (limited to 'lib/Android.mk')
-rw-r--r-- | lib/Android.mk | 23 |
1 files changed, 1 insertions, 22 deletions
diff --git a/lib/Android.mk b/lib/Android.mk index 5709aecc..6f444a08 100644 --- a/lib/Android.mk +++ b/lib/Android.mk @@ -2,27 +2,6 @@ LOCAL_PATH := $(call my-dir) GPU_TOOLS_PATH := $(LOCAL_PATH)/.. -.PHONY: version.h.tmp - -$(GPU_TOOLS_PATH)/version.h.tmp: - @touch $@ - @if test -d ../.git; then \ - if which git > /dev/null; then git log -n 1 --oneline | \ - sed 's/^\([^ ]*\) .*/#define IGT_GIT_SHA1 "g\1"/' \ - >> $@ ; \ - fi \ - else \ - echo '#define IGT_GIT_SHA1 "NOT-GIT"' >> $@ ; \ - fi - -$(GPU_TOOLS_PATH)/version.h: $(GPU_TOOLS_PATH)/version.h.tmp - @echo "updating version.h" - @if ! cmp -s $(GPU_TOOLS_PATH)/version.h.tmp $(GPU_TOOLS_PATH)/version.h; then \ - mv $(GPU_TOOLS_PATH)/version.h.tmp $(GPU_TOOLS_PATH)/version.h ; \ - else \ - rm $(GPU_TOOLS_PATH)/version.h.tmp ; \ - fi - # FIXME: autogenerate this info # $(GPU_TOOLS_PATH)/config.h: @echo "updating config.h" @@ -34,7 +13,7 @@ include $(LOCAL_PATH)/Makefile.sources include $(CLEAR_VARS) LOCAL_GENERATED_SOURCES := \ - $(GPU_TOOLS_PATH)/version.h \ + $(GPU_TOOLS_PATH)/lib/version.h \ $(GPU_TOOLS_PATH)/config.h LOCAL_C_INCLUDES += \ |