[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PATCH 057/142] meson: convert qom/
From: |
Paolo Bonzini |
Subject: |
[PATCH 057/142] meson: convert qom/ |
Date: |
Tue, 28 Jan 2020 18:52:17 +0100 |
From: Marc-André Lureau <address@hidden>
Signed-off-by: Marc-André Lureau <address@hidden>
---
Makefile.objs | 1 -
qom/Makefile.objs | 1 -
qom/meson.build | 5 +++++
3 files changed, 5 insertions(+), 2 deletions(-)
delete mode 100644 qom/Makefile.objs
diff --git a/Makefile.objs b/Makefile.objs
index ada5d795f2..8a158b93bb 100644
--- a/Makefile.objs
+++ b/Makefile.objs
@@ -73,7 +73,6 @@ endif
# Target-independent parts used in system and user emulation
common-obj-y += hw/
-common-obj-y += qom/
common-obj-y += disas/
######################################################################
diff --git a/qom/Makefile.objs b/qom/Makefile.objs
deleted file mode 100644
index fc1248e3f3..0000000000
--- a/qom/Makefile.objs
+++ /dev/null
@@ -1 +0,0 @@
-common-obj-$(CONFIG_SOFTMMU) += qom-hmp-cmds.o qom-qmp-cmds.o
diff --git a/qom/meson.build b/qom/meson.build
index 4af044d858..3875663f66 100644
--- a/qom/meson.build
+++ b/qom/meson.build
@@ -13,3 +13,8 @@ libqom = static_library('qom', qom_ss.sources(),
name_suffix: 'fa')
qom = declare_dependency(link_whole: libqom)
+
+softmmu_ss.add(files(
+ 'qom-hmp-cmds.c',
+ 'qom-qmp-cmds.c',
+))
--
2.21.0
- [PATCH 046/142] meson: add modules infrastructure, (continued)
- [PATCH 046/142] meson: add modules infrastructure, Paolo Bonzini, 2020/01/28
- [PATCH 047/142] meson: convert chardev directory to Meson (tools part), Paolo Bonzini, 2020/01/28
- [PATCH 048/142] meson: convert block, Paolo Bonzini, 2020/01/28
- [PATCH 049/142] meson: qemu-{img,io,nbd}, Paolo Bonzini, 2020/01/28
- [PATCH 052/142] meson: convert chardev directory to Meson (emulator part), Paolo Bonzini, 2020/01/28
- [PATCH 050/142] meson: qemu-pr-helper, Paolo Bonzini, 2020/01/28
- [PATCH 051/142] configure, Makefile; remove TOOLS and HELPERS-y variable, Paolo Bonzini, 2020/01/28
- [PATCH 053/142] meson: convert audio directory to Meson, Paolo Bonzini, 2020/01/28
- [PATCH 054/142] meson: convert ui directory to Meson, Paolo Bonzini, 2020/01/28
- [PATCH 055/142] meson: convert root directory to Meson, Paolo Bonzini, 2020/01/28
- [PATCH 057/142] meson: convert qom/,
Paolo Bonzini <=
- [PATCH 056/142] meson: convert trace/, Paolo Bonzini, 2020/01/28
- [PATCH 058/142] meson: convert block/, Paolo Bonzini, 2020/01/28
- [PATCH 059/142] meson: convert dump/, Paolo Bonzini, 2020/01/28
- [PATCH 060/142] meson: convert monitor directory to Meson, Paolo Bonzini, 2020/01/28
- [PATCH 061/142] meson: convert replay directory to Meson, Paolo Bonzini, 2020/01/28
- [PATCH 062/142] meson: convert migration directory to Meson, Paolo Bonzini, 2020/01/28
- [PATCH 063/142] meson: build softmmu-specific migration/ram.c, Paolo Bonzini, 2020/01/28
- [PATCH 064/142] meson: convert net directory to Meson, Paolo Bonzini, 2020/01/28
- [PATCH 065/142] meson: convert backends directory to Meson, Paolo Bonzini, 2020/01/28
- [PATCH 067/142] meson: convert disas directory to Meson, Paolo Bonzini, 2020/01/28