diff options
| author | Iñigo Martínez <inigomartinez@gmail.com> | 2019-09-07 23:00:41 +0200 |
|---|---|---|
| committer | Thomas Haller <thaller@redhat.com> | 2019-10-01 09:49:33 +0200 |
| commit | 70a34c54fef0ec2bde4ad27ac751f8efd8e3c13e (patch) | |
| tree | 588bdceb7e8eb57dd12a5529774c330ac929f390 /src/systemd | |
| parent | c74e428342c0219bb54d6cffe24bd0423bcda532 (diff) | |
| download | NetworkManager-70a34c54fef0ec2bde4ad27ac751f8efd8e3c13e.tar.gz | |
meson: Use dependency for nm-default header
The `nm-default.h` header is used widely in the code by many
targets. This header includes different headers and needs different
libraries depending the compilation flags.
A new set of `*nm_default_dep` dependencies have been created to
ease the inclusion of different directorires and libraries.
This allows cleaner build files and avoiding linking unnecessary
libraries so this has been applied allowing the removal of some
dependencies involving the linking of unnecessary libraries.
Diffstat (limited to 'src/systemd')
| -rw-r--r-- | src/systemd/meson.build | 19 |
1 files changed, 9 insertions, 10 deletions
diff --git a/src/systemd/meson.build b/src/systemd/meson.build index af1d0c8b35..64f0c3ccd1 100644 --- a/src/systemd/meson.build +++ b/src/systemd/meson.build @@ -27,19 +27,18 @@ libnm_systemd_core = static_library( 'nm-sd-utils-core.c', 'nm-sd-utils-dhcp.c', ), - include_directories: [ - src_inc, - include_directories( - 'sd-adapt-core', - 'src/libsystemd-network', - 'src/libsystemd/sd-event', - 'src/systemd', - ) - ], + include_directories: include_directories( + 'sd-adapt-core', + 'src/libsystemd-network', + 'src/libsystemd/sd-event', + 'src/systemd', + ), dependencies: [ - libnm_core_dep, + daemon_nm_default_dep, + libnm_systemd_shared_dep, ], c_args: [ '-DNETWORKMANAGER_COMPILATION=NM_NETWORKMANAGER_COMPILATION_SYSTEMD', ], + link_with: libc_siphash, ) |