From patchwork Mon Nov 2 18:21:48 2009 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: Makefile: Fix problems in parallel builds Date: Mon, 02 Nov 2009 08:21:48 -0000 From: Stefan Weil X-Patchwork-Id: 37446 Message-Id: <1257186108-23012-1-git-send-email-weil@mail.berlios.de> To: QEMU Developers Cc: The build-all rule used to call make recursively to avoid problems with a wrong build order in parallel makes (config-host.h was sometimes built too late). Most object files depend on config-host.h, so adding the missing prerequisites now allows to avoid recursive calls of make and to simplify the rule for build-all. A similar patch from Uri Lublin which fixed the rule for qemu-img.o is no longer needed. Signed-off-by: Stefan Weil --- Makefile | 6 ++++-- 1 files changed, 4 insertions(+), 2 deletions(-) diff --git a/Makefile b/Makefile index c78d9ea..ae3532f 100644 --- a/Makefile +++ b/Makefile @@ -40,8 +40,7 @@ config-all-devices.mak: $(SUBDIR_DEVICES_MAK) -include config-all-devices.mak -build-all: config-host.h config-all-devices.h $(DOCS) $(TOOLS) - $(call quiet-command, $(MAKE) $(SUBDIR_MAKEFLAGS) recurse-all,) +build-all: $(DOCS) $(TOOLS) recurse-all config-host.h: config-host.h-timestamp config-host.h-timestamp: config-host.mak @@ -207,9 +206,12 @@ bt-host.o: QEMU_CFLAGS += $(BLUEZ_CFLAGS) libqemu_common.a: $(obj-y) +$(obj-y): config-host.h + ###################################################################### qemu-img.o: qemu-img-cmds.h +qemu-img.o qemu-nbd.o qemu-io.o: config-host.h qemu-img$(EXESUF): qemu-img.o qemu-tool.o $(block-obj-y)