diff options
| author | Eduardo Habkost <ehabkost@redhat.com> | 2012-12-05 14:49:12 -0200 |
|---|---|---|
| committer | Andreas Färber <afaerber@suse.de> | 2013-01-08 21:03:43 +0100 |
| commit | 507066f8a9610c0088df19ce7b3e436f43165ec1 (patch) | |
| tree | ec708e833c2b9a76955a05742785b5d011e90837 /hw/Makefile.objs | |
| parent | 906709a151344805df4ff493a7d3a81fbce46fbe (diff) | |
| download | qemu-507066f8a9610c0088df19ce7b3e436f43165ec1.zip qemu-507066f8a9610c0088df19ce7b3e436f43165ec1.tar.gz qemu-507066f8a9610c0088df19ce7b3e436f43165ec1.tar.bz2 | |
qdev: Include qdev code into *-user, too
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>
Diffstat (limited to 'hw/Makefile.objs')
| -rw-r--r-- | hw/Makefile.objs | 9 |
1 files changed, 7 insertions, 2 deletions
diff --git a/hw/Makefile.objs b/hw/Makefile.objs index b8bbed3..6b8a68c 100644 --- a/hw/Makefile.objs +++ b/hw/Makefile.objs @@ -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 += loader.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-y += usb/ -common-obj-y += irq.o common-obj-$(CONFIG_PTIMER) += ptimer.o common-obj-$(CONFIG_MAX7310) += max7310.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-hci-csr.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-$(CONFIG_BRLAPI) += baum.o |