flywithu/ntel-gpu-tools
1
0
Fork 0
mirror of https://github.com/tiagovignatti/intel-gpu-tools.git synced 2025-06-10 17:36:11 +00:00
Code Issues Releases Wiki Activity

build: Don't use automake's conditional in a Makefile.sources

Browse Source 
I just remembered that those Makefile.sources files where also
included by the Android build system, so we can't use automake's
conditionals in there.

So, we want to use GNU make's one. Unfortunately, after all those years,
GNU automake still doesn't do anything useful with GNU make's ifeq:

  lib/Makefile.sources:66: error: else without if

automake will helpfully signal that the 'else' corresponding to the
'ifeq' doesn't have a corresponding 'if'. Well, yeah, thanks.

Fortunately, we can work around this by cunningly inserting a space
before 'ifeq', 'else' and 'endif' and fool automake's regex-based
checks.

Signed-off-by: Damien Lespiau <damien.lespiau@intel.com>
This commit is contained in:
Damien Lespiau 2015-07-02 14:59:25 +01:00
parent 64295c67e9
commit ec9e5996d1
2 changed files with 5 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
configure.ac
View File

@ -217,7 +217,7 @@ AC_ARG_ENABLE(git-hash,
AS_HELP_STRING([--disable-git-hash],
[Do not use git hash in version]),
[git_hash=$enableval], [git_hash=yes])
AM_CONDITIONAL(SKIP_GIT_HASH, [test "x$git_hash" = xno])
AC_SUBST(GIT_HASH, [$git_hash])
# -----------------------------------------------------------------------------

7
lib/Makefile.sources
View File

@ -60,10 +60,11 @@ libintel_tools_la_SOURCES = \
.PHONY: version.h.tmp
if SKIP_GIT_HASH
# leaving a space here to work around automake's conditionals
ifeq ($(GIT_HASH),no)
$(IGT_LIB_PATH)/version.h.tmp:
@echo '#define IGT_GIT_SHA1 "git"' >> $@
else
else
$(IGT_LIB_PATH)/version.h.tmp:
@touch $@
@if test -d $(GPU_TOOLS_PATH)/.git; then \
@ -77,7 +78,7 @@ $(IGT_LIB_PATH)/version.h.tmp:
else \
echo '#define IGT_GIT_SHA1 "NOT-GIT"' ; \
fi >> $@
endif # SKIP_GIT_HASH
endif # GIT_HASH
$(IGT_LIB_PATH)/version.h: $(IGT_LIB_PATH)/version.h.tmp