Revision f3aa844b

b/Makefile
19 19
endif
20 20
endif
21 21

  
22
CONFIG_SOFTMMU := $(if $(filter %-softmmu,$(TARGET_DIRS)),y)
23
CONFIG_USER_ONLY := $(if $(filter %-user,$(TARGET_DIRS)),y)
24
CONFIG_ALL=y
25
-include config-all-devices.mak
26
-include config-all-disas.mak
27

  
22 28
include $(SRC_PATH)/rules.mak
23 29
config-host.mak: $(SRC_PATH)/configure
24 30
	@echo $@ is out-of-date, running configure
......
107 113
defconfig:
108 114
	rm -f config-all-devices.mak $(SUBDIR_DEVICES_MAK)
109 115

  
110
-include config-all-devices.mak
111
-include config-all-disas.mak
112
CONFIG_SOFTMMU := $(if $(filter %-softmmu,$(TARGET_DIRS)),y)
113
CONFIG_USER_ONLY := $(if $(filter %-user,$(TARGET_DIRS)),y)
114
CONFIG_ALL=y
115

  
116 116
ifneq ($(wildcard config-host.mak),)
117 117
include $(SRC_PATH)/Makefile.objs
118 118
include $(SRC_PATH)/tests/Makefile
b/Makefile.target
1 1
# -*- Mode: makefile -*-
2 2

  
3 3
include ../config-host.mak
4
include config-devices.mak
5 4
include config-target.mak
5
include config-devices.mak
6 6
include $(SRC_PATH)/rules.mak
7 7

  
8 8
$(call set-vpath, $(SRC_PATH))

Also available in: Unified diff