diff options
| author | Daiki Ueno <dueno@redhat.com> | 2019-06-19 15:36:18 +0200 |
|---|---|---|
| committer | Daiki Ueno <ueno@gnu.org> | 2019-06-19 15:59:01 +0200 |
| commit | 787888e181543f5a85eb69d6a3caf14f9a4262b2 (patch) | |
| tree | 2ac047e3a54957fec125d32d8f6f0e542ecf8084 /trust | |
| parent | eb5eb7aea7fc41a2c15d853cd57c7c030644f4ee (diff) | |
build: Declare dependency chain between static libs in commonp11p
In common/ there are sub-libraries namely libp11-common.a,
libp11-library.a, libp11-tool.a, and libp11-test.a.
All the latter 3 libs use the symbols from libp11-common.a, it would
make sense to declare a dependency against it.
Diffstat (limited to 'trust')
| -rw-r--r-- | trust/meson.build | 10 |
1 files changed, 3 insertions, 7 deletions
diff --git a/trust/meson.build b/trust/meson.build index 70786fa..b6cb260 100644 --- a/trust/meson.build +++ b/trust/meson.build @@ -49,8 +49,7 @@ shared_module('p11-kit-trust', 'module-init.c', name_prefix: '', c_args: p11_kit_trust_c_args, - dependencies: [libp11_library_dep, - libp11_common_dep] + libtasn1_deps, + dependencies: [libp11_library_dep] + libtasn1_deps, link_with: libtrust_data, install: true, install_dir: prefix / p11_module_path) @@ -90,7 +89,6 @@ executable('trust', c_args: common_c_args, link_with: libtrust_data, dependencies: [libp11_kit_dep, - libp11_common_dep, libp11_tool_dep] + libffi_deps + dlopen_deps + libtasn1_deps, install: true) @@ -133,8 +131,7 @@ foreach name : trust_tests c_args: common_c_args + tests_c_args + libtrust_testable_c_args, dependencies: [libp11_kit_dep, libp11_library_dep, - libp11_test_dep, - libp11_common_dep] + dlopen_deps, + libp11_test_dep] + dlopen_deps, link_with: [libtrust_testable, libtrust_data, libtrust_test]) test(name, t) endforeach @@ -156,7 +153,6 @@ foreach name : trust_progs c_args: tests_c_args, dependencies: [libp11_kit_dep, libp11_library_dep, - libp11_test_dep, - libp11_common_dep] + libffi_deps + dlopen_deps, + libp11_test_dep] + libffi_deps + dlopen_deps, link_with: [libtrust_testable, libtrust_data, libtrust_test]) endforeach |