From f3aa844bbb2922a5b8393d17620eca7d7e921ab3 Mon Sep 17 00:00:00 2001 From: Paolo Bonzini Date: Tue, 16 Apr 2013 10:50:38 +0200 Subject: build: include config-{, all-}devices.mak after defining CONFIG_SOFTMMU and CONFIG_USER_ONLY 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 Message-id: 1366102238-12374-1-git-send-email-pbonzini@redhat.com Signed-off-by: Anthony Liguori --- Makefile | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) (limited to 'Makefile') diff --git a/Makefile b/Makefile index 88375dcf90..54ef242010 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 -- cgit v1.2.3