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>

.gitignore

@@ -84,7 +84,6 @@ cscope.*
 TAGS
 build-aux/
 __pycache__
-version.h
 
 gtk-doc.make
 gtk-doc.m4

Makefile.am

@@ -37,29 +37,6 @@ endif
 
 MAINTAINERCLEANFILES = ChangeLog INSTALL
 
-.PHONY: version.h.tmp
-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
-
-version.h: version.h.tmp
-	@echo "updating version.h"
-	@if ! cmp -s version.h.tmp version.h; then \
-		mv version.h.tmp version.h ;\
-	else \
-		rm version.h.tmp ;\
-	fi
-
-BUILT_SOURCES = version.h
-CLEANFILES = version.h version.h.tmp
-
 .PHONY: ChangeLog INSTALL
 
 INSTALL:

lib/.gitignore

@@ -0,0 +1 @@
+version.h

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 +=              \

lib/Makefile.sources

@@ -47,3 +47,28 @@ libintel_tools_la_SOURCES = 	\
 	igt_core.h		\
 	$(NULL)
 
+.PHONY: version.h.tmp
+version.h.tmp:
+	@touch $@
+	@if test -d $(top_srcdir)/.git; then \
+		if which git > /dev/null 2>&1; then git log -n 1 --oneline | \
+			sed 's/^\([^ ]*\) .*/#define IGT_GIT_SHA1 "g\1"/' \
+			>> $@ ; \
+		else \
+			echo '#define IGT_GIT_SHA1 "NO-GIT"' >> $@ ; \
+		fi \
+	else \
+		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 ;\
+	else \
+		rm version.h.tmp ;\
+	fi
+
+BUILT_SOURCES = version.h
+CLEANFILES = version.h version.h.tmp
+

lib/igt_aux.c

@@ -52,7 +52,6 @@
 #include "intel_chipset.h"
 #include "igt_aux.h"
 #include "igt_debugfs.h"
-#include "version.h"
 #include "config.h"
 #include "intel_reg.h"
 #include "ioctl_wrappers.h"

lib/ioctl_wrappers.c

@@ -54,7 +54,6 @@
 #include "intel_chipset.h"
 #include "intel_io.h"
 #include "igt_debugfs.h"
-#include "version.h"
 #include "config.h"
 
 #include "ioctl_wrappers.h"

tests/Makefile.am

@@ -36,7 +36,6 @@ AM_CFLAGS = $(DRM_CFLAGS) $(CWARNFLAGS) \
 	-I$(srcdir)/.. \
 	-I$(srcdir)/../lib \
 	-include "$(srcdir)/../lib/check-ndebug.h" \
-	-include "$(top_builddir)/version.h" \
 	-DIGT_DATADIR=\""$(abs_srcdir)"\" \
 	$(NULL)