From 672480c885d135e2f0cc53b6c0c89bedebb9a54a Mon Sep 17 00:00:00 2001 From: Olaf Hering Date: Fri, 3 Aug 2012 09:54:07 +0100 Subject: [PATCH] tools/vtpm: fix tpm_version.h error during parallel build Generating the tpm_version.h is not make -j safe: In file included from ../tpm/tpm_emulator.h:25:0, from ../tpm/tpm_startup.c:18: ../tpm/tpm_version.h:1:0: error: unterminated #ifndef make[5]: *** [tpm_startup.o] Error 1 This happens because make can not know that 'all-recursive' depends on 'version'. Fix this by calling the individual make targets. Doing it this way avoids adding yet another patch to the downloaded source. Signed-off-by: Olaf Hering Acked-by: Ian Campbell Committed-by: Ian Campbell --- tools/vtpm/Makefile | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/tools/vtpm/Makefile b/tools/vtpm/Makefile index c8a5ece6eb..7b3efa51dc 100644 --- a/tools/vtpm/Makefile +++ b/tools/vtpm/Makefile @@ -23,7 +23,7 @@ build: build_sub .PHONY: install install: build - $(MAKE) -C $(VTPM_DIR) $@ + $(MAKE) -C $(VTPM_DIR) install-recursive .PHONY: clean clean: @@ -66,7 +66,8 @@ updatepatches: clean orig .PHONY: build_sub build_sub: $(VTPM_DIR)/tpmd/tpmd set -e; if [ -e $(GMP_HEADER) ]; then \ - $(MAKE) -C $(VTPM_DIR); \ + $(MAKE) -C $(VTPM_DIR) version; \ + $(MAKE) -C $(VTPM_DIR) all-recursive; \ else \ echo "=== Unable to build VTPMs. libgmp could not be found."; \ fi -- 2.30.2