summaryrefslogtreecommitdiff
path: root/common
diff options
context:
space:
mode:
authorDaiki Ueno <dueno@redhat.com>2019-06-19 15:36:18 +0200
committerDaiki Ueno <ueno@gnu.org>2019-06-19 15:59:01 +0200
commit787888e181543f5a85eb69d6a3caf14f9a4262b2 (patch)
tree2ac047e3a54957fec125d32d8f6f0e542ecf8084 /common
parenteb5eb7aea7fc41a2c15d853cd57c7c030644f4ee (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 'common')
-rw-r--r--common/meson.build17
1 files changed, 6 insertions, 11 deletions
diff --git a/common/meson.build b/common/meson.build
index 656592a..2f777a9 100644
--- a/common/meson.build
+++ b/common/meson.build
@@ -29,10 +29,8 @@ libp11_library = static_library('p11-library', 'library.c',
gnu_symbol_visibility: 'hidden',
include_directories: configinc)
-libp11_library_dep = declare_dependency(include_directories: [configinc,
- commoninc],
- link_with: libp11_library,
- dependencies: thread_deps)
+libp11_library_dep = declare_dependency(link_with: libp11_library,
+ dependencies: [libp11_common_dep] + thread_deps)
libp11_test_sources = [
'mock.c',
@@ -41,10 +39,8 @@ libp11_test_sources = [
libp11_test = static_library('p11-test', libp11_test_sources,
include_directories: configinc)
-libp11_test_dep = declare_dependency(include_directories: [configinc,
- commoninc],
- link_with: libp11_test,
- dependencies: thread_deps)
+libp11_test_dep = declare_dependency(link_with: libp11_test,
+ dependencies: [libp11_common_dep] + thread_deps)
libp11_tool_sources = [
'tool.c'
@@ -56,9 +52,8 @@ endif
libp11_tool = static_library('p11-tool', libp11_tool_sources,
include_directories: configinc)
-libp11_tool_dep = declare_dependency(include_directories: [configinc,
- commoninc],
- link_with: libp11_tool)
+libp11_tool_dep = declare_dependency(link_with: libp11_tool,
+ dependencies: [libp11_common_dep])
# Tests ----------------------------------------------------------------