From mboxrd@z Thu Jan  1 00:00:00 1970
Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43)
	id 1N5mLY-0005nl-S3
	for qemu-devel@nongnu.org; Wed, 04 Nov 2009 15:20:48 -0500
Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43)
	id 1N5mLT-0005k2-Tg
	for qemu-devel@nongnu.org; Wed, 04 Nov 2009 15:20:48 -0500
Received: from [199.232.76.173] (port=51104 helo=monty-python.gnu.org)
	by lists.gnu.org with esmtp (Exim 4.43) id 1N5mLT-0005ju-KR
	for qemu-devel@nongnu.org; Wed, 04 Nov 2009 15:20:43 -0500
Received: from nan.false.org ([208.75.86.248]:37773)
	by monty-python.gnu.org with esmtp (Exim 4.60)
	(envelope-from <drow@false.org>) id 1N5mLT-0000lq-Ab
	for qemu-devel@nongnu.org; Wed, 04 Nov 2009 15:20:43 -0500
From: Daniel Jacobowitz <drow@false.org>
Date: Wed,  4 Nov 2009 15:20:09 -0500
Message-Id: <1257366009-7057-1-git-send-email-drow@false.org>
Subject: [Qemu-devel] [PATCH] Fix a parallel build failure.
List-Id: qemu-devel.nongnu.org
List-Unsubscribe: <http://lists.nongnu.org/mailman/listinfo/qemu-devel>,
	<mailto:qemu-devel-request@nongnu.org?subject=unsubscribe>
List-Archive: <http://lists.gnu.org/pipermail/qemu-devel>
List-Post: <mailto:qemu-devel@nongnu.org>
List-Help: <mailto:qemu-devel-request@nongnu.org?subject=help>
List-Subscribe: <http://lists.nongnu.org/mailman/listinfo/qemu-devel>,
	<mailto:qemu-devel-request@nongnu.org?subject=subscribe>
To: qemu-devel@nongnu.org
Cc: Daniel Jacobowitz <dan@codesourcery.com>

From: Daniel Jacobowitz <dan@codesourcery.com>

With enough parallelism, make will run all the dependencies of
build-all at the same time:

build-all: config-host.h config-all-devices.h $(DOCS) $(TOOLS)

So some of the $(TOOLS) will build before config-host.h is finished.
The object files need to depend on it explicitly.  Subdirectories are
OK since they are started from the body of build-all, not its
dependencies.

Signed-off-by: Daniel Jacobowitz <dan@codesourcery.com>
---
 Makefile  |    2 ++
 rules.mak |    2 +-
 2 files changed, 3 insertions(+), 1 deletions(-)

diff --git a/Makefile b/Makefile
index c783aa4..ed9a420 100644
--- a/Makefile
+++ b/Makefile
@@ -1,5 +1,7 @@
 # Makefile for QEMU.
 
+GENERATED_HEADERS = config-host.h config-all-devices.h
+
 ifneq ($(wildcard config-host.mak),)
 # Put the all: rule here so that config-host.mak can contain dependencies.
 all: build-all
diff --git a/rules.mak b/rules.mak
index 5d7e8bb..4eb1f90 100644
--- a/rules.mak
+++ b/rules.mak
@@ -13,7 +13,7 @@ MAKEFLAGS += -rR
 
 QEMU_CFLAGS += -MMD -MP -MT $@
 
-%.o: %.c
+%.o: %.c $(GENERATED_HEADERS)
 	$(call quiet-command,$(CC) $(QEMU_CFLAGS) $(CFLAGS) -c -o $@ $<,"  CC    $(TARGET_DIR)$@")
 
 %.o: %.S
-- 
1.6.5.2