From 70da6993c878444cd3a95f81753594af87ea1793 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?I=C3=B1igo=20Mart=C3=ADnez?= <inigomartinez@gmail.com>
Date: Wed, 11 Sep 2019 09:28:04 +0200
Subject: [PATCH] meson: Improve dispatcher test build file

Different objects used in the `test-dispatcher-envp` target
have been grouped together.

The dependency over the `libnm` library has been removed as it is
unnecessary.
---
 dispatcher/tests/meson.build | 26 ++++++++++++--------------
 1 file changed, 12 insertions(+), 14 deletions(-)

diff --git a/dispatcher/tests/meson.build b/dispatcher/tests/meson.build
index d339455b59..83c915e585 100644
--- a/dispatcher/tests/meson.build
+++ b/dispatcher/tests/meson.build
@@ -1,23 +1,21 @@
 test_unit = 'test-dispatcher-envp'
 
-incs = [
-  dispatcher_inc,
-  libnm_inc,
+deps = [
+  libnm_nm_default_dep,
+  libnm_utils_base_dep,
+]
+
+c_flags = [
+  '-DNETWORKMANAGER_COMPILATION_TEST',
+  '-DNETWORKMANAGER_COMPILATION=NM_NETWORKMANAGER_COMPILATION_CLIENT',
 ]
 
 exe = executable(
   test_unit,
-  [ test_unit + '.c' ] + [ nmdbus_dispatcher_sources ],
-  include_directories: incs,
-  dependencies: [
-    libnm_dep,
-    libnm_nm_default_dep,
-    libnm_utils_base_dep,
-  ],
-  c_args: [
-      '-DNETWORKMANAGER_COMPILATION_TEST',
-      '-DNETWORKMANAGER_COMPILATION=NM_NETWORKMANAGER_COMPILATION_CLIENT',
-    ],
+  [test_unit + '.c', nmdbus_dispatcher_sources],
+  include_directories: dispatcher_inc,
+  dependencies: deps,
+  c_args: c_flags,
   link_with: libnm_dispatcher_core,
 )