Revision 00082344

b/Makefile
103 103

  
104 104
-include config-all-devices.mak
105 105
-include config-all-disas.mak
106
CONFIG_SOFTMMU := $(if $(filter %-softmmu,$(TARGET_DIRS)),y)
107
CONFIG_USER_ONLY := $(if $(filter %-user,$(TARGET_DIRS)),y)
106 108

  
107 109
ifneq ($(wildcard config-host.mak),)
108 110
include $(SRC_PATH)/Makefile.objs
......
133 135
$(SRC_PATH)/pixman/configure:
134 136
	(cd $(SRC_PATH)/pixman; autoreconf -v --install)
135 137

  
136
$(SUBDIR_RULES): libqemuutil.a libqemustub.a
137

  
138
$(filter %-softmmu,$(SUBDIR_RULES)): $(universal-obj-y) $(common-obj-y) $(extra-obj-y)
139

  
140
$(filter %-user,$(SUBDIR_RULES)): $(universal-obj-y) $(user-obj-y)
138
$(SUBDIR_RULES): libqemuutil.a libqemustub.a $(common-obj-y) $(extra-obj-y)
141 139

  
142 140
ROMSUBDIR_RULES=$(patsubst %,romsubdir-%, $(ROMS))
143 141
romsubdir-%:
b/Makefile.objs
47 47
# suppress *all* target specific code in case of system emulation, i.e. a
48 48
# single QEMU executable should support all CPUs and machines.
49 49

  
50
ifeq ($(CONFIG_SOFTMMU),y)
50 51
common-obj-y = $(block-obj-y) blockdev.o blockdev-nbd.o block/
51 52
common-obj-y += net/
52 53
common-obj-y += readline.o
......
89 90

  
90 91
common-obj-y += qmp-marshal.o qapi-visit.o qapi-types.o
91 92
common-obj-y += qmp.o hmp.o
93
endif
92 94

  
93 95
#######################################################################
94 96
# Target-independent parts used in system and user emulation
95
universal-obj-y =
96
universal-obj-y += qemu-log.o
97
universal-obj-y += tcg-runtime.o
98
universal-obj-y += hw/
99
universal-obj-y += qom/
100
universal-obj-y += disas/
97
common-obj-y += qemu-log.o
98
common-obj-y += tcg-runtime.o
99
common-obj-y += hw/
100
common-obj-y += qom/
101
common-obj-y += disas/
101 102

  
102 103
######################################################################
103 104
# guest agent
......
118 119
	qga-obj-y \
119 120
	block-obj-y \
120 121
	common-obj-y \
121
	universal-obj-y \
122 122
	extra-obj-y
123 123
dummy := $(call unnest-vars)
b/Makefile.target
145 145
include $(SRC_PATH)/Makefile.objs
146 146

  
147 147
all-obj-y = $(obj-y)
148
all-obj-y += $(addprefix ../, $(universal-obj-y))
149
all-obj-$(CONFIG_SOFTMMU) += $(addprefix ../, $(common-obj-y))
148
all-obj-y += $(addprefix ../, $(common-obj-y))
150 149

  
151 150
ifdef QEMU_PROGW
152 151
# The linker builds a windows executable. Make also a console executable.
b/disas/Makefile.objs
1
universal-obj-$(CONFIG_ALPHA_DIS) += alpha.o
2
universal-obj-$(CONFIG_ARM_DIS) += arm.o
3
universal-obj-$(CONFIG_CRIS_DIS) += cris.o
4
universal-obj-$(CONFIG_HPPA_DIS) += hppa.o
5
universal-obj-$(CONFIG_I386_DIS) += i386.o
6
universal-obj-$(CONFIG_IA64_DIS) += ia64.o
7
universal-obj-$(CONFIG_M68K_DIS) += m68k.o
8
universal-obj-$(CONFIG_MICROBLAZE_DIS) += microblaze.o
9
universal-obj-$(CONFIG_MIPS_DIS) += mips.o
10
universal-obj-$(CONFIG_PPC_DIS) += ppc.o
11
universal-obj-$(CONFIG_S390_DIS) += s390.o
12
universal-obj-$(CONFIG_SH4_DIS) += sh4.o
13
universal-obj-$(CONFIG_SPARC_DIS) += sparc.o
14
universal-obj-$(CONFIG_LM32_DIS) += lm32.o
1
common-obj-$(CONFIG_ALPHA_DIS) += alpha.o
2
common-obj-$(CONFIG_ARM_DIS) += arm.o
3
common-obj-$(CONFIG_CRIS_DIS) += cris.o
4
common-obj-$(CONFIG_HPPA_DIS) += hppa.o
5
common-obj-$(CONFIG_I386_DIS) += i386.o
6
common-obj-$(CONFIG_IA64_DIS) += ia64.o
7
common-obj-$(CONFIG_M68K_DIS) += m68k.o
8
common-obj-$(CONFIG_MICROBLAZE_DIS) += microblaze.o
9
common-obj-$(CONFIG_MIPS_DIS) += mips.o
10
common-obj-$(CONFIG_PPC_DIS) += ppc.o
11
common-obj-$(CONFIG_S390_DIS) += s390.o
12
common-obj-$(CONFIG_SH4_DIS) += sh4.o
13
common-obj-$(CONFIG_SPARC_DIS) += sparc.o
14
common-obj-$(CONFIG_LM32_DIS) += lm32.o
15 15

  
16 16
# TODO: As long as the TCG interpreter and its generated code depend
17 17
# on the QEMU target, we cannot compile the disassembler here.
18
#universal-obj-$(CONFIG_TCI_DIS) += tci.o
18
#common-obj-$(CONFIG_TCI_DIS) += tci.o
b/hw/Makefile.objs
1 1
# core qdev-related obj files, also used by *-user:
2
universal-obj-y += qdev.o qdev-properties.o
2
common-obj-y += qdev.o qdev-properties.o
3 3
# irq.o needed for qdev GPIO handling:
4
universal-obj-y += irq.o
4
common-obj-y += irq.o
5 5

  
6
common-obj-y = usb/ ide/ pci/
6
ifeq ($(CONFIG_SOFTMMU),y)
7
common-obj-y += usb/ ide/ pci/
7 8
common-obj-y += loader.o
8 9
common-obj-$(CONFIG_VIRTIO) += virtio-console.o
9 10
common-obj-$(CONFIG_VIRTIO) += virtio-rng.o
......
217 218
endif
218 219

  
219 220
$(obj)/baum.o: QEMU_CFLAGS += $(SDL_CFLAGS) 
221
endif
b/qom/Makefile.objs
1
universal-obj-y = object.o container.o qom-qobject.o
2
universal-obj-y += cpu.o
1
common-obj-y = object.o container.o qom-qobject.o
2
common-obj-y += cpu.o

Also available in: Unified diff