From: Marc-André Lureau <marcandre.lureau@redhat.com>
Signed-off-by: Marc-André Lureau <marcandre.lureau@redhat.com>
---
Makefile.objs | 3 +--
block/Makefile.objs | 1 -
block/meson.build | 2 ++
3 files changed, 3 insertions(+), 3 deletions(-)
delete mode 100644 block/Makefile.objs
diff --git a/Makefile.objs b/Makefile.objs
index 0bc9167..4c7ae48 100644
--- a/Makefile.objs
+++ b/Makefile.objs
@@ -35,8 +35,7 @@ qom-obj-y = qom/libqom.fa
# single QEMU executable should support all CPUs and machines.
ifeq ($(CONFIG_SOFTMMU),y)
-common-obj-y = block/
-common-obj-y += dump/
+common-obj-y = dump/
common-obj-y += monitor/
common-obj-y += net/
common-obj-$(CONFIG_LINUX) += fsdev/
diff --git a/block/Makefile.objs b/block/Makefile.objs
deleted file mode 100644
index 83e87b3..0000000
--- a/block/Makefile.objs
+++ /dev/null
@@ -1 +0,0 @@
-common-obj-y += stream.o
diff --git a/block/meson.build b/block/meson.build
index a68689b..ca62992 100644
--- a/block/meson.build
+++ b/block/meson.build
@@ -98,4 +98,6 @@ module_block_h = custom_target('module_block.h',
command: [module_block_py, '@OUTPUT0@', modsrc])
block_ss.add(module_block_h)
+softmmu_ss.add(files('stream.c'))
+
modules += {'block': block_modules}
--
1.8.3.1