From patchwork Tue Mar 6 18:50:38 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?q?Llu=C3=ADs_Vilanova?= X-Patchwork-Id: 144983 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from lists.gnu.org (lists.gnu.org [208.118.235.17]) (using TLSv1 with cipher AES256-SHA (256/256 bits)) (Client did not present a certificate) by ozlabs.org (Postfix) with ESMTPS id CED48B6F62 for ; Wed, 7 Mar 2012 05:51:53 +1100 (EST) Received: from localhost ([::1]:59000 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1S4zUF-0006e2-N4 for incoming@patchwork.ozlabs.org; Tue, 06 Mar 2012 13:51:51 -0500 Received: from eggs.gnu.org ([208.118.235.92]:57872) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1S4zU3-0006c6-1k for qemu-devel@nongnu.org; Tue, 06 Mar 2012 13:51:44 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1S4zTw-0000YT-CB for qemu-devel@nongnu.org; Tue, 06 Mar 2012 13:51:38 -0500 Received: from roura.ac.upc.es ([147.83.33.10]:51584) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1S4zTw-0000Xy-1l for qemu-devel@nongnu.org; Tue, 06 Mar 2012 13:51:32 -0500 Received: from gw.ac.upc.edu (gw.ac.upc.es [147.83.30.3]) by roura.ac.upc.es (8.13.8/8.13.8) with ESMTP id q26IpS6G024566 for ; Tue, 6 Mar 2012 19:51:28 +0100 Received: from localhost (unknown [84.88.53.92]) by gw.ac.upc.edu (Postfix) with ESMTP id 0ACB32D0017 for ; Tue, 6 Mar 2012 19:51:28 +0100 (CET) To: qemu-devel@nongnu.org From: =?utf-8?b?TGx1w61z?= Vilanova Date: Tue, 06 Mar 2012 19:50:38 +0100 Message-ID: <20120306185038.16122.2427.stgit@ginnungagap.bsc.es> User-Agent: StGit/0.16 MIME-Version: 1.0 X-MIME-Autoconverted: from 8bit to quoted-printable by roura.ac.upc.es id q26IpS6G024566 X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.6 (newer, 3) X-Received-From: 147.83.33.10 Subject: [Qemu-devel] [PATCH] build: Include config-host.mak as soon as possible 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 Current code depends on variables defined in config-host.mak before it is actually included. Signed-off-by: Lluís Vilanova Cc: Anthony Liguori Cc: Paul Brook Reviewed-by: Peter Maydell --- Makefile | 15 ++++++++------- 1 files changed, 8 insertions(+), 7 deletions(-) diff --git a/Makefile b/Makefile index 49c775b..408065e 100644 --- a/Makefile +++ b/Makefile @@ -3,13 +3,7 @@ # Always point to the root of the build tree (needs GNU make). BUILD_DIR=$(CURDIR) -GENERATED_HEADERS = config-host.h trace.h qemu-options.def -ifeq ($(TRACE_BACKEND),dtrace) -GENERATED_HEADERS += trace-dtrace.h -endif -GENERATED_HEADERS += qmp-commands.h qapi-types.h qapi-visit.h -GENERATED_SOURCES += qmp-marshal.c qapi-types.c qapi-visit.c - +# All following code might depend on configuration variables ifneq ($(wildcard config-host.mak),) # Put the all: rule here so that config-host.mak can contain dependencies. all: build-all @@ -24,6 +18,13 @@ config-host.mak: @exit 1 endif +GENERATED_HEADERS = config-host.h trace.h qemu-options.def +ifeq ($(TRACE_BACKEND),dtrace) +GENERATED_HEADERS += trace-dtrace.h +endif +GENERATED_HEADERS += qmp-commands.h qapi-types.h qapi-visit.h +GENERATED_SOURCES += qmp-marshal.c qapi-types.c qapi-visit.c + # Don't try to regenerate Makefile or configure # We don't generate any of them Makefile: ;