david.venhoff/QEMU-Nyx-fork
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

qdev: Include qdev code into *-user, too

Browse Source 
The code depends on some functions from qemu-option.o, so add
qemu-option.o to universal-obj-y to make sure it's included.

Signed-off-by: Eduardo Habkost <ehabkost@redhat.com>
Signed-off-by: Andreas Färber <afaerber@suse.de>
This commit is contained in:
Eduardo Habkost 2012-12-05 14:49:12 -02:00 committed by Andreas Färber
parent 906709a151
commit 507066f8a9
2 changed files with 15 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
Makefile.objs
View File

@ -21,6 +21,13 @@ qom-obj-y = qom/
universal-obj-y += $(qom-obj-y) universal-obj-y += $(qom-obj-y)
#######################################################################
# Core hw code (qdev core)
hw-core-obj-y += hw/
hw-core-obj-y += qemu-option.o
universal-obj-y += $(hw-core-obj-y)
####################################################################### #######################################################################
# oslib-obj-y is code depending on the OS (win32 vs posix) # oslib-obj-y is code depending on the OS (win32 vs posix)
oslib-obj-y = osdep.o cutils.o qemu-timer-common.o oslib-obj-y = osdep.o cutils.o qemu-timer-common.o
@ -182,6 +189,7 @@ nested-vars += \
user-obj-y \ user-obj-y \
common-obj-y \ common-obj-y \
universal-obj-y \ universal-obj-y \
hw-core-obj-y \
extra-obj-y \ extra-obj-y \
trace-obj-y trace-obj-y
dummy := $(call unnest-vars) dummy := $(call unnest-vars)

9
hw/Makefile.objs
View File

@ -1,3 +1,9 @@
# core qdev-related obj files, also used by *-user:
hw-core-obj-y += qdev.o qdev-properties.o
# irq.o needed for qdev GPIO handling:
hw-core-obj-y += irq.o
common-obj-y = usb/ ide/ pci/ common-obj-y = usb/ ide/ pci/
common-obj-y += loader.o common-obj-y += loader.o
common-obj-$(CONFIG_VIRTIO) += virtio-console.o common-obj-$(CONFIG_VIRTIO) += virtio-console.o
@ -154,7 +160,6 @@ common-obj-$(CONFIG_SOUND) += $(sound-obj-y)
common-obj-$(CONFIG_REALLY_VIRTFS) += 9pfs/ common-obj-$(CONFIG_REALLY_VIRTFS) += 9pfs/
common-obj-y += usb/ common-obj-y += usb/
common-obj-y += irq.o
common-obj-$(CONFIG_PTIMER) += ptimer.o common-obj-$(CONFIG_PTIMER) += ptimer.o
common-obj-$(CONFIG_MAX7310) += max7310.o common-obj-$(CONFIG_MAX7310) += max7310.o
common-obj-$(CONFIG_WM8750) += wm8750.o common-obj-$(CONFIG_WM8750) += wm8750.o
@ -180,7 +185,7 @@ common-obj-$(CONFIG_SD) += sd.o
common-obj-y += bt.o bt-l2cap.o bt-sdp.o bt-hci.o bt-hid.o common-obj-y += bt.o bt-l2cap.o bt-sdp.o bt-hci.o bt-hid.o
common-obj-y += bt-hci-csr.o common-obj-y += bt-hci-csr.o
common-obj-y += msmouse.o ps2.o common-obj-y += msmouse.o ps2.o
common-obj-y += qdev.o qdev-properties.o qdev-monitor.o common-obj-y += qdev-monitor.o
common-obj-y += qdev-properties-system.o common-obj-y += qdev-properties-system.o
common-obj-$(CONFIG_BRLAPI) += baum.o common-obj-$(CONFIG_BRLAPI) += baum.o