[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PATCH 052/132] meson: convert block/
From: |
Paolo Bonzini |
Subject: |
[PATCH 052/132] meson: convert block/ |
Date: |
Thu, 12 Dec 2019 13:51:36 +0100 |
From: Marc-André Lureau <address@hidden>
Signed-off-by: Marc-André Lureau <address@hidden>
---
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
- [PATCH 042/132] meson: convert block, (continued)
- [PATCH 042/132] meson: convert block, Paolo Bonzini, 2019/12/12
- [PATCH 044/132] meson: qemu-pr-helper, Paolo Bonzini, 2019/12/12
- [PATCH 040/132] meson: add modules infrastructure, Paolo Bonzini, 2019/12/12
- [PATCH 045/132] configure, Makefile; remove TOOLS and HELPERS-y variable, Paolo Bonzini, 2019/12/12
- [PATCH 046/132] meson: convert chardev directory to Meson (emulator part), Paolo Bonzini, 2019/12/12
- [PATCH 047/132] meson: convert audio directory to Meson, Paolo Bonzini, 2019/12/12
- [PATCH 049/132] meson: convert root directory to Meson, Paolo Bonzini, 2019/12/12
- [PATCH 048/132] meson: convert ui directory to Meson, Paolo Bonzini, 2019/12/12
- [PATCH 051/132] meson: convert qom/, Paolo Bonzini, 2019/12/12
- [PATCH 050/132] meson: convert trace/, Paolo Bonzini, 2019/12/12
- [PATCH 052/132] meson: convert block/,
Paolo Bonzini <=
- [PATCH 053/132] meson: convert dump/, Paolo Bonzini, 2019/12/12
- [PATCH 054/132] meson: convert monitor directory to Meson, Paolo Bonzini, 2019/12/12
- [PATCH 055/132] meson: convert replay directory to Meson, Paolo Bonzini, 2019/12/12
- [PATCH 056/132] meson: convert migration directory to Meson, Paolo Bonzini, 2019/12/12
- [PATCH 057/132] meson: build softmmu-specific migration/ram.c, Paolo Bonzini, 2019/12/12
- [PATCH 059/132] meson: convert backends directory to Meson, Paolo Bonzini, 2019/12/12
- [PATCH 058/132] meson: convert net directory to Meson, Paolo Bonzini, 2019/12/12
- [PATCH 060/132] meson: convert fsdev/, Paolo Bonzini, 2019/12/12
- [PATCH 061/132] meson: convert disas directory to Meson, Paolo Bonzini, 2019/12/12
- [PATCH 063/132] meson: convert hw/xen, Paolo Bonzini, 2019/12/12