From mboxrd@z Thu Jan 1 00:00:00 1970 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) Sender: Paolo Bonzini From: Paolo Bonzini Date: Tue, 16 Apr 2013 10:50:38 +0200 Message-Id: <1366102238-12374-1-git-send-email-pbonzini@redhat.com> Subject: [Qemu-devel] [PATCH build-breakage] build: include config-{, all-}devices.mak after defining CONFIG_SOFTMMU and CONFIG_USER_ONLY List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org Cc: armbru@redhat.com 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 --- 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)) -- 1.8.1.4