diff options
| author | Thomas Haller <thaller@redhat.com> | 2018-01-02 13:37:06 +0100 |
|---|---|---|
| committer | Thomas Haller <thaller@redhat.com> | 2018-01-08 12:38:53 +0100 |
| commit | 22ef6a507a308f2fe495b60bef78ac2ca00fb6d2 (patch) | |
| tree | 3bd2f287df3db9c5254f9b27607b4f0735b938d7 /src/dnsmasq | |
| parent | 31b6abd4b533c56c91c616498ee2080d56d0fd48 (diff) | |
build: refine the NETWORKMANAGER_COMPILATION define
Note that:
- we compile some source files multiple times. Most notably those
under "shared/".
- we include a default header "shared/nm-default.h" in every source
file. This header is supposed to setup a common environment by defining
and including parts that are commonly used. As we always include the
same header, the header must behave differently depending
one whether the compilation is for libnm-core, NetworkManager or
libnm-glib. E.g. it must include <glib/gi18n.h> or <glib/gi18n-lib.h>
depending on whether we compile a library or an application.
For that, the source files need the NETWORKMANAGER_COMPILATION #define
to behave accordingly.
Extend the define to be composed of flags. These flags are all named
NM_NETWORKMANAGER_COMPILATION_WITH_*, they indicate which part of the
build are available. E.g. when building libnm-core.la itself, then
WITH_LIBNM_CORE, WITH_LIBNM_CORE_INTERNAL, and WITH_LIBNM_CORE_PRIVATE
are available. When building NetworkManager, WITH_LIBNM_CORE_PRIVATE
is not available but the internal parts are still accessible. When
building nmcli, only WITH_LIBNM_CORE (the public part) is available.
This granularily controls the build.
Diffstat (limited to 'src/dnsmasq')
| -rw-r--r-- | src/dnsmasq/tests/meson.build | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/src/dnsmasq/tests/meson.build b/src/dnsmasq/tests/meson.build index 4c4173faa0..749e6f64fa 100644 --- a/src/dnsmasq/tests/meson.build +++ b/src/dnsmasq/tests/meson.build @@ -1,6 +1,10 @@ test_unit = 'test-dnsmasq-utils' -cflags = '-DTESTDIR="@0@"'.format(meson.source_root()) +cflags = [ + '-DTESTDIR="@0@"'.format(meson.source_root()), + '-DNETWORKMANAGER_COMPILATION_TEST', + '-DNETWORKMANAGER_COMPILATION=NM_NETWORKMANAGER_COMPILATION_DAEMON', +] exe = executable( test_unit, |