[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PATCH 07/10] io: Move the creation of the library to the main meson.bui
From: |
Philippe Mathieu-Daudé |
Subject: |
[PATCH 07/10] io: Move the creation of the library to the main meson.build |
Date: |
Tue, 6 Oct 2020 13:12:16 +0200 |
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>
---
meson.build | 10 ++++++++++
io/meson.build | 10 ----------
2 files changed, 10 insertions(+), 10 deletions(-)
diff --git a/meson.build b/meson.build
index 55966c3b60..70545efd74 100644
--- a/meson.build
+++ b/meson.build
@@ -1064,6 +1064,7 @@ block_ss = ss.source_set()
bsd_user_ss = ss.source_set()
chardev_ss = ss.source_set()
common_ss = ss.source_set()
+io_ss = ss.source_set()
linux_user_ss = ss.source_set()
qmp_ss = ss.source_set()
softmmu_ss = ss.source_set()
@@ -1328,6 +1329,15 @@ qemu_syms = custom_target('qemu.syms', output:
'qemu.syms',
# Library dependencies #
########################
+io_ss = io_ss.apply(config_host, strict: false)
+libio = static_library('io', io_ss.sources() + genh,
+ dependencies: [io_ss.dependencies()],
+ link_with: libqemuutil,
+ name_suffix: 'fa',
+ build_by_default: false)
+
+io = declare_dependency(link_whole: libio, dependencies: [crypto, qom])
+
libmigration = static_library('migration', sources: migration_files + genh,
name_suffix: 'fa',
build_by_default: false)
diff --git a/io/meson.build b/io/meson.build
index 768c1b5ec3..bcd8b1e737 100644
--- a/io/meson.build
+++ b/io/meson.build
@@ -1,4 +1,3 @@
-io_ss = ss.source_set()
io_ss.add(genh)
io_ss.add(files(
'channel-buffer.c',
@@ -14,12 +13,3 @@ io_ss.add(files(
'net-listener.c',
'task.c',
))
-
-io_ss = io_ss.apply(config_host, strict: false)
-libio = static_library('io', io_ss.sources() + genh,
- dependencies: [io_ss.dependencies()],
- link_with: libqemuutil,
- name_suffix: 'fa',
- build_by_default: false)
-
-io = declare_dependency(link_whole: libio, dependencies: [crypto, qom])
--
2.26.2
- Re: [RFC PATCH 01/10] migration: Only add migration files to the Meson sourceset, (continued)
- [PATCH 02/10] meson.build: Add comments to clarify code organization, Philippe Mathieu-Daudé, 2020/10/06
- [PATCH 03/10] meson.build: Sort sourcesets alphabetically, Philippe Mathieu-Daudé, 2020/10/06
- [PATCH 04/10] hw/core: Move the creation of the library to the main meson.build, Philippe Mathieu-Daudé, 2020/10/06
- [PATCH 05/10] chardev: Move the creation of the library to the main meson.build, Philippe Mathieu-Daudé, 2020/10/06
- [PATCH 06/10] migration: Move the creation of the library to the main meson.build, Philippe Mathieu-Daudé, 2020/10/06
- [PATCH 08/10] crypto: Move the creation of the library to the main meson.build, Philippe Mathieu-Daudé, 2020/10/06
- [PATCH 07/10] io: Move the creation of the library to the main meson.build,
Philippe Mathieu-Daudé <=
- [PATCH 09/10] authz: Move the creation of the library to the main meson.build, Philippe Mathieu-Daudé, 2020/10/06
- [PATCH 10/10] qom: Move the creation of the library to the main meson.build, Philippe Mathieu-Daudé, 2020/10/06
- Re: [PATCH 00/10] meson: Move the creation of the library to the main meson.build, Paolo Bonzini, 2020/10/06