From 7ac93a03b0bf81f102d46589543c3f634a7daa97 Mon Sep 17 00:00:00 2001 From: Beniamino Galvani Date: Fri, 6 Apr 2018 17:04:31 +0200 Subject: [PATCH] build: meson: link NM against n-acd --- shared/meson.build | 25 +++++++++++++++++++++++++ src/meson.build | 3 ++- 2 files changed, 27 insertions(+), 1 deletion(-) diff --git a/shared/meson.build b/shared/meson.build index 2d0281b93f..a812b5882a 100644 --- a/shared/meson.build +++ b/shared/meson.build @@ -1,3 +1,28 @@ +shared_c_list_dep = declare_dependency( + include_directories: include_directories('c-list/src') +) + +shared_c_siphash = static_library( + 'c-siphash', + sources: ['c-siphash/src/c-siphash.c'] +) + +shared_c_siphash_dep = declare_dependency( + include_directories: include_directories('c-siphash/src'), + link_with: shared_c_siphash +) + +shared_n_acd = static_library( + 'n-acd', + sources: ['n-acd/src/n-acd.c'], + dependencies: [ shared_c_siphash_dep, shared_c_list_dep ] +) + +shared_n_acd_dep = declare_dependency( + include_directories: include_directories('.'), + link_with: shared_n_acd, +) + shared_inc = include_directories('.') version_conf = configuration_data() diff --git a/src/meson.build b/src/meson.build index 0b7c100875..845a098b8e 100644 --- a/src/meson.build +++ b/src/meson.build @@ -174,7 +174,8 @@ deps = [ # this dependency might be needed #libnmdbus_dep, libudev_dep, - nm_core_dep + nm_core_dep, + shared_n_acd_dep ] if enable_concheck