From patchwork Tue Feb 21 14:44:40 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Peter Maydell X-Patchwork-Id: 142306 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from lists.gnu.org (lists.gnu.org [140.186.70.17]) (using TLSv1 with cipher AES256-SHA (256/256 bits)) (Client did not present a certificate) by ozlabs.org (Postfix) with ESMTPS id B3661B6EF3 for ; Wed, 22 Feb 2012 01:45:27 +1100 (EST) Received: from localhost ([::1]:33432 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Rzqy2-0008DJ-IS for incoming@patchwork.ozlabs.org; Tue, 21 Feb 2012 09:45:22 -0500 Received: from eggs.gnu.org ([140.186.70.92]:37500) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Rzqxp-0007p0-05 for qemu-devel@nongnu.org; Tue, 21 Feb 2012 09:45:14 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1Rzqxd-0005e1-TD for qemu-devel@nongnu.org; Tue, 21 Feb 2012 09:45:08 -0500 Received: from mnementh.archaic.org.uk ([81.2.115.146]:50181) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Rzqxd-0005co-Mg; Tue, 21 Feb 2012 09:44:57 -0500 Received: from pm215 by mnementh.archaic.org.uk with local (Exim 4.72) (envelope-from ) id 1RzqxM-0005mN-DM; Tue, 21 Feb 2012 14:44:40 +0000 From: Peter Maydell To: qemu-devel@nongnu.org Date: Tue, 21 Feb 2012 14:44:40 +0000 Message-Id: <1329835480-22192-1-git-send-email-peter.maydell@linaro.org> X-Mailer: git-send-email 1.7.2.5 X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.6 (newer, 2) X-Received-From: 81.2.115.146 Cc: qemu-trivial@nongnu.org, Corey Bryant , =?UTF-8?q?=E9=99=B3=E9=9F=8B=E4=BB=BB?= Subject: [Qemu-devel] [PATCH] Makefile: Add dependency to fix linux-user-only build X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Sender: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Make qemu-bridge-helper explicitly depend on $(GENERATED_HEADERS) so that it doesn't fail to build when we configured for linux-user targets only. (Build breakage introduced in commit 7b93fad.) Signed-off-by: Peter Maydell --- I suspect we could handle generated headers better in our makefile than having to scatter $(GENERATED_HEADERS) dependencies into almost everything (eg "%.o: $(GENERATED_HEADERS)" ??) but this is the minimal fix for the build breakage which we should apply for now I think. Makefile | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diff --git a/Makefile b/Makefile index e66e885..c67493e 100644 --- a/Makefile +++ b/Makefile @@ -159,6 +159,7 @@ qemu-nbd$(EXESUF): qemu-nbd.o $(tools-obj-y) $(block-obj-y) qemu-io$(EXESUF): qemu-io.o cmd.o $(tools-obj-y) $(block-obj-y) qemu-bridge-helper$(EXESUF): qemu-bridge-helper.o +qemu-bridge-helper.o: $(GENERATED_HEADERS) fsdev/virtfs-proxy-helper$(EXESUF): fsdev/virtfs-proxy-helper.o fsdev/virtio-9p-marshal.o oslib-posix.o $(trace-obj-y) fsdev/virtfs-proxy-helper$(EXESUF): LIBS += -lcap