build/meson: cleanup dependencies for libnm-base

This commit is contained in:
Thomas Haller 2021-02-24 13:42:05 +01:00
parent cac8e895b6
commit 08ce50c6d8
No known key found for this signature in database
GPG key ID: 29C2366E4DFC5728
5 changed files with 11 additions and 22 deletions

View file

@ -27,11 +27,11 @@ executable(
libnm_client_aux_extern_dep,
libnm_core_aux_extern_dep_link,
libnm_core_aux_intern_dep_link,
libnm_base_dep_link,
glib_dep,
readline_dep,
],
link_with: [
libnm_base,
libnm_glib_aux,
libnm_std_aux,
libc_siphash,
@ -54,10 +54,10 @@ generate_docs_nm_settings_nmcli = executable(
libnm_client_aux_extern_dep,
libnm_core_aux_extern_dep_link,
libnm_core_aux_intern_dep_link,
libnm_base_dep_link,
glib_dep,
],
link_with: [
libnm_base,
libnm_glib_aux,
libnm_std_aux,
libc_siphash,

View file

@ -8,10 +8,10 @@ exe = executable(
libnmc_dep,
libnm_core_aux_intern_dep_link,
libnm_core_aux_extern_dep_link,
libnm_base_dep_link,
glib_dep,
],
link_with: [
libnm_base,
libnm_glib_aux,
libnm_std_aux,
libc_siphash,

View file

@ -53,10 +53,10 @@ executable(
libnm_client_aux_extern_dep,
libnm_core_aux_extern_dep_link,
libnm_core_aux_intern_dep_link,
libnm_base_dep_link,
glib_dep,
],
link_with: [
libnm_base,
libnm_log_null,
libnm_glib_aux,
libnm_std_aux,

View file

@ -2,26 +2,12 @@
libnm_base = static_library(
'nm-base',
sources: files(
'nm-ethtool-base.c',
),
include_directories: [
src_inc,
top_inc,
],
sources: files(
'nm-ethtool-base.c',
),
dependencies: glib_dep,
)
libnm_base_dep = declare_dependency(
dependencies: glib_dep,
)
libnm_base_dep_link = declare_dependency(
dependencies: glib_dep,
link_with: [
libnm_base,
libnm_glib_aux,
libnm_std_aux,
libc_siphash,
],
)

View file

@ -28,11 +28,14 @@ foreach test_unit: test_units
libnm_core_public_dep,
libnm_core_intern_dep,
libnm_core_impl_dep_link,
libnm_base_dep_link,
],
link_with: [
libnm_base,
libnm_log_null,
libnm_systemd_shared,
libnm_glib_aux,
libnm_std_aux,
libc_siphash,
],
)