diff options
| author | Sebastien Bacher <seb128@ubuntu.com> | 2020-05-19 16:38:51 +0200 |
|---|---|---|
| committer | Sebastien Bacher <seb128@ubuntu.com> | 2020-05-19 16:38:51 +0200 |
| commit | 96642ebde58e1eea692aea6a92d33f45452fa9c0 (patch) | |
| tree | 106ddfa2180b3997e8965787b5cb122982ebab9d /libnm/meson.build | |
| parent | 8f6881ac06714ef99cc470a03e7ac0ce1af49a16 (diff) | |
| parent | d460892bbfece74fb6d3cd846bf6ef548290be41 (diff) | |
Merge branch 'upstream/latest' of https://salsa.debian.org/utopia-team/network-manager into upstream/latestt pu
Diffstat (limited to 'libnm/meson.build')
| -rw-r--r-- | libnm/meson.build | 25 |
1 files changed, 24 insertions, 1 deletions
diff --git a/libnm/meson.build b/libnm/meson.build index 51ca46d2..406766c7 100644 --- a/libnm/meson.build +++ b/libnm/meson.build @@ -1,3 +1,5 @@ +# SPDX-License-Identifier: LGPL-2.1+ + libnm_inc = include_directories('.') libnm_nm_default_dep = declare_dependency( @@ -39,6 +41,7 @@ libnm_headers = files( 'nm-device-team.h', 'nm-device-tun.h', 'nm-device-vlan.h', + 'nm-device-vrf.h', 'nm-device-vxlan.h', 'nm-device-wifi-p2p.h', 'nm-device-wifi.h', @@ -104,6 +107,7 @@ libnm_sources = files( 'nm-device-team.c', 'nm-device-tun.c', 'nm-device-vlan.c', + 'nm-device-vrf.c', 'nm-device-vxlan.c', 'nm-device-wifi-p2p.c', 'nm-device-wifi.c', @@ -251,7 +255,7 @@ if enable_introspection ld_library_path = meson.current_build_dir() + ld_library_path generate_setting_docs_env = [ - 'env', '-i', + 'env', 'GI_TYPELIB_PATH=' + gi_typelib_path, 'LD_LIBRARY_PATH=' + ld_library_path, ] @@ -278,3 +282,22 @@ endif if enable_tests subdir('tests') endif + +libnm_libnm_aux = static_library( + 'nm-libnm-aux', + sources: nm_libnm_aux_source, + c_args: [ + '-DG_LOG_DOMAIN="@0@"'.format('libnmc'), + '-DNETWORKMANAGER_COMPILATION=NM_NETWORKMANAGER_COMPILATION_CLIENT', + ], + dependencies: [ + libnm_core_nm_default_dep, + libnm_libnm_core_intern_dep, + libnm_dep, + ], +) + +libnm_libnm_aux_dep = declare_dependency( + include_directories: [shared_inc], + link_with: [libnm_libnm_aux], +) |