From patchwork Tue Apr 16 08:50:38 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Paolo Bonzini X-Patchwork-Id: 236865 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 84E042C0108 for ; Tue, 16 Apr 2013 18:51:48 +1000 (EST) Received: from localhost ([::1]:44747 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1US1cA-00036u-Qh for incoming@patchwork.ozlabs.org; Tue, 16 Apr 2013 04:51:46 -0400 Received: from eggs.gnu.org ([208.118.235.92]:35146) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1US1br-00036V-QC for qemu-devel@nongnu.org; Tue, 16 Apr 2013 04:51:32 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1US1bn-0006En-5W for qemu-devel@nongnu.org; Tue, 16 Apr 2013 04:51:27 -0400 Received: from mail-bk0-x229.google.com ([2a00:1450:4008:c01::229]:33416) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1US1bm-0006Ed-UY for qemu-devel@nongnu.org; Tue, 16 Apr 2013 04:51:23 -0400 Received: by mail-bk0-f41.google.com with SMTP id i18so126515bkv.0 for ; Tue, 16 Apr 2013 01:51:22 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=x-received:sender:from:to:cc:subject:date:message-id:x-mailer; bh=SSxzqtThnUJuZRVxHJ+7S375OllXZRw4Zm+Y0sdZyVA=; b=paYJNc6baan7uWfs4d/KTcuCh0dfDqCymR9vN8kbHAKwC4I5YRGr92P5bPVX3KACXZ EmlcPXZijGxrX+OxZao0vIVHwyWuibAtbptyqV/MlLgdCCaiijI5iE+4pSR39GDBp54q 6qoCEACDkJgYtQuWbjdCU+svTrTbm3Mgi+xcN9fvUJfCsA1ryNh4NhYWIrwuAZRv7JxN ABZK/nvEYmygx03ZjDgFSkmpuelzgZYulJUZVl3XvGygDttxz5qMSrttH4QMAK/+14ND /04ATUJG5pBIl65LORxBa8Sz8f93lncFuP8HgchrfKlC8Yw5SyY2kzcPif7ABUjmHJ3y Y38w== X-Received: by 10.204.235.199 with SMTP id kh7mr356309bkb.107.1366102281963; Tue, 16 Apr 2013 01:51:21 -0700 (PDT) Received: from playground.lan (93-34-176-20.ip50.fastwebnet.it. [93.34.176.20]) by mx.google.com with ESMTPS id iy11sm317391bkb.11.2013.04.16.01.51.18 (version=TLSv1.2 cipher=RC4-SHA bits=128/128); Tue, 16 Apr 2013 01:51:20 -0700 (PDT) From: Paolo Bonzini To: qemu-devel@nongnu.org Date: Tue, 16 Apr 2013 10:50:38 +0200 Message-Id: <1366102238-12374-1-git-send-email-pbonzini@redhat.com> X-Mailer: git-send-email 1.8.1.4 X-detected-operating-system: by eggs.gnu.org: Error: Malformed IPv6 address (bad octet value). X-Received-From: 2a00:1450:4008:c01::229 Cc: armbru@redhat.com Subject: [Qemu-devel] [PATCH build-breakage] build: include config-{, all-}devices.mak after defining CONFIG_SOFTMMU and CONFIG_USER_ONLY 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 Moving the inclusions closer to Makefile, and before rules.mak, makes Makefile and Makefile.target more consistent with each other. Signed-off-by: Paolo Bonzini Tested-by: Markus Armbruster --- Makefile | 12 ++++++------ Makefile.target | 2 +- 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/Makefile b/Makefile index 67f19f2..516ccbb 100644 --- a/Makefile +++ b/Makefile @@ -19,6 +19,12 @@ seems to have been used for an in-tree build. You can fix this by running \ endif endif +CONFIG_SOFTMMU := $(if $(filter %-softmmu,$(TARGET_DIRS)),y) +CONFIG_USER_ONLY := $(if $(filter %-user,$(TARGET_DIRS)),y) +CONFIG_ALL=y +-include config-all-devices.mak +-include config-all-disas.mak + include $(SRC_PATH)/rules.mak config-host.mak: $(SRC_PATH)/configure @echo $@ is out-of-date, running configure @@ -107,12 +113,6 @@ endif defconfig: rm -f config-all-devices.mak $(SUBDIR_DEVICES_MAK) --include config-all-devices.mak --include config-all-disas.mak -CONFIG_SOFTMMU := $(if $(filter %-softmmu,$(TARGET_DIRS)),y) -CONFIG_USER_ONLY := $(if $(filter %-user,$(TARGET_DIRS)),y) -CONFIG_ALL=y - ifneq ($(wildcard config-host.mak),) include $(SRC_PATH)/Makefile.objs include $(SRC_PATH)/tests/Makefile diff --git a/Makefile.target b/Makefile.target index 2bd6d14..121bcdc 100644 --- a/Makefile.target +++ b/Makefile.target @@ -1,8 +1,8 @@ # -*- Mode: makefile -*- include ../config-host.mak -include config-devices.mak include config-target.mak +include config-devices.mak include $(SRC_PATH)/rules.mak $(call set-vpath, $(SRC_PATH))