aboutsummaryrefslogtreecommitdiff
path: root/Makefile.objs
diff options
context:
space:
mode:
authorEduardo Habkost <ehabkost@redhat.com>2012-12-05 14:49:12 -0200
committerAndreas Färber <afaerber@suse.de>2013-01-08 21:03:43 +0100
commit507066f8a9610c0088df19ce7b3e436f43165ec1 (patch)
treeec708e833c2b9a76955a05742785b5d011e90837 /Makefile.objs
parent906709a151344805df4ff493a7d3a81fbce46fbe (diff)
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 'Makefile.objs')
-rw-r--r--Makefile.objs8
1 files changed, 8 insertions, 0 deletions
diff --git a/Makefile.objs b/Makefile.objs
index a3eab4b410..12a314e3fb 100644
--- a/Makefile.objs
+++ b/Makefile.objs
@@ -22,6 +22,13 @@ qom-obj-y = qom/
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 = osdep.o cutils.o qemu-timer-common.o
oslib-obj-$(CONFIG_WIN32) += oslib-win32.o qemu-thread-win32.o
@@ -182,6 +189,7 @@ nested-vars += \
user-obj-y \
common-obj-y \
universal-obj-y \
+ hw-core-obj-y \
extra-obj-y \
trace-obj-y
dummy := $(call unnest-vars)