From patchwork Mon Nov 2 18:21:48 2009 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Stefan Weil X-Patchwork-Id: 37446 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from lists.gnu.org (lists.gnu.org [199.232.76.165]) (using TLSv1 with cipher DHE-RSA-AES256-SHA (256/256 bits)) (Client did not present a certificate) by ozlabs.org (Postfix) with ESMTPS id 1DFFCB7C14 for ; Tue, 3 Nov 2009 05:25:03 +1100 (EST) Received: from localhost ([127.0.0.1]:56655 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1N51aO-0002mt-5j for incoming@patchwork.ozlabs.org; Mon, 02 Nov 2009 13:25:00 -0500 Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43) id 1N51XQ-0001pj-Hn for qemu-devel@nongnu.org; Mon, 02 Nov 2009 13:21:56 -0500 Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43) id 1N51XL-0001n9-IG for qemu-devel@nongnu.org; Mon, 02 Nov 2009 13:21:55 -0500 Received: from [199.232.76.173] (port=47969 helo=monty-python.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1N51XL-0001mp-9X for qemu-devel@nongnu.org; Mon, 02 Nov 2009 13:21:51 -0500 Received: from moutng.kundenserver.de ([212.227.17.10]:59871) by monty-python.gnu.org with esmtp (Exim 4.60) (envelope-from ) id 1N51XK-0006Bh-OK for qemu-devel@nongnu.org; Mon, 02 Nov 2009 13:21:51 -0500 Received: from flocke.weilnetz.de (p54ADEE01.dip.t-dialin.net [84.173.238.1]) by mrelayeu.kundenserver.de (node=mrbap1) with ESMTP (Nemesis) id 0Lr48R-1MZYKc0xdr-00e6tx; Mon, 02 Nov 2009 19:21:49 +0100 Received: from stefan by flocke.weilnetz.de with local (Exim 4.69) (envelope-from ) id 1N51XI-0005zl-E9; Mon, 02 Nov 2009 19:21:48 +0100 From: Stefan Weil To: QEMU Developers Date: Mon, 2 Nov 2009 19:21:48 +0100 Message-Id: <1257186108-23012-1-git-send-email-weil@mail.berlios.de> X-Mailer: git-send-email 1.5.6.5 In-Reply-To: <1256841601-4964-1-git-send-email-uril@redhat.com> References: <1256841601-4964-1-git-send-email-uril@redhat.com> X-Provags-ID: V01U2FsdGVkX1+HzF1f/aEp4H15bp0mnsI1gvIYBu/J20VNFYO 8gLwDwcxJV0BPWCMAHlAZc61XT2EpRq7xY5FbkXnlZkDCVggjb 0FJdDjj60TRnN6cJaj7bZejs/3qnTh1TfkxR24DI4s6vG/K2RC eWQ== X-detected-operating-system: by monty-python.gnu.org: Genre and OS details not recognized. Cc: Subject: [Qemu-devel] [PATCH] Makefile: Fix problems in parallel builds X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: qemu-devel.nongnu.org List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org 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)