diff mbox series

[057/142] meson: convert qom/

Message ID 20200128175342.9066-58-pbonzini@redhat.com
State New
Headers show
Series Proof of concept for Meson integration | expand

Commit Message

Paolo Bonzini Jan. 28, 2020, 5:52 p.m. UTC 
From: Marc-André Lureau <marcandre.lureau@redhat.com>

Signed-off-by: Marc-André Lureau <marcandre.lureau@redhat.com>
---
 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 mbox series

Patch

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',
+))