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 09/10] authz: Move the creation of the library to the main meson.build
Date: Tue, 6 Oct 2020 13:12:18 +0200 [thread overview]
Message-ID: <20201006111219.2300921-10-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 ++++++++++
authz/meson.build | 10 ----------
2 files changed, 10 insertions(+), 10 deletions(-)
diff --git a/meson.build b/meson.build
index 5ded67cb76..9ecfe93503 100644
--- a/meson.build
+++ b/meson.build
@@ -1059,6 +1059,7 @@ sphinx_extn_depends = [ meson.source_root() / 'docs/sphinx/depfile.py',
# Collect sourcesets.
+authz_ss = ss.source_set()
blockdev_ss = ss.source_set()
block_ss = ss.source_set()
bsd_user_ss = ss.source_set()
@@ -1330,6 +1331,15 @@ qemu_syms = custom_target('qemu.syms', output: 'qemu.syms',
# Library dependencies #
########################
+authz_ss = authz_ss.apply(config_host, strict: false)
+libauthz = static_library('authz', authz_ss.sources() + genh,
+ dependencies: [authz_ss.dependencies()],
+ name_suffix: 'fa',
+ build_by_default: false)
+
+authz = declare_dependency(link_whole: libauthz,
+ dependencies: qom)
+
crypto_ss = crypto_ss.apply(config_host, strict: false)
libcrypto = static_library('crypto', crypto_ss.sources() + genh,
dependencies: [crypto_ss.dependencies()],
diff --git a/authz/meson.build b/authz/meson.build
index 516d71f2e2..88fa7769cb 100644
--- a/authz/meson.build
+++ b/authz/meson.build
@@ -1,4 +1,3 @@
-authz_ss = ss.source_set()
authz_ss.add(genh)
authz_ss.add(files(
'base.c',
@@ -8,12 +7,3 @@ authz_ss.add(files(
))
authz_ss.add(when: ['CONFIG_AUTH_PAM', pam], if_true: files('pamacct.c'))
-
-authz_ss = authz_ss.apply(config_host, strict: false)
-libauthz = static_library('authz', authz_ss.sources() + genh,
- dependencies: [authz_ss.dependencies()],
- name_suffix: 'fa',
- build_by_default: false)
-
-authz = declare_dependency(link_whole: libauthz,
- dependencies: qom)
--
2.26.2
next prev parent reply other threads:[~2020-10-06 11:16 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 ` [PATCH 07/10] io: " Philippe Mathieu-Daudé
2020-10-06 11:12 ` [PATCH 08/10] crypto: " Philippe Mathieu-Daudé
2020-10-06 11:12 ` Philippe Mathieu-Daudé [this message]
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-10-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).