Merge remote-tracking branch 'remotes/kevin/tags/for-upstream' into staging

[qemu.git] / qom / Makefile.objs

diff --git a/qom/Makefile.objs b/qom/Makefile.objs
index 5ef060a4012dfc375fbe1629d17dd4469ddc401c..516349eec3288b6c03501e4ad7891604626301eb 100644 (file)
--- a/qom/Makefile.objs
+++ b/qom/Makefile.objs
@@ -1,4 +1,4 @@
 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)
+qom-obj-y += object_interfaces.o
+
+common-obj-y = cpu.o