summaryrefslogtreecommitdiff
path: root/src/dnsmasq
diff options
context:
space:
mode:
authorIñigo Martínez <inigomartinez@gmail.com>2018-01-07 15:39:42 +0100
committerThomas Haller <thaller@redhat.com>2018-01-10 12:20:17 +0100
commit5e16bcf268b0a88764c06ecdb0d694cff560d201 (patch)
tree53adb3607e52fc64e0fbaa821c145f00ad6a8dbd /src/dnsmasq
parent96658d2fd11410b01d11ace62a89899dd7958ee4 (diff)
downloadNetworkManager-5e16bcf268b0a88764c06ecdb0d694cff560d201.tar.gz
meson: Improve dependency system
Some targets are missing dependencies on some generated sources in the meson port. These makes the build to fail due to missing source files on a highly parallelized build. These dependencies have been resolved by taking advantage of meson's internal dependencies which can be used to pass source files, include directories, libraries and compiler flags. One of such internal dependencies called `core_dep` was already in use. However, in order to avoid any confusion with another new internal dependency called `nm_core_dep`, which is used to include directories and source files from the `libnm-core` directory, the `core_dep` dependency has been renamed to `nm_dep`. These changes have allowed minimizing the build details which are inherited by using those dependencies. The parallelized build has also been improved.
Diffstat (limited to 'src/dnsmasq')
-rw-r--r--src/dnsmasq/tests/meson.build10
1 files changed, 2 insertions, 8 deletions
diff --git a/src/dnsmasq/tests/meson.build b/src/dnsmasq/tests/meson.build
index 749e6f64fa..56d917486a 100644
--- a/src/dnsmasq/tests/meson.build
+++ b/src/dnsmasq/tests/meson.build
@@ -1,16 +1,10 @@
test_unit = 'test-dnsmasq-utils'
-cflags = [
- '-DTESTDIR="@0@"'.format(meson.source_root()),
- '-DNETWORKMANAGER_COMPILATION_TEST',
- '-DNETWORKMANAGER_COMPILATION=NM_NETWORKMANAGER_COMPILATION_DAEMON',
-]
-
exe = executable(
test_unit,
test_unit + '.c',
- dependencies: test_core_dep,
- c_args: cflags
+ dependencies: test_nm_dep,
+ c_args: '-DTESTDIR="@0@"'.format(meson.source_root())
)
test(test_unit, exe)