[Xen-changelog] [xen-unstable] tools/vtpm: fix tpm_version.h error during parallel build

[Xen patchbot-unstable <patchbot@xxxxxxx>]

# HG changeset patch
# User Olaf Hering <olaf@xxxxxxxxx>
# Date 1343984047 -3600
# Node ID d153e1abe5b665b88737fed35ca46be6555a27e0
# Parent  428014e272914d21cb2fc63a651a556543242a7d
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 <olaf@xxxxxxxxx>
Acked-by: Ian Campbell <ian.campbell@xxxxxxxxxx>
Committed-by: Ian Campbell <ian.campbell@xxxxxxxxxx>
---


diff -r 428014e27291 -r d153e1abe5b6 tools/vtpm/Makefile
--- a/tools/vtpm/Makefile       Fri Aug 03 09:54:06 2012 +0100
+++ b/tools/vtpm/Makefile       Fri Aug 03 09:54:07 2012 +0100
@@ -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

_______________________________________________
Xen-changelog mailing list
Xen-changelog@xxxxxxxxxxxxx
http://lists.xensource.com/xen-changelog