summaryrefslogtreecommitdiff
path: root/libnm/tests
diff options
context:
space:
mode:
authorIñigo Martínez <inigomartinez@gmail.com>2019-09-03 09:48:59 +0200
committerThomas Haller <thaller@redhat.com>2019-10-01 09:49:33 +0200
commitc74e428342c0219bb54d6cffe24bd0423bcda532 (patch)
tree853edd875a07ce3eaaca5210bbdea37ba09af6b2 /libnm/tests
parent31a2710f113ba8b335cdb3cc972b1e7cb91e40d6 (diff)
downloadNetworkManager-c74e428342c0219bb54d6cffe24bd0423bcda532.tar.gz
meson: Improve the shared build file
The `shared` build file has been improved by applying a set of changes: - Indentation has been fixed to be consistent. - Unused libraries and dependencies have been removed. - Dependencies have been reviewed to store the necessary data. - Set of objects used in targets have been grouped together. - Header files have been removed from sources lists as it's unnecessary. - Library variable names have been changed to `lib{name}` pattern following their filename pattern. - `shared` prefix has been removed from all variables using it. - `version_header` its related configuration `version_conf` variables have been renamed to `nm_version_macro*` following its input and final file names.
Diffstat (limited to 'libnm/tests')
-rw-r--r--libnm/tests/meson.build10
1 files changed, 4 insertions, 6 deletions
diff --git a/libnm/tests/meson.build b/libnm/tests/meson.build
index 5b72a24fae..65f5bb1b91 100644
--- a/libnm/tests/meson.build
+++ b/libnm/tests/meson.build
@@ -15,16 +15,14 @@ foreach test_unit: test_units
test_unit[0],
[
test_unit[0] + '.c',
- shared_nm_test_utils_impl_c,
- ],
- dependencies: [
- liblibnm_dep,
- libnm_systemd_shared_no_logging_dep,
+ nm_test_utils_impl_source,
],
+ dependencies: liblibnm_dep,
c_args: cflags,
link_with: [
liblibnm,
libnm_core,
+ libnm_systemd_logging_stub,
],
)
@@ -39,7 +37,7 @@ endforeach
# just test, that we can build "nm-vpn-plugin-utils.c"
libnm_vpn_plugin_utils_test = static_library(
'nm-vpn-plugin-utils-test',
- sources: shared_nm_utils_nm_vpn_plugin_utils_c + [libnm_enum[1]],
+ sources: nm_vpn_plugin_utils_source + [libnm_enum[1]],
include_directories: libnm_inc,
dependencies: libnm_core_dep,
c_args: cflags,