[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PULL 08/38] authz: Move the creation of the library to the main meson.b
From: |
Paolo Bonzini |
Subject: |
[PULL 08/38] authz: Move the creation of the library to the main meson.build |
Date: |
Mon, 12 Oct 2020 16:33:13 -0400 |
From: Philippe Mathieu-Daudé <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>
Message-Id: <20201006125602.2311423-9-philmd@redhat.com>
Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
---
authz/meson.build | 10 ----------
meson.build | 10 ++++++++++
2 files changed, 10 insertions(+), 10 deletions(-)
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)
diff --git a/meson.build b/meson.build
index 9c199195bf..2736f74b8f 100644
--- a/meson.build
+++ b/meson.build
@@ -1182,6 +1182,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()
@@ -1453,6 +1454,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()],
--
2.26.2
- [PULL v2 00/38] SCSI, qdev, qtest, meson patches for 2020-10-10, Paolo Bonzini, 2020/10/12
- [PULL 01/38] meson.build: Add comments to clarify code organization, Paolo Bonzini, 2020/10/12
- [PULL 03/38] hw/core: Move the creation of the library to the main meson.build, Paolo Bonzini, 2020/10/12
- [PULL 04/38] chardev: Move the creation of the library to the main meson.build, Paolo Bonzini, 2020/10/12
- [PULL 07/38] crypto: Move the creation of the library to the main meson.build, Paolo Bonzini, 2020/10/12
- [PULL 02/38] meson.build: Sort sourcesets alphabetically, Paolo Bonzini, 2020/10/12
- [PULL 05/38] migration: Move the creation of the library to the main meson.build, Paolo Bonzini, 2020/10/12
- [PULL 06/38] io: Move the creation of the library to the main meson.build, Paolo Bonzini, 2020/10/12
- [PULL 08/38] authz: Move the creation of the library to the main meson.build,
Paolo Bonzini <=
- [PULL 10/38] hw/nvram: Always register FW_CFG_DATA_GENERATOR_INTERFACE, Paolo Bonzini, 2020/10/12
- [PULL 09/38] qom: Move the creation of the library to the main meson.build, Paolo Bonzini, 2020/10/12
- [PULL 12/38] exec: split out non-softmmu-specific parts, Paolo Bonzini, 2020/10/12
- [PULL 11/38] softmmu: move more files to softmmu/, Paolo Bonzini, 2020/10/12
- [PULL 17/38] qtest: unify extra_qtest_srcs and extra_qtest_deps, Paolo Bonzini, 2020/10/12
- [PULL 15/38] docs/devel/qtest: Include protocol spec in document, Paolo Bonzini, 2020/10/12
- [PULL 18/38] docs/devel: update instruction on how to add new unit tests, Paolo Bonzini, 2020/10/12
- [PULL 29/38] scsi/scsi_bus: switch search direction in scsi_device_find, Paolo Bonzini, 2020/10/12
- [PULL 26/38] qtest: check that drives are really appearing and disappearing, Paolo Bonzini, 2020/10/12
- [PULL 22/38] qtest: Reintroduce qtest_qmp_receive with QMP event buffering, Paolo Bonzini, 2020/10/12