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>,
"Paolo Bonzini" <pbonzini@redhat.com>,
"Marc-André Lureau" <marcandre.lureau@redhat.com>,
"Philippe Mathieu-Daudé" <philmd@redhat.com>
Subject: [PATCH v2 5/9] migration: Move the creation of the library to the main meson.build
Date: Tue, 6 Oct 2020 14:55:58 +0200 [thread overview]
Message-ID: <20201006125602.2311423-6-philmd@redhat.com> (raw)
In-Reply-To: <20201006125602.2311423-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 | 7 +++++++
migration/meson.build | 8 +-------
2 files changed, 8 insertions(+), 7 deletions(-)
diff --git a/meson.build b/meson.build
index 3c0d7b4d44..0e3598e267 100644
--- a/meson.build
+++ b/meson.build
@@ -1328,6 +1328,13 @@ qemu_syms = custom_target('qemu.syms', output: 'qemu.syms',
# Library dependencies #
########################
+libmigration = static_library('migration', sources: migration_files + genh,
+ name_suffix: 'fa',
+ build_by_default: false)
+migration = declare_dependency(link_with: libmigration,
+ dependencies: [zlib, qom, io])
+softmmu_ss.add(migration)
+
block_ss = block_ss.apply(config_host, strict: false)
libblock = static_library('block', block_ss.sources() + genh,
dependencies: block_ss.dependencies(),
diff --git a/migration/meson.build b/migration/meson.build
index b5b71c8060..980e37865c 100644
--- a/migration/meson.build
+++ b/migration/meson.build
@@ -8,13 +8,7 @@ migration_files = files(
'qemu-file.c',
'qjson.c',
)
-
-libmigration = static_library('migration', sources: migration_files + genh,
- name_suffix: 'fa',
- build_by_default: false)
-migration = declare_dependency(link_with: libmigration,
- dependencies: [zlib, qom, io])
-softmmu_ss.add(migration)
+softmmu_ss.add(migration_files)
softmmu_ss.add(files(
'block-dirty-bitmap.c',
--
2.26.2
next prev parent reply other threads:[~2020-10-06 13:07 UTC|newest]
Thread overview: 13+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-10-06 12:55 [PATCH v2 0/9] meson: Move the creation of the library to the main meson.build Philippe Mathieu-Daudé
2020-10-06 12:55 ` [PATCH v2 1/9] meson.build: Add comments to clarify code organization Philippe Mathieu-Daudé
2020-10-06 12:55 ` [PATCH v2 2/9] meson.build: Sort sourcesets alphabetically Philippe Mathieu-Daudé
2020-10-06 12:55 ` [PATCH v2 3/9] hw/core: Move the creation of the library to the main meson.build Philippe Mathieu-Daudé
2020-10-06 12:55 ` [PATCH v2 4/9] chardev: " Philippe Mathieu-Daudé
2020-10-06 12:55 ` Philippe Mathieu-Daudé [this message]
2020-10-06 12:55 ` [PATCH v2 6/9] io: " Philippe Mathieu-Daudé
2020-10-06 12:56 ` [PATCH v2 7/9] crypto: " Philippe Mathieu-Daudé
2020-10-06 12:56 ` [PATCH v2 8/9] authz: " Philippe Mathieu-Daudé
2020-10-06 12:56 ` [PATCH v2 9/9] qom: " Philippe Mathieu-Daudé
2020-10-06 13:00 ` [PATCH v2 0/9] meson: " no-reply
2020-10-06 13:04 ` Philippe Mathieu-Daudé
2020-10-06 13:09 ` Paolo Bonzini
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=20201006125602.2311423-6-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).