Commit 9444e9e6 authored by Paolo Bonzini's avatar Paolo Bonzini

build: consolidate multiple variables into universal-obj-y

The directory descent mechanism, and a less-flat tree both helped
in making some *-obj-y definitions very short.  Many of these
often end up in universal-obj-y, and used to be separate only
because of libuser (which is now part of history...).

Consolidate these variables in a single one.
Signed-off-by: default avatarPaolo Bonzini <pbonzini@redhat.com>
parent a372823a
......@@ -3,23 +3,6 @@
stub-obj-y = stubs/
util-obj-y = util/ qobject/
#######################################################################
# Target-independent parts used in system and user emulation
universal-obj-y =
universal-obj-y += qemu-log.o
#######################################################################
# QOM
qom-obj-y = qom/
universal-obj-y += $(qom-obj-y)
#######################################################################
# Core hw code (qdev core)
hw-core-obj-y += hw/
universal-obj-y += $(hw-core-obj-y)
#######################################################################
# coroutines
coroutine-obj-y = qemu-coroutine.o qemu-coroutine-lock.o qemu-coroutine-io.o
......@@ -62,7 +45,6 @@ endif
common-obj-y = $(block-obj-y) blockdev.o blockdev-nbd.o block/
common-obj-y += net/
common-obj-y += qom/
common-obj-y += readline.o
common-obj-$(CONFIG_WIN32) += os-win32.o
common-obj-$(CONFIG_POSIX) += os-posix.o
......@@ -70,7 +52,6 @@ common-obj-$(CONFIG_POSIX) += os-posix.o
common-obj-$(CONFIG_LINUX) += fsdev/
extra-obj-$(CONFIG_LINUX) += fsdev/
common-obj-y += tcg-runtime.o
common-obj-y += migration.o migration-tcp.o
common-obj-y += qemu-char.o #aio.o
common-obj-y += block-migration.o
......@@ -102,26 +83,11 @@ ifeq ($(CONFIG_SECCOMP),y)
common-obj-y += qemu-seccomp.o
endif
######################################################################
# libuser
user-obj-y =
user-obj-y += tcg-runtime.o
user-obj-y += qom/
######################################################################
# disassemblers
# NOTE: the disassembler code is only needed for debugging
universal-obj-y += disas/
######################################################################
# trace
trace-obj-y += trace/
universal-obj-y += $(trace-obj-y)
######################################################################
# smartcard
......@@ -142,6 +108,15 @@ qapi-obj-y += qapi-types.o qapi-visit.o
common-obj-y += qmp-marshal.o qapi-visit.o qapi-types.o
common-obj-y += qmp.o hmp.o
#######################################################################
# Target-independent parts used in system and user emulation
universal-obj-y =
universal-obj-y += qemu-log.o
universal-obj-y += tcg-runtime.o
universal-obj-y += hw/
universal-obj-y += qom/
universal-obj-y += disas/
universal-obj-y += $(trace-obj-y)
universal-obj-y += $(qapi-obj-y)
######################################################################
......@@ -159,13 +134,10 @@ nested-vars += \
stub-obj-y \
util-obj-y \
qga-obj-y \
qom-obj-y \
qapi-obj-y \
block-obj-y \
user-obj-y \
common-obj-y \
universal-obj-y \
hw-core-obj-y \
extra-obj-y \
trace-obj-y
dummy := $(call unnest-vars)
......@@ -146,12 +146,7 @@ include $(SRC_PATH)/Makefile.objs
all-obj-y = $(obj-y)
all-obj-y += $(addprefix ../, $(universal-obj-y))
ifdef CONFIG_SOFTMMU
all-obj-y += $(addprefix ../, $(common-obj-y))
else
all-obj-y += $(addprefix ../, $(user-obj-y))
endif #CONFIG_LINUX_USER
all-obj-$(CONFIG_SOFTMMU) += $(addprefix ../, $(common-obj-y))
ifdef QEMU_PROGW
# The linker builds a windows executable. Make also a console executable.
......
# core qdev-related obj files, also used by *-user:
hw-core-obj-y += qdev.o qdev-properties.o
universal-obj-y += qdev.o qdev-properties.o
# irq.o needed for qdev GPIO handling:
hw-core-obj-y += irq.o
universal-obj-y += irq.o
common-obj-y = usb/ ide/ pci/
common-obj-y += loader.o
......
qom-obj-y = object.o container.o qom-qobject.o
qom-obj-twice-y = cpu.o
common-obj-y = $(qom-obj-twice-y)
user-obj-y = $(qom-obj-twice-y)
universal-obj-y = object.o container.o qom-qobject.o
universal-obj-y += cpu.o
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment