aboutsummaryrefslogtreecommitdiff
path: root/Makefile.objs
diff options
context:
space:
mode:
authorPaolo Bonzini <pbonzini@redhat.com>2020-08-04 21:14:26 +0200
committerPaolo Bonzini <pbonzini@redhat.com>2020-08-21 06:30:22 -0400
commitff219dca9ffa4c3417f8a00ef7ce3e9a15196eb0 (patch)
tree2fb0364c9b820b758dc54aa5e5da3221b589378c /Makefile.objs
parent708eab42dc75304473f23ea1ead06d579dcb7566 (diff)
downloadqemu-ff219dca9ffa4c3417f8a00ef7ce3e9a15196eb0.zip
qemu-ff219dca9ffa4c3417f8a00ef7ce3e9a15196eb0.tar.gz
qemu-ff219dca9ffa4c3417f8a00ef7ce3e9a15196eb0.tar.bz2
meson: convert common QMP bits for qemu and qemu-storage-daemon
Signed-off-by: Marc-André Lureau <marcandre.lureau@redhat.com> Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
Diffstat (limited to 'Makefile.objs')
-rw-r--r--Makefile.objs8
1 files changed, 5 insertions, 3 deletions
diff --git a/Makefile.objs b/Makefile.objs
index 6657a6c..d7826c1 100644
--- a/Makefile.objs
+++ b/Makefile.objs
@@ -37,10 +37,11 @@ endif # CONFIG_SOFTMMU or CONFIG_TOOLS
# storage-daemon-obj-y is code used by qemu-storage-daemon (these objects are
# used for system emulation, too, but specified separately there)
-storage-daemon-obj-y = block/ monitor/ qapi/ qom/ storage-daemon/
+storage-daemon-obj-y = block/ qapi/ qom/ storage-daemon/
storage-daemon-obj-y += blockdev.o blockdev-nbd.o iothread.o job-qmp.o
storage-daemon-obj-$(CONFIG_WIN32) += os-win32.o
storage-daemon-obj-$(CONFIG_POSIX) += os-posix.o
+storage-daemon-obj-y += libqmp.fa
######################################################################
# Target independent part of system emulation. The long term path is to
@@ -48,8 +49,7 @@ storage-daemon-obj-$(CONFIG_POSIX) += os-posix.o
# single QEMU executable should support all CPUs and machines.
ifeq ($(CONFIG_SOFTMMU),y)
-common-obj-y = monitor/
-common-obj-y += net/
+common-obj-y = net/
common-obj-$(CONFIG_LINUX) += fsdev/
common-obj-y += accel/
@@ -83,6 +83,8 @@ common-obj-y += backends/
common-obj-y += qapi/
+common-obj-y += libqmp.fa
+
endif # CONFIG_SOFTMMU
#######################################################################