diff options
Diffstat (limited to 'lib')
| -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 6f444a08..5739c80a 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 4d4efe48..e8e04a25 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 2d971c5a..aa9a130e 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 |