[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PULL 09/38] qom: Move the creation of the library to the main meson.bui
From: |
Paolo Bonzini |
Subject: |
[PULL 09/38] qom: Move the creation of the library to the main meson.build |
Date: |
Mon, 12 Oct 2020 16:33:14 -0400 |
From: Philippe Mathieu-Daudé <philmd@redhat.com>
Be consistent creating all the libraries in the main meson.build file.
Suggested-by: Paolo Bonzini <pbonzini@redhat.com>
Signed-off-by: Philippe Mathieu-Daudé <philmd@redhat.com>
Message-Id: <20201006125602.2311423-10-philmd@redhat.com>
Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
---
meson.build | 8 ++++++++
qom/meson.build | 8 --------
2 files changed, 8 insertions(+), 8 deletions(-)
diff --git a/meson.build b/meson.build
index 2736f74b8f..f4ef3b83f3 100644
--- a/meson.build
+++ b/meson.build
@@ -1192,6 +1192,7 @@ crypto_ss = ss.source_set()
io_ss = ss.source_set()
linux_user_ss = ss.source_set()
qmp_ss = ss.source_set()
+qom_ss = ss.source_set()
softmmu_ss = ss.source_set()
specific_fuzz_ss = ss.source_set()
specific_ss = ss.source_set()
@@ -1454,6 +1455,13 @@ qemu_syms = custom_target('qemu.syms', output:
'qemu.syms',
# Library dependencies #
########################
+qom_ss = qom_ss.apply(config_host, strict: false)
+libqom = static_library('qom', qom_ss.sources() + genh,
+ dependencies: [qom_ss.dependencies()],
+ name_suffix: 'fa')
+
+qom = declare_dependency(link_whole: libqom)
+
authz_ss = authz_ss.apply(config_host, strict: false)
libauthz = static_library('authz', authz_ss.sources() + genh,
dependencies: [authz_ss.dependencies()],
diff --git a/qom/meson.build b/qom/meson.build
index a1cd03c82c..062a3789d8 100644
--- a/qom/meson.build
+++ b/qom/meson.build
@@ -1,4 +1,3 @@
-qom_ss = ss.source_set()
qom_ss.add(genh)
qom_ss.add(files(
'container.c',
@@ -9,10 +8,3 @@ qom_ss.add(files(
qmp_ss.add(files('qom-qmp-cmds.c'))
softmmu_ss.add(files('qom-hmp-cmds.c'))
-
-qom_ss = qom_ss.apply(config_host, strict: false)
-libqom = static_library('qom', qom_ss.sources() + genh,
- dependencies: [qom_ss.dependencies()],
- name_suffix: 'fa')
-
-qom = declare_dependency(link_whole: libqom)
--
2.26.2
- [PULL v2 00/38] SCSI, qdev, qtest, meson patches for 2020-10-10, Paolo Bonzini, 2020/10/12
- [PULL 01/38] meson.build: Add comments to clarify code organization, Paolo Bonzini, 2020/10/12
- [PULL 03/38] hw/core: Move the creation of the library to the main meson.build, Paolo Bonzini, 2020/10/12
- [PULL 04/38] chardev: Move the creation of the library to the main meson.build, Paolo Bonzini, 2020/10/12
- [PULL 07/38] crypto: Move the creation of the library to the main meson.build, Paolo Bonzini, 2020/10/12
- [PULL 02/38] meson.build: Sort sourcesets alphabetically, Paolo Bonzini, 2020/10/12
- [PULL 05/38] migration: Move the creation of the library to the main meson.build, Paolo Bonzini, 2020/10/12
- [PULL 06/38] io: Move the creation of the library to the main meson.build, Paolo Bonzini, 2020/10/12
- [PULL 08/38] authz: Move the creation of the library to the main meson.build, Paolo Bonzini, 2020/10/12
- [PULL 10/38] hw/nvram: Always register FW_CFG_DATA_GENERATOR_INTERFACE, Paolo Bonzini, 2020/10/12
- [PULL 09/38] qom: Move the creation of the library to the main meson.build,
Paolo Bonzini <=
- [PULL 12/38] exec: split out non-softmmu-specific parts, Paolo Bonzini, 2020/10/12
- [PULL 11/38] softmmu: move more files to softmmu/, Paolo Bonzini, 2020/10/12
- [PULL 17/38] qtest: unify extra_qtest_srcs and extra_qtest_deps, Paolo Bonzini, 2020/10/12
- [PULL 15/38] docs/devel/qtest: Include protocol spec in document, Paolo Bonzini, 2020/10/12
- [PULL 18/38] docs/devel: update instruction on how to add new unit tests, Paolo Bonzini, 2020/10/12
- [PULL 29/38] scsi/scsi_bus: switch search direction in scsi_device_find, Paolo Bonzini, 2020/10/12
- [PULL 26/38] qtest: check that drives are really appearing and disappearing, Paolo Bonzini, 2020/10/12
- [PULL 22/38] qtest: Reintroduce qtest_qmp_receive with QMP event buffering, Paolo Bonzini, 2020/10/12
- [PULL 23/38] qtest: remove qtest_qmp_receive_success, Paolo Bonzini, 2020/10/12
- [PULL 19/38] build-sys: fix git version from -version, Paolo Bonzini, 2020/10/12