diff options
| author | Tim Gore <tim.gore@intel.com> | 2014-07-24 17:38:22 +0100 |
|---|---|---|
| committer | Thomas Wood <thomas.wood@intel.com> | 2014-07-25 14:46:51 +0100 |
| commit | 57bd86068a319b218796d0bea92258b44ee143a0 (patch) | |
| tree | c37f9322d2f0432671f1556271bcf51fc4eacad0 | |
| parent | 8408e00e623b52f18ad0795122593741197fa2f4 (diff) | |
intel-gpu-tools: fix version.h creation in android
commit 743dc7997aa9f5210055896940d87c88983dcda6
breaks the build under Android because version.h
is not created. This happens because the android
make executes from the ANDROID_BUILD_TOP directory
rather than from the directory containing the source
files, so we need to differentiate between Android
and linux builds. This is V2 of this patch based on
Thomas Wood's suggestion.
Signed-off-by: Tim Gore <tim.gore@intel.com>
[Thomas: Fix distcheck issues]
Signed-off-by: Thomas Wood <thomas.wood@intel.com>
| -rw-r--r-- | lib/Android.mk | 3 | ||||
| -rw-r--r-- | lib/Makefile.am | 3 | ||||
| -rw-r--r-- | lib/Makefile.sources | 24 |
3 files changed, 18 insertions, 12 deletions
diff --git a/lib/Android.mk b/lib/Android.mk index 6f444a08b..5739c80ab 100644 --- a/lib/Android.mk +++ b/lib/Android.mk @@ -1,6 +1,7 @@ LOCAL_PATH := $(call my-dir) GPU_TOOLS_PATH := $(LOCAL_PATH)/.. +IGT_LIB_PATH := $(LOCAL_PATH) # FIXME: autogenerate this info # $(GPU_TOOLS_PATH)/config.h: @@ -13,7 +14,7 @@ include $(LOCAL_PATH)/Makefile.sources include $(CLEAR_VARS) LOCAL_GENERATED_SOURCES := \ - $(GPU_TOOLS_PATH)/lib/version.h \ + $(IGT_LIB_PATH)/version.h \ $(GPU_TOOLS_PATH)/config.h LOCAL_C_INCLUDES += \ diff --git a/lib/Makefile.am b/lib/Makefile.am index 4d4efe48a..e8e04a25f 100644 --- a/lib/Makefile.am +++ b/lib/Makefile.am @@ -1,3 +1,6 @@ +IGT_LIB_PATH := $(builddir) +GPU_TOOLS_PATH := $(top_srcdir) + include Makefile.sources noinst_LTLIBRARIES = libintel_tools.la diff --git a/lib/Makefile.sources b/lib/Makefile.sources index 2d971c5ac..aa9a130e5 100644 --- a/lib/Makefile.sources +++ b/lib/Makefile.sources @@ -48,12 +48,14 @@ libintel_tools_la_SOURCES = \ $(NULL) .PHONY: version.h.tmp -version.h.tmp: + +$(IGT_LIB_PATH)/version.h.tmp: @touch $@ - @if test -d $(top_srcdir)/.git; then \ - if which git > /dev/null 2>&1; then git log -n 1 --oneline | \ + @if test -d $(GPU_TOOLS_PATH)/.git; then \ + if which git > /dev/null 2>&1; then cd $(@D); \ + git log -n 1 --oneline | \ sed 's/^\([^ ]*\) .*/#define IGT_GIT_SHA1 "g\1"/' \ - >> $@ ; \ + >> $(@F) ; \ else \ echo '#define IGT_GIT_SHA1 "NO-GIT"' >> $@ ; \ fi \ @@ -61,14 +63,14 @@ version.h.tmp: echo '#define IGT_GIT_SHA1 "NOT-GIT"' >> $@ ; \ fi -version.h: version.h.tmp - @if ! cmp -s version.h.tmp version.h; then \ - echo "updating version.h"; \ - mv version.h.tmp version.h ;\ + +$(IGT_LIB_PATH)/version.h: $(IGT_LIB_PATH)/version.h.tmp + @if ! cmp -s $(IGT_LIB_PATH)/version.h.tmp $(IGT_LIB_PATH)/version.h; then \ + mv $(IGT_LIB_PATH)/version.h.tmp $(IGT_LIB_PATH)/version.h ; \ else \ - rm version.h.tmp ;\ + rm $(IGT_LIB_PATH)/version.h.tmp ; \ fi -BUILT_SOURCES = version.h -CLEANFILES = version.h version.h.tmp +BUILT_SOURCES = $(IGT_LIB_PATH)/version.h +CLEANFILES = $(IGT_LIB_PATH)/version.h $(IGT_LIB_PATH)/version.h.tmp |