[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PATCH v2 8/9] authz: Move the creation of the library to the main meson
From: |
Philippe Mathieu-Daudé |
Subject: |
[PATCH v2 8/9] authz: Move the creation of the library to the main meson.build |
Date: |
Tue, 6 Oct 2020 14:56:01 +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 ++++++++++
authz/meson.build | 10 ----------
2 files changed, 10 insertions(+), 10 deletions(-)
diff --git a/meson.build b/meson.build
index d064d07dae..73838d1d4f 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
- [PATCH v2 0/9] meson: Move the creation of the library to the main meson.build, Philippe Mathieu-Daudé, 2020/10/06
- [PATCH v2 1/9] meson.build: Add comments to clarify code organization, Philippe Mathieu-Daudé, 2020/10/06
- [PATCH v2 2/9] meson.build: Sort sourcesets alphabetically, Philippe Mathieu-Daudé, 2020/10/06
- [PATCH v2 3/9] hw/core: Move the creation of the library to the main meson.build, Philippe Mathieu-Daudé, 2020/10/06
- [PATCH v2 4/9] chardev: Move the creation of the library to the main meson.build, Philippe Mathieu-Daudé, 2020/10/06
- [PATCH v2 5/9] migration: Move the creation of the library to the main meson.build, Philippe Mathieu-Daudé, 2020/10/06
- [PATCH v2 6/9] io: Move the creation of the library to the main meson.build, Philippe Mathieu-Daudé, 2020/10/06
- [PATCH v2 7/9] crypto: Move the creation of the library to the main meson.build, Philippe Mathieu-Daudé, 2020/10/06
- [PATCH v2 8/9] authz: Move the creation of the library to the main meson.build,
Philippe Mathieu-Daudé <=
- [PATCH v2 9/9] qom: Move the creation of the library to the main meson.build, Philippe Mathieu-Daudé, 2020/10/06
- Re: [PATCH v2 0/9] meson: Move the creation of the library to the main meson.build, no-reply, 2020/10/06
- Re: [PATCH v2 0/9] meson: Move the creation of the library to the main meson.build, Paolo Bonzini, 2020/10/06