diff options
| author | Philippe Mathieu-Daudé <philmd@redhat.com> | 2020-10-06 14:56:00 +0200 |
|---|---|---|
| committer | Paolo Bonzini <pbonzini@redhat.com> | 2020-10-12 11:50:20 -0400 |
| commit | 2389304a720e8034aee63da3f5adfeab94d9bfcd (patch) | |
| tree | 6269161bee84c0641cc6759656ae46c2dc5a4a06 | |
| parent | f78536b149b7c4caa7e33e7f6b2871c12b14e9bb (diff) | |
crypto: Move the creation of the library to the main meson.build
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-8-philmd@redhat.com>
Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
| -rw-r--r-- | crypto/meson.build | 10 | ||||
| -rw-r--r-- | meson.build | 10 |
2 files changed, 10 insertions, 10 deletions
diff --git a/crypto/meson.build b/crypto/meson.build index f6f5ce1ecd..7f37b5d335 100644 --- a/crypto/meson.build +++ b/crypto/meson.build @@ -1,4 +1,3 @@ -crypto_ss = ss.source_set() crypto_ss.add(genh) crypto_ss.add(files( 'afsplit.c', @@ -52,15 +51,6 @@ if 'CONFIG_GNUTLS' in config_host endif -crypto_ss = crypto_ss.apply(config_host, strict: false) -libcrypto = static_library('crypto', crypto_ss.sources() + genh, - dependencies: [crypto_ss.dependencies()], - name_suffix: 'fa', - build_by_default: false) - -crypto = declare_dependency(link_whole: libcrypto, - dependencies: [authz, qom]) - util_ss.add(files('aes.c')) util_ss.add(files('init.c')) diff --git a/meson.build b/meson.build index 28f31e6022..9c199195bf 100644 --- a/meson.build +++ b/meson.build @@ -1187,6 +1187,7 @@ block_ss = ss.source_set() bsd_user_ss = ss.source_set() chardev_ss = ss.source_set() common_ss = ss.source_set() +crypto_ss = ss.source_set() io_ss = ss.source_set() linux_user_ss = ss.source_set() qmp_ss = ss.source_set() @@ -1452,6 +1453,15 @@ qemu_syms = custom_target('qemu.syms', output: 'qemu.syms', # Library dependencies # ######################## +crypto_ss = crypto_ss.apply(config_host, strict: false) +libcrypto = static_library('crypto', crypto_ss.sources() + genh, + dependencies: [crypto_ss.dependencies()], + name_suffix: 'fa', + build_by_default: false) + +crypto = declare_dependency(link_whole: libcrypto, + dependencies: [authz, qom]) + io_ss = io_ss.apply(config_host, strict: false) libio = static_library('io', io_ss.sources() + genh, dependencies: [io_ss.dependencies()], |