From: "Philippe Mathieu-Daudé" <philmd@redhat.com>
To: qemu-devel@nongnu.org
Cc: "Daniel P. Berrangé" <berrange@redhat.com>,
"Eduardo Habkost" <ehabkost@redhat.com>,
"Juan Quintela" <quintela@redhat.com>,
"Dr. David Alan Gilbert" <dgilbert@redhat.com>,
"Marc-André Lureau" <marcandre.lureau@redhat.com>,
"Paolo Bonzini" <pbonzini@redhat.com>,
"Philippe Mathieu-Daudé" <philmd@redhat.com>
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 [thread overview]
Message-ID: <20201006111219.2300921-8-philmd@redhat.com> (raw)
In-Reply-To: <20201006111219.2300921-1-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>
---
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
next prev parent reply other threads:[~2020-10-06 11:14 UTC|newest]
Thread overview: 18+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-10-06 11:12 [PATCH 00/10] meson: Move the creation of the library to the main meson.build Philippe Mathieu-Daudé
2020-10-06 11:12 ` [RFC PATCH 01/10] migration: Only add migration files to the Meson sourceset Philippe Mathieu-Daudé
2020-10-06 11:13 ` Philippe Mathieu-Daudé
2020-10-06 11:25 ` Paolo Bonzini
2020-10-06 11:12 ` [PATCH 02/10] meson.build: Add comments to clarify code organization Philippe Mathieu-Daudé
2020-10-06 11:24 ` Paolo Bonzini
2020-10-06 11:12 ` [PATCH 03/10] meson.build: Sort sourcesets alphabetically Philippe Mathieu-Daudé
2020-10-06 11:12 ` [PATCH 04/10] hw/core: Move the creation of the library to the main meson.build Philippe Mathieu-Daudé
2020-10-06 11:12 ` [PATCH 05/10] chardev: " Philippe Mathieu-Daudé
2020-10-06 11:12 ` [PATCH 06/10] migration: " Philippe Mathieu-Daudé
2020-10-06 11:25 ` Paolo Bonzini
2020-10-06 11:29 ` Philippe Mathieu-Daudé
2020-10-06 11:12 ` Philippe Mathieu-Daudé [this message]
2020-10-06 11:12 ` [PATCH 08/10] crypto: " Philippe Mathieu-Daudé
2020-10-06 11:12 ` [PATCH 09/10] authz: " Philippe Mathieu-Daudé
2020-10-06 11:12 ` [PATCH 10/10] qom: " Philippe Mathieu-Daudé
2020-10-06 11:29 ` [PATCH 00/10] meson: " Paolo Bonzini
2020-10-06 12:48 ` Philippe Mathieu-Daudé
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20201006111219.2300921-8-philmd@redhat.com \
--to=philmd@redhat.com \
--cc=berrange@redhat.com \
--cc=dgilbert@redhat.com \
--cc=ehabkost@redhat.com \
--cc=marcandre.lureau@redhat.com \
--cc=pbonzini@redhat.com \
--cc=qemu-devel@nongnu.org \
--cc=quintela@redhat.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).