mirror of
https://gitlab.freedesktop.org/NetworkManager/NetworkManager
synced 2024-09-16 06:40:41 +00:00
build/meson: merge branch 'inigomartinez/meson-review'
https://gitlab.freedesktop.org/NetworkManager/NetworkManager/merge_requests/23
This commit is contained in:
Thomas Haller
commit
2063283c3a
|
|
@ -3,7 +3,7 @@ name = 'nmcli'
|
|||
# FIXME: nmcli-completion should be renamed to nmcli
|
||||
install_data(
|
||||
'nmcli-completion',
|
||||
install_dir: join_paths(nm_datadir, 'bash-completion', 'completions')
|
||||
install_dir: join_paths(nm_datadir, 'bash-completion', 'completions'),
|
||||
)
|
||||
|
||||
sources = files(
|
||||
|
|
@ -15,7 +15,7 @@ sources = files(
|
|||
'nmcli.c',
|
||||
'polkit-agent.c',
|
||||
'settings.c',
|
||||
'utils.c'
|
||||
'utils.c',
|
||||
)
|
||||
|
||||
deps = [
|
||||
|
|
@ -23,7 +23,7 @@ deps = [
|
|||
libnmc_base_dep,
|
||||
libnmc_dep,
|
||||
nm_core_dep,
|
||||
readline_dep
|
||||
readline_dep,
|
||||
]
|
||||
|
||||
cflags = clients_cflags + [
|
||||
|
|
@ -43,5 +43,5 @@ executable(
|
|||
c_args: cflags,
|
||||
link_args: ldflags_linker_script_binary,
|
||||
link_depends: linker_script_binary,
|
||||
install: true
|
||||
install: true,
|
||||
)
|
||||
|
|
|
|||
|
|
@ -4,7 +4,7 @@ nm_polkit_listener = files('nm-polkit-listener.c')
|
|||
|
||||
deps = [
|
||||
libnm_dep,
|
||||
nm_core_dep
|
||||
nm_core_dep,
|
||||
]
|
||||
|
||||
cflags = clients_cflags + [
|
||||
|
|
@ -19,12 +19,12 @@ libnmc_base = static_library(
|
|||
'nm-vpn-helpers.c',
|
||||
),
|
||||
dependencies: deps,
|
||||
c_args: cflags
|
||||
c_args: cflags,
|
||||
)
|
||||
|
||||
libnmc_base_dep = declare_dependency(
|
||||
include_directories: common_inc,
|
||||
link_with: libnmc_base
|
||||
link_with: libnmc_base,
|
||||
)
|
||||
|
||||
settings_docs = 'settings-docs.h'
|
||||
|
|
@ -34,7 +34,7 @@ if enable_introspection
|
|||
settings_docs,
|
||||
input: nm_property_docs,
|
||||
output: settings_docs,
|
||||
command: [xsltproc, '--output', '@OUTPUT@', join_paths(meson.current_source_dir(), 'settings-docs.xsl'), '@INPUT@']
|
||||
command: [xsltproc, '--output', '@OUTPUT@', join_paths(meson.current_source_dir(), 'settings-docs.xsl'), '@INPUT@'],
|
||||
)
|
||||
|
||||
test(
|
||||
|
|
@ -46,7 +46,7 @@ else
|
|||
settings_docs_source = configure_file(
|
||||
input: settings_docs + '.in',
|
||||
output: settings_docs,
|
||||
configuration: configuration_data()
|
||||
configuration: configuration_data(),
|
||||
)
|
||||
endif
|
||||
|
||||
|
|
@ -54,17 +54,17 @@ libnmc = static_library(
|
|||
'nmc',
|
||||
sources: files(
|
||||
'nm-meta-setting-access.c',
|
||||
'nm-meta-setting-desc.c'
|
||||
'nm-meta-setting-desc.c',
|
||||
) + shared_nm_meta_setting_c + shared_nm_ethtool_utils_c + [settings_docs_source],
|
||||
dependencies: deps,
|
||||
c_args: cflags,
|
||||
link_with: libnmc_base,
|
||||
link_depends: settings_docs_source
|
||||
link_depends: settings_docs_source,
|
||||
)
|
||||
|
||||
libnmc_dep = declare_dependency(
|
||||
include_directories: common_inc,
|
||||
link_with: libnmc
|
||||
link_with: libnmc,
|
||||
)
|
||||
|
||||
if (enable_introspection or enable_nmtui) and enable_tests
|
||||
|
|
|
|||
|
|
@ -4,7 +4,7 @@ deps = [
|
|||
libnm_dep,
|
||||
libnmc_dep,
|
||||
libnmc_base_dep,
|
||||
nm_core_dep
|
||||
nm_core_dep,
|
||||
]
|
||||
|
||||
exe = executable(
|
||||
|
|
@ -19,5 +19,5 @@ exe = executable(
|
|||
test(
|
||||
'clients/' + test_unit,
|
||||
test_script,
|
||||
args: test_args + [exe.full_path()]
|
||||
args: test_args + [exe.full_path()],
|
||||
)
|
||||
|
|
|
|||
|
|
@ -2,7 +2,7 @@ name = 'nm-online'
|
|||
|
||||
deps = [
|
||||
libnm_dep,
|
||||
nm_core_dep
|
||||
nm_core_dep,
|
||||
]
|
||||
|
||||
clients_cflags = [
|
||||
|
|
@ -20,7 +20,7 @@ executable(
|
|||
c_args: cflags,
|
||||
link_args: ldflags_linker_script_binary,
|
||||
link_depends: linker_script_binary,
|
||||
install: true
|
||||
install: true,
|
||||
)
|
||||
|
||||
subdir('common')
|
||||
|
|
|
|||
|
|
@ -2,7 +2,7 @@ name = 'nmtui'
|
|||
|
||||
deps = [
|
||||
newt_dep,
|
||||
nm_core_dep
|
||||
nm_core_dep,
|
||||
]
|
||||
|
||||
cflags = clients_cflags + [
|
||||
|
|
@ -51,13 +51,13 @@ sources = files(
|
|||
'nmtui-edit.c',
|
||||
'nmtui-hostname.c',
|
||||
'nmt-utils.c',
|
||||
'nmt-widget-list.c'
|
||||
'nmt-widget-list.c',
|
||||
)
|
||||
|
||||
deps += [
|
||||
libnm_dep,
|
||||
libnmc_base_dep,
|
||||
libnmt_newt_dep
|
||||
libnmt_newt_dep,
|
||||
]
|
||||
|
||||
executable(
|
||||
|
|
@ -67,5 +67,5 @@ executable(
|
|||
c_args: cflags,
|
||||
link_args: ldflags_linker_script_binary,
|
||||
link_depends: linker_script_binary,
|
||||
install: true
|
||||
install: true,
|
||||
)
|
||||
|
|
|
|||
|
|
@ -18,7 +18,7 @@ sources = files(
|
|||
'nmt-newt-textbox.c',
|
||||
'nmt-newt-toggle-button.c',
|
||||
'nmt-newt-utils.c',
|
||||
'nmt-newt-widget.c'
|
||||
'nmt-newt-widget.c',
|
||||
)
|
||||
|
||||
libnmt_newt = static_library(
|
||||
|
|
@ -26,10 +26,10 @@ libnmt_newt = static_library(
|
|||
sources: sources + [libnm_enum[1]],
|
||||
include_directories: libnm_inc,
|
||||
dependencies: deps,
|
||||
c_args: cflags
|
||||
c_args: cflags,
|
||||
)
|
||||
|
||||
libnmt_newt_dep = declare_dependency(
|
||||
include_directories: include_directories('.'),
|
||||
link_with: libnmt_newt
|
||||
link_with: libnmt_newt,
|
||||
)
|
||||
|
|
|
|||
|
|
@ -530,7 +530,7 @@ by nm-connection-editor and nm-applet in a non-graphical environment.
|
|||
-Dovs=false \
|
||||
%endif
|
||||
-Dselinux=true \
|
||||
-Dpolkit=yes \
|
||||
-Dpolkit=true \
|
||||
-Dpolkit_agent=true \
|
||||
-Dmodify_system=true \
|
||||
-Dconcheck=true \
|
||||
|
|
|
|||
|
|
@ -13,7 +13,7 @@ configure_file(
|
|||
output: server,
|
||||
install: true,
|
||||
install_dir: join_paths(nm_datadir, 'doc', nm_name, 'examples'),
|
||||
configuration: data_conf
|
||||
configuration: data_conf,
|
||||
)
|
||||
|
||||
if install_systemd_unit_dir
|
||||
|
|
@ -34,14 +34,14 @@ if install_systemd_unit_dir
|
|||
output: service,
|
||||
install: true,
|
||||
install_dir: systemd_system_unit_dir,
|
||||
configuration: data_conf
|
||||
configuration: data_conf,
|
||||
)
|
||||
endforeach
|
||||
|
||||
if enable_ovs
|
||||
install_data(
|
||||
'NetworkManager-ovs.conf',
|
||||
install_dir: join_paths(systemd_system_unit_dir, 'NetworkManager.service.d')
|
||||
install_dir: join_paths(systemd_system_unit_dir, 'NetworkManager.service.d'),
|
||||
)
|
||||
endif
|
||||
endif
|
||||
|
|
@ -50,12 +50,12 @@ if install_udev_dir
|
|||
data = files(
|
||||
'84-nm-drivers.rules',
|
||||
'85-nm-unmanaged.rules',
|
||||
'90-nm-thunderbolt.rules'
|
||||
'90-nm-thunderbolt.rules',
|
||||
)
|
||||
|
||||
install_data(
|
||||
data,
|
||||
install_dir: join_paths(udev_dir, 'rules.d')
|
||||
install_dir: join_paths(udev_dir, 'rules.d'),
|
||||
)
|
||||
endif
|
||||
|
||||
|
|
@ -65,7 +65,7 @@ if enable_polkit
|
|||
policy_in = configure_file(
|
||||
input: policy + '.in.in',
|
||||
output: policy + '.in',
|
||||
configuration: data_conf
|
||||
configuration: data_conf,
|
||||
)
|
||||
|
||||
custom_target(
|
||||
|
|
@ -74,6 +74,6 @@ if enable_polkit
|
|||
output: policy,
|
||||
command: intltool_xml_cmd,
|
||||
install: true,
|
||||
install_dir: polkit_dir
|
||||
install_dir: polkit_dir,
|
||||
)
|
||||
endif
|
||||
|
|
|
|||
|
|
@ -15,19 +15,19 @@ configure_file(
|
|||
output: service,
|
||||
install: true,
|
||||
install_dir: dbus_sys_dir,
|
||||
configuration: service_conf
|
||||
configuration: service_conf,
|
||||
)
|
||||
|
||||
install_data(
|
||||
'nm-dispatcher.conf',
|
||||
install_dir: dbus_conf_dir
|
||||
install_dir: dbus_conf_dir,
|
||||
)
|
||||
|
||||
sources = files('nm-dispatcher-utils.c')
|
||||
|
||||
deps = [
|
||||
libnm_dep,
|
||||
nm_core_dep
|
||||
nm_core_dep,
|
||||
]
|
||||
|
||||
cflags = [
|
||||
|
|
@ -39,7 +39,7 @@ libnm_dispatcher_core = static_library(
|
|||
name + '-core',
|
||||
sources: sources,
|
||||
dependencies: deps,
|
||||
c_args: cflags
|
||||
c_args: cflags,
|
||||
)
|
||||
|
||||
sources = files('nm-dispatcher.c')
|
||||
|
|
@ -48,7 +48,7 @@ sources += gnome.gdbus_codegen(
|
|||
'nmdbus-dispatcher',
|
||||
name + '.xml',
|
||||
interface_prefix: 'org.freedesktop',
|
||||
namespace: 'NMDBus'
|
||||
namespace: 'NMDBus',
|
||||
)
|
||||
|
||||
executable(
|
||||
|
|
@ -60,7 +60,7 @@ executable(
|
|||
link_args: ldflags_linker_script_binary,
|
||||
link_depends: linker_script_binary,
|
||||
install: true,
|
||||
install_dir: nm_libexecdir
|
||||
install_dir: nm_libexecdir,
|
||||
)
|
||||
|
||||
if enable_tests
|
||||
|
|
|
|||
|
|
@ -2,7 +2,7 @@ test_unit = 'test-dispatcher-envp'
|
|||
|
||||
incs = [
|
||||
dispatcher_inc,
|
||||
libnm_inc
|
||||
libnm_inc,
|
||||
]
|
||||
|
||||
exe = executable(
|
||||
|
|
@ -14,11 +14,11 @@ exe = executable(
|
|||
'-DNETWORKMANAGER_COMPILATION_TEST',
|
||||
'-DNETWORKMANAGER_COMPILATION=NM_NETWORKMANAGER_COMPILATION_CLIENT',
|
||||
],
|
||||
link_with: libnm_dispatcher_core
|
||||
link_with: libnm_dispatcher_core,
|
||||
)
|
||||
|
||||
test(
|
||||
'dispatcher/' + test_unit,
|
||||
test_script,
|
||||
args: test_args + [exe.full_path()]
|
||||
args: test_args + [exe.full_path()],
|
||||
)
|
||||
|
|
|
|||
|
|
@ -10,14 +10,14 @@ if enable_introspection
|
|||
output: output,
|
||||
command: [xsltproc, '--output', '@OUTPUT@', join_paths(meson.current_source_dir(), settings + '.xsl'), '@INPUT@'],
|
||||
# FIXME: there is no target depending on this, so it will not be built
|
||||
build_by_default: true
|
||||
build_by_default: true,
|
||||
)
|
||||
endif
|
||||
|
||||
configure_file(
|
||||
input: version_xml + '.in',
|
||||
output: version_xml,
|
||||
configuration: version_conf
|
||||
configuration: version_conf,
|
||||
)
|
||||
|
||||
content_files += join_paths(meson.source_root(), 'COPYING')
|
||||
|
|
@ -44,5 +44,5 @@ gnome.gtkdoc(
|
|||
main_xml: 'network-manager-docs.xml',
|
||||
src_dir: meson.current_source_dir(),
|
||||
content_files: content_files,
|
||||
install: true
|
||||
install: true,
|
||||
)
|
||||
|
|
|
|||
|
|
@ -9,13 +9,13 @@ private_headers = [
|
|||
'nm-remote-connection-private.h',
|
||||
'nm-types-private.h',
|
||||
'nm-secret-agent-glue.h',
|
||||
'nm-vpn-plugin-glue.h'
|
||||
'nm-vpn-plugin-glue.h',
|
||||
]
|
||||
|
||||
configure_file(
|
||||
input: version_xml + '.in',
|
||||
output: version_xml,
|
||||
configuration: version_conf
|
||||
configuration: version_conf,
|
||||
)
|
||||
|
||||
gnome.gtkdoc(
|
||||
|
|
@ -24,7 +24,7 @@ gnome.gtkdoc(
|
|||
src_dir: join_paths(meson.source_root(), 'libnm-glib'),
|
||||
dependencies: [
|
||||
libnm_glib_dep,
|
||||
libnm_glib_vpn_dep
|
||||
libnm_glib_vpn_dep,
|
||||
],
|
||||
scan_args: [
|
||||
'--rebuild-types',
|
||||
|
|
@ -35,5 +35,5 @@ gnome.gtkdoc(
|
|||
fixxref_args: '--html-dir=' + join_paths(nm_prefix, gnome.gtkdoc_html_dir(doc_module)),
|
||||
gobject_typesfile: doc_module + '.types',
|
||||
html_assets: doc_module + '.png',
|
||||
install: true
|
||||
install: true,
|
||||
)
|
||||
|
|
|
|||
|
|
@ -6,13 +6,13 @@ private_headers = [
|
|||
'nm-setting-private.h',
|
||||
'nm-param-spec-specialized.h',
|
||||
'nm-test-utils.h',
|
||||
'nm-version.h'
|
||||
'nm-version.h',
|
||||
]
|
||||
|
||||
configure_file(
|
||||
input: version_xml + '.in',
|
||||
output: version_xml,
|
||||
configuration: version_conf
|
||||
configuration: version_conf,
|
||||
)
|
||||
|
||||
gnome.gtkdoc(
|
||||
|
|
@ -23,10 +23,10 @@ gnome.gtkdoc(
|
|||
scan_args: [
|
||||
'--rebuild-types',
|
||||
'--rebuild-sections',
|
||||
'--ignore-headers=' + ' '.join(private_headers)
|
||||
'--ignore-headers=' + ' '.join(private_headers),
|
||||
],
|
||||
scanobjs_args: '--type-init-func="g_type_init();"',
|
||||
fixxref_args: '--html-dir=' + join_paths(nm_prefix, gnome.gtkdoc_html_dir(doc_module)),
|
||||
gobject_typesfile: doc_module + '.types',
|
||||
install: true
|
||||
install: true,
|
||||
)
|
||||
|
|
|
|||
|
|
@ -23,13 +23,13 @@ private_headers = [
|
|||
'nm-core-tests-enum-types.h',
|
||||
'nm-keyfile-internal.h',
|
||||
'nm-keyfile-utils.h',
|
||||
'test-general-enums.h'
|
||||
'test-general-enums.h',
|
||||
]
|
||||
|
||||
configure_file(
|
||||
input: version_xml + '.in',
|
||||
output: version_xml,
|
||||
configuration: version_conf
|
||||
configuration: version_conf,
|
||||
)
|
||||
|
||||
gnome.gtkdoc(
|
||||
|
|
@ -37,17 +37,17 @@ gnome.gtkdoc(
|
|||
main_xml: doc_module + '-docs.xml',
|
||||
src_dir: [
|
||||
libnm_core_inc,
|
||||
libnm_inc
|
||||
libnm_inc,
|
||||
],
|
||||
dependencies: libnm_dep,
|
||||
scan_args: [
|
||||
'--rebuild-types',
|
||||
'--rebuild-sections',
|
||||
'--ignore-headers=' + ' '.join(private_headers)
|
||||
'--ignore-headers=' + ' '.join(private_headers),
|
||||
],
|
||||
scanobjs_args: '--type-init-func="g_type_init();"',
|
||||
fixxref_args: '--html-dir=' + join_paths(nm_prefix, gnome.gtkdoc_html_dir(doc_module)),
|
||||
gobject_typesfile: doc_module + '.types',
|
||||
html_assets: doc_module + '.png',
|
||||
install: true
|
||||
install: true,
|
||||
)
|
||||
|
|
|
|||
|
|
@ -14,5 +14,5 @@ endif
|
|||
test(
|
||||
'check-docs',
|
||||
find_program(join_paths(meson.source_root(), 'tools', 'check-docs.sh')),
|
||||
args: [meson.source_root(), meson.build_root()]
|
||||
args: [meson.source_root(), meson.build_root()],
|
||||
)
|
||||
|
|
|
|||
|
|
@ -6,7 +6,7 @@ examples = [
|
|||
['list-connections-gdbus', [], [], []],
|
||||
['list-connections-libnm', [], [], [libnm_dep]],
|
||||
['monitor-nm-running-gdbus', [], [], []],
|
||||
['monitor-nm-state-gdbus', [], [], []]
|
||||
['monitor-nm-state-gdbus', [], [], []],
|
||||
]
|
||||
|
||||
foreach example: examples
|
||||
|
|
|
|||
|
|
@ -1,12 +1,12 @@
|
|||
examples = [
|
||||
['add-connection-wired', []],
|
||||
['list-connections', []],
|
||||
['change-ipv4-addresses', []]
|
||||
['change-ipv4-addresses', []],
|
||||
]
|
||||
|
||||
incs = [
|
||||
top_inc,
|
||||
libnm_core_inc
|
||||
libnm_core_inc,
|
||||
]
|
||||
|
||||
qt_core_dep = dependency('QtCore', version: '>= 4')
|
||||
|
|
@ -15,7 +15,7 @@ deps = [
|
|||
dbus_dep,
|
||||
qt_core_dep,
|
||||
dependency('QtDBus'),
|
||||
dependency('QtNetwork')
|
||||
dependency('QtNetwork'),
|
||||
]
|
||||
|
||||
moc = find_program('moc-qt4', required: false)
|
||||
|
|
@ -30,7 +30,7 @@ example_moc = custom_target(
|
|||
output,
|
||||
input: example + '.cpp',
|
||||
output: output,
|
||||
command: [moc, '-i', '@INPUT@', '-o', '@OUTPUT@']
|
||||
command: [moc, '-i', '@INPUT@', '-o', '@OUTPUT@'],
|
||||
)
|
||||
|
||||
examples += [[example, [example_moc]]]
|
||||
|
|
@ -41,6 +41,6 @@ foreach example: examples
|
|||
example[0] + '.cpp',
|
||||
include_directories: incs,
|
||||
dependencies: deps,
|
||||
link_depends: example[1]
|
||||
link_depends: example[1],
|
||||
)
|
||||
endforeach
|
||||
|
|
|
|||
|
|
@ -48,7 +48,7 @@ ifaces = [
|
|||
'org.freedesktop.NetworkManager.Settings',
|
||||
'org.freedesktop.NetworkManager.VPN.Connection',
|
||||
'org.freedesktop.NetworkManager.VPN.Plugin',
|
||||
'org.freedesktop.NetworkManager.WiMax.Nsp'
|
||||
'org.freedesktop.NetworkManager.WiMax.Nsp',
|
||||
]
|
||||
|
||||
ifaces_xmls = []
|
||||
|
|
@ -66,7 +66,7 @@ foreach iface: ifaces
|
|||
iface_xml,
|
||||
interface_prefix: 'org.freedesktop.NetworkManager',
|
||||
namespace: 'NMDBus',
|
||||
docbook: 'dbus'
|
||||
docbook: 'dbus',
|
||||
)
|
||||
|
||||
sources += res
|
||||
|
|
@ -82,14 +82,14 @@ endforeach
|
|||
|
||||
install_data(
|
||||
ifaces_xmls,
|
||||
install_dir: dbus_ifaces_dir
|
||||
install_dir: dbus_ifaces_dir,
|
||||
)
|
||||
|
||||
libnmdbus = static_library(
|
||||
'nmdbus',
|
||||
sources: sources,
|
||||
include_directories: top_inc,
|
||||
dependencies: glib_dep
|
||||
dependencies: glib_dep,
|
||||
)
|
||||
|
||||
libnmdbus_dep = declare_dependency(
|
||||
|
|
@ -97,5 +97,5 @@ libnmdbus_dep = declare_dependency(
|
|||
# libNetworkManagerBase and libNetworkManager
|
||||
#sources: sources,
|
||||
include_directories: include_directories('.'),
|
||||
link_with: libnmdbus
|
||||
link_with: libnmdbus,
|
||||
)
|
||||
|
|
|
|||
|
|
@ -56,7 +56,7 @@ libnm_core_headers = files(
|
|||
'nm-version.h',
|
||||
'nm-vpn-dbus-interface.h',
|
||||
'nm-vpn-editor-plugin.h',
|
||||
'nm-vpn-plugin-info.h'
|
||||
'nm-vpn-plugin-info.h',
|
||||
)
|
||||
|
||||
libnm_core_settings_sources = files(
|
||||
|
|
@ -104,7 +104,7 @@ libnm_core_settings_sources = files(
|
|||
'nm-setting-wired.c',
|
||||
'nm-setting-wireless-security.c',
|
||||
'nm-setting-wireless.c',
|
||||
'nm-setting-wpan.c'
|
||||
'nm-setting-wpan.c',
|
||||
)
|
||||
|
||||
libnm_core_sources = libnm_core_settings_sources + files(
|
||||
|
|
@ -119,7 +119,7 @@ libnm_core_sources = libnm_core_settings_sources + files(
|
|||
'nm-simple-connection.c',
|
||||
'nm-utils.c',
|
||||
'nm-vpn-editor-plugin.c',
|
||||
'nm-vpn-plugin-info.c'
|
||||
'nm-vpn-plugin-info.c',
|
||||
)
|
||||
|
||||
enum_headers = libnm_core_headers + [version_header]
|
||||
|
|
@ -132,7 +132,7 @@ libnm_core_enum = gnome.mkenums(
|
|||
c_template: enum_types + '.c.template',
|
||||
h_template: enum_types + '.h.template',
|
||||
install_header: true,
|
||||
install_dir: libnm_pkgincludedir
|
||||
install_dir: libnm_pkgincludedir,
|
||||
)
|
||||
|
||||
deps = [
|
||||
|
|
@ -158,7 +158,7 @@ if (crypto_gnutls_dep.found())
|
|||
'nm-crypto-gnutls',
|
||||
sources: [ 'nm-crypto-gnutls.c' ],
|
||||
dependencies: deps + [ crypto_gnutls_dep ],
|
||||
c_args: cflags
|
||||
c_args: cflags,
|
||||
)
|
||||
endif
|
||||
|
||||
|
|
@ -167,7 +167,7 @@ if (crypto_nss_dep.found())
|
|||
'nm-crypto-nss',
|
||||
sources: [ 'nm-crypto-nss.c' ],
|
||||
dependencies: deps + [ crypto_nss_dep ],
|
||||
c_args: cflags
|
||||
c_args: cflags,
|
||||
)
|
||||
endif
|
||||
|
||||
|
|
@ -191,7 +191,7 @@ libnm_core = static_library(
|
|||
sources: libnm_core_sources_all,
|
||||
dependencies: deps,
|
||||
link_with: libnm_crypto,
|
||||
c_args: cflags
|
||||
c_args: cflags,
|
||||
)
|
||||
|
||||
nm_core_dep = declare_dependency(
|
||||
|
|
@ -207,7 +207,7 @@ enums_to_docbook = join_paths(meson.source_root(), 'tools', 'enums-to-docbook.pl
|
|||
|
||||
docbooks = [
|
||||
['nm-dbus-types', 'nm-dbus-interface.h', 'NetworkManager D-Bus API Types'],
|
||||
['nm-vpn-dbus-types', 'nm-vpn-dbus-interface.h', 'VPN Plugin D-Bus API Types']
|
||||
['nm-vpn-dbus-types', 'nm-vpn-dbus-interface.h', 'VPN Plugin D-Bus API Types'],
|
||||
]
|
||||
|
||||
foreach docbook: docbooks
|
||||
|
|
@ -221,7 +221,7 @@ foreach docbook: docbooks
|
|||
command: [perl, enums_to_docbook, docbook[0], docbook[2], '@INPUT@'],
|
||||
# FIXME: gtkdoc does not depend directly on this.
|
||||
# https://github.com/mesonbuild/meson/pull/2806
|
||||
build_by_default: true
|
||||
build_by_default: true,
|
||||
)
|
||||
|
||||
content_files += xml.full_path()
|
||||
|
|
|
|||
|
|
@ -14,7 +14,7 @@ enum = gnome.mkenums(
|
|||
sources: 'test-general-enums.h',
|
||||
identifier_prefix: nm_id_prefix,
|
||||
c_template: enum_types + '.c.template',
|
||||
h_template: enum_types + '.h.template'
|
||||
h_template: enum_types + '.h.template',
|
||||
)
|
||||
|
||||
test_units = [
|
||||
|
|
@ -24,7 +24,7 @@ test_units = [
|
|||
'test-keyfile',
|
||||
'test-secrets',
|
||||
'test-setting',
|
||||
'test-settings-defaults'
|
||||
'test-settings-defaults',
|
||||
]
|
||||
|
||||
test_cert_dir = join_paths(meson.current_source_dir(), 'certs')
|
||||
|
|
@ -38,11 +38,11 @@ foreach test_unit: test_units
|
|||
'-DNETWORKMANAGER_COMPILATION_TEST',
|
||||
'-DNETWORKMANAGER_COMPILATION=NM_NETWORKMANAGER_COMPILATION_LIBNM_CORE',
|
||||
],
|
||||
link_with: libnm_core
|
||||
link_with: libnm_core,
|
||||
)
|
||||
test(
|
||||
'libnm-core/' + test_unit,
|
||||
test_script,
|
||||
args: test_args + [exe.full_path()]
|
||||
args: test_args + [exe.full_path()],
|
||||
)
|
||||
endforeach
|
||||
|
|
|
|||
|
|
@ -5,7 +5,7 @@ dbus_binding_tool = find_program('dbus-binding-tool')
|
|||
common_deps = [
|
||||
dbus_dep,
|
||||
dbus_glib_dep,
|
||||
shared_dep
|
||||
shared_dep,
|
||||
]
|
||||
|
||||
common_cflags = [
|
||||
|
|
@ -13,13 +13,13 @@ common_cflags = [
|
|||
]
|
||||
|
||||
cflags = common_cflags + [
|
||||
'-DG_LOG_DOMAIN="@0@"'.format(libnm_glib_name)
|
||||
'-DG_LOG_DOMAIN="@0@"'.format(libnm_glib_name),
|
||||
]
|
||||
|
||||
vpn_headers = files(
|
||||
'nm-vpn-plugin.h',
|
||||
'nm-vpn-plugin-ui-interface.h',
|
||||
'nm-vpn-plugin-utils.h'
|
||||
'nm-vpn-plugin-utils.h',
|
||||
)
|
||||
|
||||
headers = files(
|
||||
|
|
@ -50,14 +50,14 @@ headers = files(
|
|||
'nm-secret-agent.h',
|
||||
'nm-types.h',
|
||||
'nm-vpn-connection.h',
|
||||
'nm-wimax-nsp.h'
|
||||
'nm-wimax-nsp.h',
|
||||
)
|
||||
|
||||
deprecated_headers = files('libnm_glib.h')
|
||||
|
||||
install_headers(
|
||||
headers + vpn_headers + deprecated_headers,
|
||||
subdir: libnm_glib_name
|
||||
subdir: libnm_glib_name,
|
||||
)
|
||||
|
||||
libdeprecated_nm_glib = static_library(
|
||||
|
|
@ -74,7 +74,7 @@ libdeprecated_nm_glib = static_library(
|
|||
sources = files(
|
||||
'nm-vpn-plugin.c',
|
||||
'nm-vpn-plugin-ui-interface.c',
|
||||
'nm-vpn-plugin-utils.c'
|
||||
'nm-vpn-plugin-utils.c',
|
||||
)
|
||||
|
||||
glue = 'nm-vpn-plugin-glue.h'
|
||||
|
|
@ -88,7 +88,7 @@ libnm_glib_vpn_enum = gnome.mkenums(
|
|||
c_template: enum_types + '.c.template',
|
||||
h_template: enum_types + '.h.template',
|
||||
install_header: true,
|
||||
install_dir: libnm_glib_pkgincludedir
|
||||
install_dir: libnm_glib_pkgincludedir,
|
||||
)
|
||||
|
||||
deps = common_deps + [libnm_util_dep]
|
||||
|
|
@ -116,12 +116,12 @@ libnm_glib_vpn = shared_library(
|
|||
'-Wl,--version-script,@0@'.format(linker_script),
|
||||
],
|
||||
link_depends: linker_script,
|
||||
install: true
|
||||
install: true,
|
||||
)
|
||||
|
||||
libnm_glib_vpn_dep = declare_dependency(
|
||||
include_directories: libnm_glib_inc,
|
||||
link_with: libnm_glib_vpn
|
||||
link_with: libnm_glib_vpn,
|
||||
)
|
||||
|
||||
pkg.generate(
|
||||
|
|
@ -132,7 +132,7 @@ pkg.generate(
|
|||
filebase: libnm_glib_vpn_name,
|
||||
subdirs: libnm_glib_name,
|
||||
requires: 'NetworkManager >= ' + nm_version + ' glib-2.0 dbus-glib-1',
|
||||
variables: 'exec_prefix=${prefix}'
|
||||
variables: 'exec_prefix=${prefix}',
|
||||
)
|
||||
|
||||
libnm_glib_sources = shared_files_libnm_glib + files(
|
||||
|
|
@ -165,7 +165,7 @@ libnm_glib_sources = shared_files_libnm_glib + files(
|
|||
'nm-secret-agent.c',
|
||||
'nm-types.c',
|
||||
'nm-vpn-connection.c',
|
||||
'nm-wimax-nsp.c'
|
||||
'nm-wimax-nsp.c',
|
||||
)
|
||||
|
||||
glue = 'nm-secret-agent-glue.h'
|
||||
|
|
@ -174,7 +174,7 @@ nm_secret_agent_glue = custom_target(
|
|||
glue,
|
||||
input: ifaces_secret_agent_xml,
|
||||
output: glue,
|
||||
command: [dbus_binding_tool, '--prefix=nm_secret_agent', '--mode=glib-server', '--output=@OUTPUT@', '@INPUT@']
|
||||
command: [dbus_binding_tool, '--prefix=nm_secret_agent', '--mode=glib-server', '--output=@OUTPUT@', '@INPUT@'],
|
||||
)
|
||||
|
||||
enum_types = 'nm-glib-enum-types'
|
||||
|
|
@ -186,12 +186,12 @@ libnm_glib_enum = gnome.mkenums(
|
|||
c_template: enum_types + '.c.template',
|
||||
h_template: enum_types + '.h.template',
|
||||
install_header: true,
|
||||
install_dir: libnm_glib_pkgincludedir
|
||||
install_dir: libnm_glib_pkgincludedir,
|
||||
)
|
||||
|
||||
deps = common_deps + [
|
||||
libnm_util_dep,
|
||||
libudev_dep
|
||||
libudev_dep,
|
||||
]
|
||||
|
||||
linker_script = join_paths(meson.current_source_dir(), 'libnm-glib.ver')
|
||||
|
|
@ -207,12 +207,12 @@ libnm_glib = shared_library(
|
|||
'-Wl,--version-script,@0@'.format(linker_script),
|
||||
],
|
||||
link_depends: linker_script,
|
||||
install: true
|
||||
install: true,
|
||||
)
|
||||
|
||||
libnm_glib_dep = declare_dependency(
|
||||
include_directories: libnm_glib_inc,
|
||||
link_with: libnm_glib
|
||||
link_with: libnm_glib,
|
||||
)
|
||||
|
||||
pkg.generate(
|
||||
|
|
@ -223,7 +223,7 @@ pkg.generate(
|
|||
filebase: libnm_glib_name,
|
||||
subdirs: libnm_glib_name,
|
||||
requires: 'libnm-util >= ' + nm_version + ' NetworkManager >= ' + nm_version + ' gobject-2.0 dbus-glib-1',
|
||||
variables: 'exec_prefix=${prefix}'
|
||||
variables: 'exec_prefix=${prefix}',
|
||||
)
|
||||
|
||||
if enable_introspection
|
||||
|
|
@ -232,12 +232,12 @@ if enable_introspection
|
|||
deps = [
|
||||
dbus_glib_dep,
|
||||
libnm_glib_dep,
|
||||
libnm_util_gir_dep
|
||||
libnm_util_gir_dep,
|
||||
]
|
||||
|
||||
gir_includes = [
|
||||
'DBusGLib-1.0',
|
||||
'Gio-2.0'
|
||||
'Gio-2.0',
|
||||
]
|
||||
|
||||
libnm_glib_gir = gnome.generate_gir(
|
||||
|
|
@ -253,7 +253,7 @@ if enable_introspection
|
|||
extra_args: cflags + [
|
||||
'--include-uninstalled=' + libnm_util_gir[0].full_path(),
|
||||
],
|
||||
install: true
|
||||
install: true,
|
||||
)
|
||||
endif
|
||||
|
||||
|
|
@ -266,7 +266,7 @@ executable(
|
|||
name + '.c',
|
||||
dependencies: deps,
|
||||
c_args: cflags,
|
||||
link_with: libnm_glib
|
||||
link_with: libnm_glib,
|
||||
)
|
||||
|
||||
test(
|
||||
|
|
@ -290,6 +290,6 @@ pkg.generate(
|
|||
'exec_prefix=${prefix}',
|
||||
'libgnome_serverdir=' + nm_libexecdir,
|
||||
'plugindir=' + nm_vpndir,
|
||||
'configdir=' + nm_pkgconfdir
|
||||
]
|
||||
'configdir=' + nm_pkgconfdir,
|
||||
],
|
||||
)
|
||||
|
|
|
|||
|
|
@ -3,12 +3,12 @@ deps = [
|
|||
dbus_glib_dep,
|
||||
libnm_glib_dep,
|
||||
libnm_util_dep,
|
||||
shared_dep
|
||||
shared_dep,
|
||||
]
|
||||
|
||||
test_units = [
|
||||
'test-nm-client',
|
||||
'test-remote-settings-client'
|
||||
'test-remote-settings-client',
|
||||
]
|
||||
|
||||
foreach test_unit: test_units
|
||||
|
|
@ -25,6 +25,6 @@ foreach test_unit: test_units
|
|||
test(
|
||||
'libnm-glib/' + test_unit,
|
||||
test_script,
|
||||
args: test_args + [exe.full_path()]
|
||||
args: test_args + [exe.full_path()],
|
||||
)
|
||||
endforeach
|
||||
|
|
|
|||
|
|
@ -30,17 +30,17 @@ enums_headers = [version_header] + files(
|
|||
'nm-setting-wireless.h',
|
||||
'nm-setting-wireless-security.h',
|
||||
'nm-utils.h',
|
||||
'nm-version.h'
|
||||
'nm-version.h',
|
||||
)
|
||||
|
||||
headers = enums_headers + files(
|
||||
'NetworkManager.h',
|
||||
'NetworkManagerVPN.h'
|
||||
'NetworkManagerVPN.h',
|
||||
)
|
||||
|
||||
install_headers(
|
||||
headers,
|
||||
subdir: nm_name
|
||||
subdir: nm_name,
|
||||
)
|
||||
|
||||
enum_types = 'nm-utils-enum-types'
|
||||
|
|
@ -52,7 +52,7 @@ libnm_utils_enum = gnome.mkenums(
|
|||
c_template: enum_types + '.c.template',
|
||||
h_template: enum_types + '.h.template',
|
||||
install_header: true,
|
||||
install_dir: nm_pkgincludedir
|
||||
install_dir: nm_pkgincludedir,
|
||||
)
|
||||
|
||||
sources = files(
|
||||
|
|
@ -87,7 +87,7 @@ sources = files(
|
|||
'nm-setting-vlan.c',
|
||||
'nm-setting-vpn.c',
|
||||
'nm-utils.c',
|
||||
'nm-value-transforms.c'
|
||||
'nm-value-transforms.c',
|
||||
)
|
||||
sources += shared_files_libnm_util
|
||||
|
||||
|
|
@ -95,7 +95,7 @@ deps = [
|
|||
dbus_dep,
|
||||
dbus_glib_dep,
|
||||
shared_dep,
|
||||
uuid_dep
|
||||
uuid_dep,
|
||||
]
|
||||
|
||||
common_cflags = [
|
||||
|
|
@ -103,7 +103,7 @@ common_cflags = [
|
|||
]
|
||||
|
||||
cflags = common_cflags + [
|
||||
'-DG_LOG_DOMAIN="@0@"'.format(libnm_util_name)
|
||||
'-DG_LOG_DOMAIN="@0@"'.format(libnm_util_name),
|
||||
]
|
||||
|
||||
if crypto_gnutls_dep.found()
|
||||
|
|
@ -111,7 +111,7 @@ if crypto_gnutls_dep.found()
|
|||
'nm-util-crypto-gnutls',
|
||||
sources: [ 'crypto_gnutls.c' ],
|
||||
dependencies: deps + [ crypto_gnutls_dep ],
|
||||
c_args: cflags
|
||||
c_args: cflags,
|
||||
)
|
||||
endif
|
||||
|
||||
|
|
@ -120,7 +120,7 @@ if crypto_nss_dep.found()
|
|||
'nm-util-crypto-nss',
|
||||
sources: [ 'crypto_nss.c' ],
|
||||
dependencies: deps + [ crypto_nss_dep ],
|
||||
c_args: cflags
|
||||
c_args: cflags,
|
||||
)
|
||||
endif
|
||||
|
||||
|
|
@ -145,13 +145,13 @@ libnm_util = shared_library(
|
|||
],
|
||||
link_depends: linker_script,
|
||||
link_with: libnm_util_crypto,
|
||||
install: true
|
||||
install: true,
|
||||
)
|
||||
|
||||
libnm_util_dep = declare_dependency(
|
||||
sources: libnm_utils_enum[1],
|
||||
include_directories: libnm_util_inc,
|
||||
link_with: libnm_util
|
||||
link_with: libnm_util,
|
||||
)
|
||||
|
||||
pkg.generate(
|
||||
|
|
@ -162,7 +162,7 @@ pkg.generate(
|
|||
filebase: libnm_util_name,
|
||||
subdirs: nm_name,
|
||||
requires: 'NetworkManager >= ' + nm_version + ' glib-2.0 dbus-glib-1',
|
||||
variables: 'exec_prefix=${prefix}'
|
||||
variables: 'exec_prefix=${prefix}',
|
||||
)
|
||||
|
||||
if enable_introspection
|
||||
|
|
@ -170,7 +170,7 @@ if enable_introspection
|
|||
|
||||
gir_includes = [
|
||||
'DBusGLib-1.0',
|
||||
'GObject-2.0'
|
||||
'GObject-2.0',
|
||||
]
|
||||
|
||||
libnm_util_gir = gnome.generate_gir(
|
||||
|
|
@ -182,12 +182,12 @@ if enable_introspection
|
|||
symbol_prefix: nm_id_prefix.to_lower(),
|
||||
export_packages: libnm_util_name,
|
||||
includes: gir_includes,
|
||||
install: true
|
||||
install: true,
|
||||
)
|
||||
|
||||
libnm_util_gir_dep = declare_dependency(
|
||||
sources: libnm_util_gir,
|
||||
link_with: libnm_util
|
||||
link_with: libnm_util,
|
||||
)
|
||||
endif
|
||||
|
||||
|
|
@ -202,7 +202,7 @@ sources = files(
|
|||
)
|
||||
|
||||
deps = [
|
||||
shared_dep
|
||||
shared_dep,
|
||||
]
|
||||
|
||||
libtest_crypto = static_library(
|
||||
|
|
@ -210,7 +210,7 @@ libtest_crypto = static_library(
|
|||
sources: sources,
|
||||
dependencies: deps,
|
||||
link_with: libnm_util_crypto,
|
||||
c_args: cflags
|
||||
c_args: cflags,
|
||||
)
|
||||
|
||||
if enable_tests
|
||||
|
|
|
|||
|
|
@ -2,7 +2,7 @@ deps = [
|
|||
dbus_dep,
|
||||
dbus_glib_dep,
|
||||
libnm_util_dep,
|
||||
shared_dep
|
||||
shared_dep,
|
||||
]
|
||||
|
||||
cflags = common_cflags + [
|
||||
|
|
@ -15,7 +15,7 @@ test_libnm_linking = executable(
|
|||
test,
|
||||
test + '.c',
|
||||
dependencies: deps + [libnm_dep],
|
||||
c_args: cflags
|
||||
c_args: cflags,
|
||||
)
|
||||
|
||||
test_units = [
|
||||
|
|
@ -24,7 +24,7 @@ test_units = [
|
|||
['test-secrets', [], []],
|
||||
['test-setting-8021x', [], []],
|
||||
['test-setting-dcb', [], []],
|
||||
['test-settings-defaults', [], []]
|
||||
['test-settings-defaults', [], []],
|
||||
]
|
||||
|
||||
foreach test_unit: test_units
|
||||
|
|
@ -34,12 +34,12 @@ foreach test_unit: test_units
|
|||
dependencies: deps,
|
||||
c_args: cflags,
|
||||
link_with: test_unit[1],
|
||||
link_depends: test_unit[2]
|
||||
link_depends: test_unit[2],
|
||||
)
|
||||
|
||||
test(
|
||||
'libnm-util/' + test_unit[0],
|
||||
test_script,
|
||||
args: test_args + [exe.full_path()]
|
||||
args: test_args + [exe.full_path()],
|
||||
)
|
||||
endforeach
|
||||
|
|
|
|||
|
|
@ -2,7 +2,7 @@ g_ir_compiler = find_program('g-ir-compiler')
|
|||
|
||||
girs = [
|
||||
'NetworkManager',
|
||||
'NMClient'
|
||||
'NMClient',
|
||||
]
|
||||
|
||||
resource_data = []
|
||||
|
|
@ -14,7 +14,7 @@ foreach gir: girs
|
|||
gir_typelib,
|
||||
input: gir + '.gir',
|
||||
output: gir_typelib,
|
||||
command: [g_ir_compiler, '@INPUT@', '-o', '@OUTPUT@']
|
||||
command: [g_ir_compiler, '@INPUT@', '-o', '@OUTPUT@'],
|
||||
)
|
||||
endforeach
|
||||
|
||||
|
|
@ -26,5 +26,5 @@ sources += gnome.compile_resources(
|
|||
source_dir: '.',
|
||||
dependencies: resource_data,
|
||||
extra_args: '--manual-register',
|
||||
export: true
|
||||
export: true,
|
||||
)
|
||||
|
|
|
|||
|
|
@ -4,7 +4,7 @@ sources = files('nm-libnm-utils.c')
|
|||
|
||||
deps = [
|
||||
libnmdbus_dep,
|
||||
shared_dep
|
||||
shared_dep,
|
||||
]
|
||||
|
||||
cflags = [
|
||||
|
|
@ -22,7 +22,7 @@ libnm_utils = static_library(
|
|||
sources: sources,
|
||||
include_directories: libnm_core_inc,
|
||||
dependencies: deps,
|
||||
c_args: cflags
|
||||
c_args: cflags,
|
||||
)
|
||||
|
||||
libnm_headers = files(
|
||||
|
|
@ -69,12 +69,12 @@ libnm_headers = files(
|
|||
'nm-vpn-editor.h',
|
||||
'nm-vpn-plugin-old.h',
|
||||
'nm-vpn-service-plugin.h',
|
||||
'nm-wimax-nsp.h'
|
||||
'nm-wimax-nsp.h',
|
||||
)
|
||||
|
||||
install_headers(
|
||||
libnm_core_headers + libnm_headers + [version_header],
|
||||
subdir: libnm_name
|
||||
subdir: libnm_name,
|
||||
)
|
||||
|
||||
enum_headers = libnm_headers + [version_header]
|
||||
|
|
@ -87,7 +87,7 @@ libnm_enum = gnome.mkenums(
|
|||
c_template: enum_types + '.c.template',
|
||||
h_template: enum_types + '.h.template',
|
||||
install_header: true,
|
||||
install_dir: libnm_pkgincludedir
|
||||
install_dir: libnm_pkgincludedir,
|
||||
)
|
||||
|
||||
libnm_sources = files(
|
||||
|
|
@ -139,14 +139,14 @@ libnm_sources = files(
|
|||
'nm-vpn-plugin-old.c',
|
||||
'nm-vpn-editor.c',
|
||||
'nm-vpn-service-plugin.c',
|
||||
'nm-wimax-nsp.c'
|
||||
'nm-wimax-nsp.c',
|
||||
)
|
||||
|
||||
deps = [
|
||||
dl_dep,
|
||||
libudev_dep,
|
||||
shared_dep,
|
||||
uuid_dep
|
||||
uuid_dep,
|
||||
]
|
||||
|
||||
linker_script = join_paths(meson.current_source_dir(), 'libnm.ver')
|
||||
|
|
@ -165,13 +165,13 @@ libnm = shared_library(
|
|||
'-Wl,--version-script,@0@'.format(linker_script),
|
||||
],
|
||||
link_depends: linker_script,
|
||||
install: true
|
||||
install: true,
|
||||
)
|
||||
|
||||
libnm_dep = declare_dependency(
|
||||
sources: libnm_enum[1],
|
||||
include_directories: libnm_inc,
|
||||
link_with: libnm
|
||||
link_with: libnm,
|
||||
)
|
||||
|
||||
pkg.generate(
|
||||
|
|
@ -184,8 +184,8 @@ pkg.generate(
|
|||
requires: 'gio-2.0',
|
||||
variables: [
|
||||
'exec_prefix=${prefix}',
|
||||
'vpnservicedir=' + join_paths('${prefix}', 'lib', nm_name, 'VPN')
|
||||
]
|
||||
'vpnservicedir=' + join_paths('${prefix}', 'lib', nm_name, 'VPN'),
|
||||
],
|
||||
)
|
||||
|
||||
test(
|
||||
|
|
@ -208,7 +208,7 @@ if enable_introspection
|
|||
includes: 'Gio-2.0',
|
||||
extra_args: cflags,
|
||||
header: 'NetworkManager.h',
|
||||
install: true
|
||||
install: true,
|
||||
)
|
||||
|
||||
generate_plugin_docs = join_paths(meson.current_source_dir(), 'generate-plugin-docs.pl')
|
||||
|
|
@ -218,7 +218,7 @@ if enable_introspection
|
|||
name,
|
||||
input: libnm_core_settings_sources,
|
||||
output: name,
|
||||
command: [perl, generate_plugin_docs, 'keyfile', '@OUTPUT@', '@INPUT@']
|
||||
command: [perl, generate_plugin_docs, 'keyfile', '@OUTPUT@', '@INPUT@'],
|
||||
)
|
||||
|
||||
name = 'nm-settings-docs-overrides.xml'
|
||||
|
|
@ -226,7 +226,7 @@ if enable_introspection
|
|||
name,
|
||||
input: libnm_core_settings_sources,
|
||||
output: name,
|
||||
command: [perl, generate_plugin_docs, 'dbus', '@OUTPUT@', '@INPUT@']
|
||||
command: [perl, generate_plugin_docs, 'dbus', '@OUTPUT@', '@INPUT@'],
|
||||
)
|
||||
|
||||
if enable_ifcfg_rh
|
||||
|
|
@ -235,7 +235,7 @@ if enable_introspection
|
|||
name,
|
||||
input: libnm_core_settings_sources,
|
||||
output: name,
|
||||
command: [perl, generate_plugin_docs, 'ifcfg-rh', '@OUTPUT@', '@INPUT@']
|
||||
command: [perl, generate_plugin_docs, 'ifcfg-rh', '@OUTPUT@', '@INPUT@'],
|
||||
)
|
||||
endif
|
||||
|
||||
|
|
@ -256,7 +256,7 @@ if enable_introspection
|
|||
generate_setting_docs_env = [
|
||||
'env', '-i',
|
||||
'GI_TYPELIB_PATH=' + gi_typelib_path,
|
||||
'LD_LIBRARY_PATH=' + ld_library_path
|
||||
'LD_LIBRARY_PATH=' + ld_library_path,
|
||||
]
|
||||
|
||||
name = 'nm-property-docs.xml'
|
||||
|
|
@ -265,7 +265,7 @@ if enable_introspection
|
|||
input: libnm_gir[0],
|
||||
output: name,
|
||||
command: [generate_setting_docs_env, generate_setting_docs, '--lib-path', meson.current_build_dir(), '--gir', '@INPUT@', '--output', '@OUTPUT@'],
|
||||
depends: libnm_gir
|
||||
depends: libnm_gir,
|
||||
)
|
||||
|
||||
name = 'nm-settings-docs.xml'
|
||||
|
|
@ -274,7 +274,7 @@ if enable_introspection
|
|||
input: libnm_gir[0],
|
||||
output: name,
|
||||
command: [generate_setting_docs_env, generate_setting_docs, '--lib-path', meson.current_build_dir(), '--gir', '@INPUT@', '--overrides', nm_settings_docs_overrides, '--output', '@OUTPUT@'],
|
||||
depends: libnm_gir
|
||||
depends: libnm_gir,
|
||||
)
|
||||
endif
|
||||
|
||||
|
|
|
|||
|
|
@ -22,14 +22,14 @@ foreach test_unit: test_units
|
|||
nm_core_dep,
|
||||
],
|
||||
c_args: cflags,
|
||||
link_with: test_unit[1]
|
||||
link_with: test_unit[1],
|
||||
)
|
||||
|
||||
test(
|
||||
'libnm/' + test_unit[0],
|
||||
test_script,
|
||||
timeout: test_unit[2],
|
||||
args: test_args + [exe.full_path()]
|
||||
args: test_args + [exe.full_path()],
|
||||
)
|
||||
endforeach
|
||||
|
||||
|
|
@ -39,5 +39,5 @@ libnm_vpn_plugin_utils_test = static_library(
|
|||
sources: shared_nm_utils_nm_vpn_plugin_utils_c + [libnm_enum[1]],
|
||||
include_directories: libnm_inc,
|
||||
dependencies: nm_core_dep,
|
||||
c_args: cflags
|
||||
c_args: cflags,
|
||||
)
|
||||
|
|
|
|||
|
|
@ -14,7 +14,7 @@ common = 'common.ent'
|
|||
common_ent_file = configure_file(
|
||||
input: common + '.in',
|
||||
output: common,
|
||||
configuration: common_conf
|
||||
configuration: common_conf,
|
||||
)
|
||||
|
||||
xsltproc_options = [
|
||||
|
|
@ -28,7 +28,7 @@ xsltproc_options = [
|
|||
'--stringparam', 'man.th.extra1.suppress', '1',
|
||||
'--stringparam', 'man.authors.section.enabled', '0',
|
||||
'--stringparam', 'man.copyright.section.enabled', '0',
|
||||
'--stringparam', 'man.th.title.max.length', '30'
|
||||
'--stringparam', 'man.th.title.max.length', '30',
|
||||
]
|
||||
|
||||
docbook_xls = 'http://docbook.sourceforge.net/release/xsl/current/manpages/docbook.xsl'
|
||||
|
|
@ -62,14 +62,14 @@ foreach man: mans
|
|||
command: xsltproc_options + [docbook_xls, '@INPUT@'],
|
||||
depend_files: common_ent_file,
|
||||
install: true,
|
||||
install_dir: join_paths(nm_mandir, 'man' + man[1])
|
||||
install_dir: join_paths(nm_mandir, 'man' + man[1]),
|
||||
)
|
||||
endforeach
|
||||
|
||||
if enable_introspection
|
||||
mans = [
|
||||
['nm-settings-keyfile', '5', nm_settings_keyfile_docs],
|
||||
['nm-settings', '5', nm_settings_docs]
|
||||
['nm-settings', '5', nm_settings_docs],
|
||||
]
|
||||
|
||||
if enable_ifcfg_rh
|
||||
|
|
@ -83,7 +83,7 @@ if enable_introspection
|
|||
output,
|
||||
input: man[2],
|
||||
output: output,
|
||||
command: xsltproc_options + [join_paths(meson.current_source_dir(), man[0] + '.xsl'), '@INPUT@']
|
||||
command: xsltproc_options + [join_paths(meson.current_source_dir(), man[0] + '.xsl'), '@INPUT@'],
|
||||
)
|
||||
content_files += input.full_path()
|
||||
|
||||
|
|
@ -95,7 +95,7 @@ if enable_introspection
|
|||
output: output,
|
||||
command: xsltproc_options + [docbook_xls, '@INPUT@'],
|
||||
install: true,
|
||||
install_dir: join_paths(nm_mandir, 'man' + man[1])
|
||||
install_dir: join_paths(nm_mandir, 'man' + man[1]),
|
||||
)
|
||||
endforeach
|
||||
endif
|
||||
|
|
|
|||
53
meson.build
53
meson.build
|
|
@ -8,9 +8,9 @@ project(
|
|||
license: 'GPL2+',
|
||||
default_options: [
|
||||
'buildtype=debugoptimized',
|
||||
'c_std=gnu99'
|
||||
'c_std=gnu99',
|
||||
],
|
||||
meson_version: '>= 0.44.0'
|
||||
meson_version: '>= 0.44.0',
|
||||
)
|
||||
|
||||
nm_name = meson.project_name()
|
||||
|
|
@ -95,7 +95,7 @@ config_h = configuration_data()
|
|||
set_defines = [
|
||||
['GETTEXT_PACKAGE', nm_name],
|
||||
['PACKAGE_STRING', '@0@ @1@'.format(nm_name, nm_version)],
|
||||
['VERSION', nm_version]
|
||||
['VERSION', nm_version],
|
||||
]
|
||||
|
||||
foreach define: set_defines
|
||||
|
|
@ -148,7 +148,7 @@ if enable_ld_gc
|
|||
endif
|
||||
|
||||
if nm_debug
|
||||
test_cflags = [
|
||||
common_flags += cc.get_supported_arguments([
|
||||
'-fno-strict-aliasing',
|
||||
'-Wdeclaration-after-statement',
|
||||
'-Wfloat-equal',
|
||||
|
|
@ -171,10 +171,8 @@ if nm_debug
|
|||
'-Wstrict-prototypes',
|
||||
'-Wtypedef-redefinition',
|
||||
'-Wundef',
|
||||
'-Wunknown-attributes'
|
||||
]
|
||||
|
||||
common_flags += cc.get_supported_arguments(test_cflags)
|
||||
'-Wunknown-attributes',
|
||||
])
|
||||
endif
|
||||
|
||||
add_project_arguments(common_flags, language: 'c')
|
||||
|
|
@ -223,11 +221,11 @@ gio_unix_dep = dependency('gio-unix-2.0', version: '>= 2.40')
|
|||
glib_dep = declare_dependency(
|
||||
dependencies: [
|
||||
gio_unix_dep,
|
||||
dependency('gmodule-2.0')
|
||||
dependency('gmodule-2.0'),
|
||||
],
|
||||
compile_args: [
|
||||
'-DGLIB_VERSION_MIN_REQUIRED=GLIB_VERSION_2_40',
|
||||
'-DGLIB_VERSION_MAX_ALLOWED=GLIB_VERSION_2_40'
|
||||
'-DGLIB_VERSION_MAX_ALLOWED=GLIB_VERSION_2_40',
|
||||
]
|
||||
)
|
||||
|
||||
|
|
@ -462,17 +460,13 @@ endif
|
|||
config_h.set10('WITH_JSON_VALIDATION', enable_json_validation)
|
||||
|
||||
# polkit
|
||||
polkit = get_option('polkit')
|
||||
enable_polkit = (polkit != 'no')
|
||||
|
||||
enable_polkit = get_option('polkit')
|
||||
if enable_polkit
|
||||
polkit_dir = get_option('polkit_dir')
|
||||
if polkit_dir == ''
|
||||
polkit_dir = dependency('polkit-gobject-1').get_pkgconfig_variable('policydir')
|
||||
endif
|
||||
# FIXME: policydir should be relative to `datadir`, not `prefix`. Fixed in https://gitlab.freedesktop.org/polkit/polkit/merge_requests/2
|
||||
polkit_dir = dependency('polkit-gobject-1').get_pkgconfig_variable('policydir', define_variable: ['prefix', nm_prefix])
|
||||
endif
|
||||
|
||||
config_default_main_auth_polkit = (polkit == 'yes').to_string()
|
||||
config_default_main_auth_polkit = enable_polkit.to_string()
|
||||
config_h.set_quoted('NM_CONFIG_DEFAULT_MAIN_AUTH_POLKIT', config_default_main_auth_polkit)
|
||||
|
||||
enable_modify_system = get_option('modify_system')
|
||||
|
|
@ -501,17 +495,8 @@ if dbus_conf_dir == ''
|
|||
dbus_conf_dir = join_paths(dbus_dep.get_pkgconfig_variable('sysconfdir'), 'dbus-1', 'system.d')
|
||||
endif
|
||||
|
||||
dbus_ifaces_dir = get_option('dbus_ifaces_dir')
|
||||
if dbus_ifaces_dir == ''
|
||||
assert(dbus_dep.found(), 'D-Bus required but not found, please provide a valid interfaces dir')
|
||||
dbus_ifaces_dir = dbus_dep.get_pkgconfig_variable('interfaces_dir')
|
||||
endif
|
||||
|
||||
dbus_sys_dir = get_option('dbus_sys_dir')
|
||||
if dbus_sys_dir == ''
|
||||
assert(dbus_dep.found(), 'D-Bus required but not found, please provide a valid system bus services dir')
|
||||
dbus_sys_dir = dbus_dep.get_pkgconfig_variable('system_bus_services_dir')
|
||||
endif
|
||||
dbus_ifaces_dir = dbus_dep.get_pkgconfig_variable('interfaces_dir', define_variable: ['datadir', nm_datadir])
|
||||
dbus_sys_dir = dbus_dep.get_pkgconfig_variable('system_bus_services_dir', define_variable: ['datadir', nm_datadir])
|
||||
|
||||
# pppd
|
||||
enable_ppp = get_option('ppp')
|
||||
|
|
@ -774,7 +759,7 @@ test_args = [
|
|||
'',
|
||||
enable_valgrind ? valgrind.path() : '',
|
||||
enable_valgrind ? valgrind_suppressions_path : '',
|
||||
'--launch-dbus=auto'
|
||||
'--launch-dbus=auto',
|
||||
]
|
||||
|
||||
py3 = import('python3')
|
||||
|
|
@ -890,7 +875,7 @@ config = 'config.h'
|
|||
configure_file(
|
||||
input: config + '.meson',
|
||||
output: config,
|
||||
configuration: config_h
|
||||
configuration: config_h,
|
||||
)
|
||||
|
||||
config_extra_h = configuration_data()
|
||||
|
|
@ -920,7 +905,7 @@ config_extra_h.set_quoted('SYSCONFDIR', nm_sysconfdir)
|
|||
configure_file(
|
||||
input: 'config-extra.h.meson',
|
||||
output: 'config-extra.h',
|
||||
configuration: config_extra_h
|
||||
configuration: config_extra_h,
|
||||
)
|
||||
|
||||
meson.add_install_script(
|
||||
|
|
@ -931,7 +916,7 @@ meson.add_install_script(
|
|||
nm_pkglibdir,
|
||||
nm_pkgstatedir,
|
||||
enable_docs ? 'install_docs' : '',
|
||||
nm_mandir
|
||||
nm_mandir,
|
||||
)
|
||||
|
||||
output = '\nSystem paths:\n'
|
||||
|
|
@ -952,7 +937,7 @@ output += ' suspend/resume: ' + suspend_resume + '\n'
|
|||
output += ' policykit: ' + enable_polkit.to_string()
|
||||
if enable_polkit
|
||||
modify = (enable_modify_system ? 'permissive' : 'restrictive')
|
||||
output += ' (' + modify + ' modify.system) (default: main.auth-polkit=' + polkit + ')'
|
||||
output += ' (' + modify + ' modify.system) (default: main.auth-polkit=true)'
|
||||
endif
|
||||
output += '\n'
|
||||
output += ' polkit agent: ' + enable_polkit_agent.to_string() + '\n'
|
||||
|
|
|
|||
|
|
@ -3,9 +3,6 @@ option('systemdsystemunitdir', type: 'string', value: '', description: 'Director
|
|||
option('system_ca_path', type: 'string', value: '/etc/ssl/certs', description: 'path to system CA certificates')
|
||||
option('udev_dir', type: 'string', value: '', description: 'Absolute path of the udev base directory. Set to \'no\' not to install the udev rule')
|
||||
option('dbus_conf_dir', type: 'string', value: '', description: 'where D-Bus system.d directory is')
|
||||
option('dbus_ifaces_dir', type: 'string', value: '', description: 'where D-Bus interfaces directory is')
|
||||
option('dbus_sys_dir', type: 'string', value: '', description: 'where D-Bus system service directory is')
|
||||
option('polkit_dir', type: 'string', value: '', description: 'where PolicyKit policy directory is')
|
||||
option('kernel_firmware_dir', type: 'string', value: '/lib/firmware', description: 'where kernel firmware directory is (default is /lib/firmware)')
|
||||
option('iptables', type: 'string', value: '', description: 'path to iptables')
|
||||
option('dnsmasq', type: 'string', value: '', description: 'path to dnsmasq')
|
||||
|
|
@ -16,7 +13,7 @@ option('dist_version', type: 'string', value: '', description: 'Define the NM\'s
|
|||
option('session_tracking_consolekit', type: 'boolean', value: true, description: 'Support consolekit session tracking')
|
||||
option('session_tracking', type: 'combo', choices: ['systemd', 'elogind', 'no'], value: 'systemd', description: 'Compatibility option to choose one session tracking module')
|
||||
option('suspend_resume', type: 'combo', choices: ['upower', 'systemd', 'elogind', 'consolekit', 'auto'], value: 'auto', description: 'Build NetworkManager with specific suspend/resume support')
|
||||
option('polkit', type: 'combo', choices: ['yes', 'no', 'disabled'], value: 'yes', description: 'set default value for auth-polkit configuration option. This value can be overwritten by NM configuration. \'disabled\' compiles NM without any support')
|
||||
option('polkit', type: 'boolean', value: true, description: 'User auth-polkit configuration option.')
|
||||
option('modify_system', type: 'boolean', value: false, description: 'Allow users to modify system connections')
|
||||
option('polkit_agent', type: 'boolean', value: false, description: 'enable polkit agent for clients')
|
||||
option('selinux', type: 'boolean', value: true, description: 'Build with SELinux')
|
||||
|
|
|
|||
|
|
@ -4,7 +4,7 @@ project(
|
|||
version: '3',
|
||||
license: 'Apache',
|
||||
default_options: [
|
||||
'c_std=c11'
|
||||
'c_std=c11',
|
||||
],
|
||||
)
|
||||
project_description = 'Intrusive Red-Black Tree Collection'
|
||||
|
|
|
|||
|
|
@ -4,7 +4,7 @@ project(
|
|||
version: '1',
|
||||
license: 'Apache',
|
||||
default_options: [
|
||||
'c_std=c11'
|
||||
'c_std=c11',
|
||||
]
|
||||
)
|
||||
|
||||
|
|
|
|||
|
|
@ -31,7 +31,7 @@ libcsiphash_shared = shared_library(
|
|||
libcsiphash_dep = declare_dependency(
|
||||
include_directories: include_directories('.'),
|
||||
link_with: libcsiphash_private,
|
||||
version: meson.project_version()
|
||||
version: meson.project_version(),
|
||||
)
|
||||
|
||||
if not meson.is_subproject()
|
||||
|
|
|
|||
|
|
@ -53,7 +53,7 @@ shared_n_acd = static_library(
|
|||
],
|
||||
dependencies: [
|
||||
shared_c_siphash_dep,
|
||||
shared_c_rbtree_dep
|
||||
shared_c_rbtree_dep,
|
||||
],
|
||||
)
|
||||
|
||||
|
|
|
|||
|
|
@ -46,7 +46,7 @@ libnacd_shared = shared_library(
|
|||
link_depends: libnacd_symfile,
|
||||
link_args: [
|
||||
'-Wl,--no-undefined',
|
||||
'-Wl,--version-script=@0@'.format(libnacd_symfile)
|
||||
'-Wl,--version-script=@0@'.format(libnacd_symfile),
|
||||
],
|
||||
)
|
||||
|
||||
|
|
|
|||
|
|
@ -1,11 +1,11 @@
|
|||
sources = files(
|
||||
'nm-atm-manager.c',
|
||||
'nm-device-adsl.c'
|
||||
'nm-device-adsl.c',
|
||||
)
|
||||
|
||||
deps = [
|
||||
libudev_dep,
|
||||
nm_dep
|
||||
nm_dep,
|
||||
]
|
||||
|
||||
libnm_device_plugin_adsl = shared_module(
|
||||
|
|
@ -15,7 +15,7 @@ libnm_device_plugin_adsl = shared_module(
|
|||
link_args: ldflags_linker_script_devices,
|
||||
link_depends: linker_script_devices,
|
||||
install: true,
|
||||
install_dir: nm_plugindir
|
||||
install_dir: nm_plugindir,
|
||||
)
|
||||
|
||||
core_plugins += libnm_device_plugin_adsl
|
||||
|
|
|
|||
|
|
@ -5,12 +5,12 @@ sources = files(
|
|||
'nm-bluez4-manager.c',
|
||||
'nm-bluez5-manager.c',
|
||||
'nm-bt-error.c',
|
||||
'nm-device-bt.c'
|
||||
'nm-device-bt.c',
|
||||
)
|
||||
|
||||
deps = [
|
||||
libnm_wwan_dep,
|
||||
nm_dep
|
||||
nm_dep,
|
||||
]
|
||||
|
||||
if enable_bluez5_dun
|
||||
|
|
@ -27,7 +27,7 @@ libnm_device_plugin_bluetooth = shared_module(
|
|||
link_depends: linker_script_devices,
|
||||
install: true,
|
||||
install_dir: nm_plugindir,
|
||||
install_rpath: nm_plugindir
|
||||
install_rpath: nm_plugindir,
|
||||
)
|
||||
|
||||
core_plugins += libnm_device_plugin_bluetooth
|
||||
|
|
|
|||
|
|
@ -3,12 +3,12 @@ sources = files(
|
|||
'nm-device-ovs-interface.c',
|
||||
'nm-device-ovs-port.c',
|
||||
'nm-ovsdb.c',
|
||||
'nm-ovs-factory.c'
|
||||
'nm-ovs-factory.c',
|
||||
)
|
||||
|
||||
deps = [
|
||||
jansson_dep,
|
||||
nm_dep
|
||||
nm_dep,
|
||||
]
|
||||
|
||||
libnm_device_plugin_ovs = shared_module(
|
||||
|
|
@ -18,7 +18,7 @@ libnm_device_plugin_ovs = shared_module(
|
|||
link_args: ldflags_linker_script_devices,
|
||||
link_depends: linker_script_devices,
|
||||
install: true,
|
||||
install_dir: nm_plugindir
|
||||
install_dir: nm_plugindir,
|
||||
)
|
||||
|
||||
core_plugins += libnm_device_plugin_ovs
|
||||
|
|
|
|||
|
|
@ -1,12 +1,12 @@
|
|||
sources = files(
|
||||
'nm-device-team.c',
|
||||
'nm-team-factory.c'
|
||||
'nm-team-factory.c',
|
||||
)
|
||||
|
||||
deps = [
|
||||
jansson_dep,
|
||||
libteamdctl_dep,
|
||||
nm_dep
|
||||
nm_dep,
|
||||
]
|
||||
|
||||
libnm_device_plugin_team = shared_module(
|
||||
|
|
@ -16,7 +16,7 @@ libnm_device_plugin_team = shared_module(
|
|||
link_args: ldflags_linker_script_devices,
|
||||
link_depends: linker_script_devices,
|
||||
install: true,
|
||||
install_dir: nm_plugindir
|
||||
install_dir: nm_plugindir,
|
||||
)
|
||||
|
||||
core_plugins += libnm_device_plugin_team
|
||||
|
|
|
|||
|
|
@ -1,18 +1,18 @@
|
|||
test_units = [
|
||||
'test-acd',
|
||||
'test-lldp'
|
||||
'test-lldp',
|
||||
]
|
||||
|
||||
foreach test_unit: test_units
|
||||
exe = executable(
|
||||
test_unit,
|
||||
test_unit + '.c',
|
||||
dependencies: test_nm_dep
|
||||
dependencies: test_nm_dep,
|
||||
)
|
||||
|
||||
test(
|
||||
'devices/' + test_unit,
|
||||
test_script,
|
||||
args: test_args + [exe.full_path()]
|
||||
args: test_args + [exe.full_path()],
|
||||
)
|
||||
endforeach
|
||||
|
|
|
|||
|
|
@ -1,13 +1,13 @@
|
|||
common_sources = files(
|
||||
'nm-wifi-ap.c',
|
||||
'nm-wifi-utils.c'
|
||||
'nm-wifi-utils.c',
|
||||
)
|
||||
|
||||
sources = common_sources + files(
|
||||
'nm-wifi-factory.c',
|
||||
'nm-wifi-common.c',
|
||||
'nm-device-wifi.c',
|
||||
'nm-device-olpc-mesh.c'
|
||||
'nm-device-olpc-mesh.c',
|
||||
)
|
||||
|
||||
if enable_iwd
|
||||
|
|
@ -18,7 +18,7 @@ if enable_iwd
|
|||
endif
|
||||
|
||||
deps = [
|
||||
nm_dep
|
||||
nm_dep,
|
||||
]
|
||||
|
||||
libnm_device_plugin_wifi = shared_module(
|
||||
|
|
@ -28,7 +28,7 @@ libnm_device_plugin_wifi = shared_module(
|
|||
link_args: ldflags_linker_script_devices,
|
||||
link_depends: linker_script_devices,
|
||||
install: true,
|
||||
install_dir: nm_plugindir
|
||||
install_dir: nm_plugindir,
|
||||
)
|
||||
|
||||
core_plugins += libnm_device_plugin_wifi
|
||||
|
|
|
|||
|
|
@ -3,11 +3,11 @@ test_unit = 'test-general'
|
|||
exe = executable(
|
||||
'wifi-' + test_unit,
|
||||
[test_unit + '.c'] + common_sources,
|
||||
dependencies: test_nm_dep
|
||||
dependencies: test_nm_dep,
|
||||
)
|
||||
|
||||
test(
|
||||
'devices/wifi/' + test_unit,
|
||||
test_script,
|
||||
args: test_args + [exe.full_path()]
|
||||
args: test_args + [exe.full_path()],
|
||||
)
|
||||
|
|
|
|||
|
|
@ -1,13 +1,13 @@
|
|||
sources = files(
|
||||
'nm-modem-broadband.c',
|
||||
'nm-modem.c',
|
||||
'nm-modem-manager.c'
|
||||
'nm-modem-manager.c',
|
||||
)
|
||||
|
||||
deps = [
|
||||
libsystemd_dep,
|
||||
mm_glib_dep,
|
||||
nm_dep
|
||||
nm_dep,
|
||||
]
|
||||
|
||||
if enable_ofono
|
||||
|
|
@ -25,12 +25,12 @@ libnm_wwan = shared_module(
|
|||
],
|
||||
link_depends: linker_script,
|
||||
install: true,
|
||||
install_dir: nm_plugindir
|
||||
install_dir: nm_plugindir,
|
||||
)
|
||||
|
||||
libnm_wwan_dep = declare_dependency(
|
||||
include_directories: include_directories('.'),
|
||||
link_with: libnm_wwan
|
||||
link_with: libnm_wwan,
|
||||
)
|
||||
|
||||
core_plugins += libnm_wwan
|
||||
|
|
@ -43,7 +43,7 @@ test(
|
|||
|
||||
sources = files(
|
||||
'nm-device-modem.c',
|
||||
'nm-wwan-factory.c'
|
||||
'nm-wwan-factory.c',
|
||||
)
|
||||
|
||||
libnm_device_plugin_wwan = shared_module(
|
||||
|
|
@ -55,7 +55,7 @@ libnm_device_plugin_wwan = shared_module(
|
|||
link_depends: linker_script_devices,
|
||||
install: true,
|
||||
install_dir: nm_plugindir,
|
||||
install_rpath: nm_plugindir
|
||||
install_rpath: nm_plugindir,
|
||||
)
|
||||
|
||||
core_plugins += libnm_device_plugin_wwan
|
||||
|
|
@ -63,7 +63,7 @@ core_plugins += libnm_device_plugin_wwan
|
|||
run_target(
|
||||
'check-local-devices-wwan',
|
||||
command: [check_exports, libnm_device_plugin_wwan.full_path(), linker_script_devices],
|
||||
depends: libnm_device_plugin_wwan
|
||||
depends: libnm_device_plugin_wwan,
|
||||
)
|
||||
|
||||
# FIXME: check_so_symbols replacement
|
||||
|
|
|
|||
|
|
@ -13,7 +13,7 @@ executable(
|
|||
link_args: ldflags_linker_script_binary,
|
||||
link_depends: linker_script_binary,
|
||||
install: true,
|
||||
install_dir: nm_libexecdir
|
||||
install_dir: nm_libexecdir,
|
||||
)
|
||||
|
||||
if enable_tests
|
||||
|
|
|
|||
|
|
@ -1,6 +1,6 @@
|
|||
test_units = [
|
||||
'test-dhcp-dhclient',
|
||||
'test-dhcp-utils'
|
||||
'test-dhcp-utils',
|
||||
]
|
||||
|
||||
foreach test_unit: test_units
|
||||
|
|
@ -13,6 +13,6 @@ foreach test_unit: test_units
|
|||
test(
|
||||
'dhcp/' + test_unit,
|
||||
test_script,
|
||||
args: test_args + [exe.full_path()]
|
||||
args: test_args + [exe.full_path()],
|
||||
)
|
||||
endforeach
|
||||
|
|
|
|||
|
|
@ -9,5 +9,5 @@ exe = executable(
|
|||
test(
|
||||
'dnsmasq/' + test_unit,
|
||||
test_script,
|
||||
args: test_args + [exe.full_path()]
|
||||
args: test_args + [exe.full_path()],
|
||||
)
|
||||
|
|
|
|||
|
|
@ -1,6 +1,6 @@
|
|||
sources = files(
|
||||
'nmi-cmdline-reader.c',
|
||||
'nmi-ibft-reader.c'
|
||||
'nmi-ibft-reader.c',
|
||||
)
|
||||
|
||||
nm_cflags = ['-DNETWORKMANAGER_COMPILATION=NM_NETWORKMANAGER_COMPILATION_DAEMON']
|
||||
|
|
|
|||
|
|
@ -13,11 +13,11 @@ foreach test_unit : test_units
|
|||
test_unit + '.c',
|
||||
dependencies: test_nm_dep,
|
||||
c_args: cflags,
|
||||
link_with: libnmi_core
|
||||
link_with: libnmi_core,
|
||||
)
|
||||
test(
|
||||
'initrd/' + test_unit,
|
||||
test_script,
|
||||
args: test_args + [exe.full_path()]
|
||||
args: test_args + [exe.full_path()],
|
||||
)
|
||||
endforeach
|
||||
|
|
|
|||
|
|
@ -2,7 +2,7 @@ src_inc = include_directories('.')
|
|||
|
||||
install_data(
|
||||
'org.freedesktop.NetworkManager.conf',
|
||||
install_dir: dbus_conf_dir
|
||||
install_dir: dbus_conf_dir,
|
||||
)
|
||||
|
||||
subdir('systemd')
|
||||
|
|
@ -14,7 +14,7 @@ nm_cflags = ['-DNETWORKMANAGER_COMPILATION=NM_NETWORKMANAGER_COMPILATION_DAEMON'
|
|||
nm_dep = declare_dependency(
|
||||
include_directories: src_inc,
|
||||
dependencies: nm_core_dep,
|
||||
compile_args: nm_cflags
|
||||
compile_args: nm_cflags,
|
||||
)
|
||||
|
||||
cflags = nm_cflags
|
||||
|
|
@ -42,7 +42,7 @@ sources = files(
|
|||
'nm-dbus-utils.c',
|
||||
'nm-ip4-config.c',
|
||||
'nm-ip6-config.c',
|
||||
'nm-logging.c'
|
||||
'nm-logging.c',
|
||||
)
|
||||
|
||||
sources += shared_files_time_utils
|
||||
|
|
@ -50,7 +50,7 @@ sources += shared_files_time_utils
|
|||
deps = [
|
||||
libsystemd_dep,
|
||||
libudev_dep,
|
||||
nm_core_dep
|
||||
nm_core_dep,
|
||||
]
|
||||
|
||||
if enable_wext
|
||||
|
|
@ -62,7 +62,7 @@ libnetwork_manager_base = static_library(
|
|||
sources: sources,
|
||||
dependencies: deps,
|
||||
c_args: cflags,
|
||||
link_with: libnm_core
|
||||
link_with: libnm_core,
|
||||
)
|
||||
|
||||
sources = files(
|
||||
|
|
@ -143,7 +143,7 @@ sources = files(
|
|||
'nm-proxy-config.c',
|
||||
'nm-rfkill-manager.c',
|
||||
'nm-session-monitor.c',
|
||||
'nm-sleep-monitor.c'
|
||||
'nm-sleep-monitor.c',
|
||||
)
|
||||
|
||||
nm_deps = [
|
||||
|
|
@ -176,14 +176,14 @@ libnetwork_manager = static_library(
|
|||
sources: sources,
|
||||
dependencies: nm_deps,
|
||||
c_args: cflags,
|
||||
link_with: [libnetwork_manager_base, libsystemd_nm]
|
||||
link_with: [libnetwork_manager_base, libsystemd_nm],
|
||||
)
|
||||
|
||||
deps = [
|
||||
dl_dep,
|
||||
libndp_dep,
|
||||
libudev_dep,
|
||||
nm_core_dep
|
||||
nm_core_dep,
|
||||
]
|
||||
|
||||
name = 'nm-iface-helper'
|
||||
|
|
@ -197,19 +197,19 @@ executable(
|
|||
link_args: ldflags_linker_script_binary,
|
||||
link_depends: linker_script_binary,
|
||||
install: true,
|
||||
install_dir: nm_libexecdir
|
||||
install_dir: nm_libexecdir,
|
||||
)
|
||||
|
||||
if enable_tests
|
||||
sources = files(
|
||||
'ndisc/nm-fake-ndisc.c',
|
||||
'platform/tests/test-common.c',
|
||||
'platform/nm-fake-platform.c'
|
||||
'platform/nm-fake-platform.c',
|
||||
)
|
||||
|
||||
deps = [
|
||||
libudev_dep,
|
||||
nm_core_dep
|
||||
nm_core_dep,
|
||||
]
|
||||
|
||||
test_cflags = ['-DNETWORKMANAGER_COMPILATION_TEST']
|
||||
|
|
@ -222,13 +222,13 @@ if enable_tests
|
|||
sources: sources,
|
||||
dependencies: deps,
|
||||
c_args: cflags + test_cflags,
|
||||
link_with: libnetwork_manager
|
||||
link_with: libnetwork_manager,
|
||||
)
|
||||
|
||||
test_nm_dep = declare_dependency(
|
||||
dependencies: nm_dep,
|
||||
compile_args: test_cflags,
|
||||
link_with: libnetwork_manager_test
|
||||
link_with: libnetwork_manager_test,
|
||||
)
|
||||
|
||||
test_nm_dep_fake = declare_dependency(
|
||||
|
|
@ -284,7 +284,7 @@ ver_script = custom_target(
|
|||
input: meson.source_root(),
|
||||
output: symbol_map_name,
|
||||
depends: [ network_manager_sym, core_plugins ],
|
||||
command: [create_exports_networkmanager, '--called-from-build', '@INPUT@']
|
||||
command: [create_exports_networkmanager, '--called-from-build', '@INPUT@'],
|
||||
)
|
||||
|
||||
ldflags = ['-rdynamic', '-Wl,--version-script,@0@'.format(ver_script.full_path())]
|
||||
|
|
@ -298,7 +298,7 @@ network_manager = executable(
|
|||
link_args: ldflags,
|
||||
link_depends: ver_script,
|
||||
install: true,
|
||||
install_dir: nm_sbindir
|
||||
install_dir: nm_sbindir,
|
||||
)
|
||||
|
||||
if enable_tests
|
||||
|
|
|
|||
|
|
@ -9,7 +9,7 @@ exe = executable(
|
|||
test(
|
||||
'ndisc/' + test_unit,
|
||||
test_script,
|
||||
args: test_args + [exe.full_path()]
|
||||
args: test_args + [exe.full_path()],
|
||||
)
|
||||
|
||||
test = 'test-ndisc-linux'
|
||||
|
|
|
|||
|
|
@ -22,7 +22,7 @@ foreach test_unit: test_units
|
|||
'platform/' + test_unit[0],
|
||||
test_script,
|
||||
timeout: test_unit[3],
|
||||
args: test_args + [exe.full_path()]
|
||||
args: test_args + [exe.full_path()],
|
||||
)
|
||||
endforeach
|
||||
|
||||
|
|
|
|||
|
|
@ -2,7 +2,7 @@ name = 'nm-pppd-plugin'
|
|||
|
||||
deps = [
|
||||
dl_dep,
|
||||
nm_core_dep
|
||||
nm_core_dep,
|
||||
]
|
||||
|
||||
nm_pppd_plugin = shared_module(
|
||||
|
|
@ -16,13 +16,13 @@ nm_pppd_plugin = shared_module(
|
|||
'-DNETWORKMANAGER_COMPILATION=NM_NETWORKMANAGER_COMPILATION_GLIB',
|
||||
],
|
||||
install: true,
|
||||
install_dir: pppd_plugin_dir
|
||||
install_dir: pppd_plugin_dir,
|
||||
)
|
||||
|
||||
name = 'nm-ppp-plugin'
|
||||
|
||||
deps = [
|
||||
nm_dep
|
||||
nm_dep,
|
||||
]
|
||||
|
||||
linker_script = join_paths(meson.current_source_dir(), 'nm-ppp-plugin.ver')
|
||||
|
|
@ -36,5 +36,5 @@ core_plugins += shared_module(
|
|||
],
|
||||
link_depends: linker_script,
|
||||
install: true,
|
||||
install_dir: nm_plugindir
|
||||
install_dir: nm_plugindir,
|
||||
)
|
||||
|
|
|
|||
|
|
@ -8,7 +8,7 @@ libnms_ibft_core = static_library(
|
|||
|
||||
sources = files(
|
||||
'nms-ibft-connection.c',
|
||||
'nms-ibft-plugin.c'
|
||||
'nms-ibft-plugin.c',
|
||||
)
|
||||
|
||||
libnm_settings_plugin_ibft = shared_module(
|
||||
|
|
@ -19,7 +19,7 @@ libnm_settings_plugin_ibft = shared_module(
|
|||
link_args: ldflags_linker_script_settings,
|
||||
link_depends: linker_script_settings,
|
||||
install: true,
|
||||
install_dir: nm_plugindir
|
||||
install_dir: nm_plugindir,
|
||||
)
|
||||
|
||||
core_plugins += libnm_settings_plugin_ibft
|
||||
|
|
@ -29,7 +29,7 @@ core_plugins += libnm_settings_plugin_ibft
|
|||
run_target(
|
||||
'check-local-symbols-settings-ibft',
|
||||
command: [check_so_symbols, libnm_settings_plugin_ibft.full_path()],
|
||||
depends: libnm_settings_plugin_ibft
|
||||
depends: libnm_settings_plugin_ibft,
|
||||
)
|
||||
|
||||
check-local-symbols-settings-ibft: src/settings/plugins/ibft/libnm-settings-plugin-ibft.la
|
||||
|
|
|
|||
|
|
@ -6,11 +6,11 @@ exe = executable(
|
|||
test_unit,
|
||||
test_unit + '.c',
|
||||
dependencies: test_nm_dep,
|
||||
link_with: libnms_ibft_core
|
||||
link_with: libnms_ibft_core,
|
||||
)
|
||||
|
||||
test(
|
||||
'ibft/' + test_unit,
|
||||
test_script,
|
||||
args: test_args + [exe.full_path()]
|
||||
args: test_args + [exe.full_path()],
|
||||
)
|
||||
|
|
|
|||
|
|
@ -1,6 +1,6 @@
|
|||
install_data(
|
||||
'nm-ifcfg-rh.conf',
|
||||
install_dir: dbus_conf_dir
|
||||
install_dir: dbus_conf_dir,
|
||||
)
|
||||
|
||||
name = 'nmdbus-ifcfg-rh'
|
||||
|
|
@ -9,7 +9,7 @@ dbus_sources = gnome.gdbus_codegen(
|
|||
name,
|
||||
'nm-ifcfg-rh.xml',
|
||||
interface_prefix: 'com.redhat',
|
||||
namespace: 'NMDBus'
|
||||
namespace: 'NMDBus',
|
||||
)
|
||||
|
||||
libnmdbus_ifcfg_rh = static_library(
|
||||
|
|
@ -23,11 +23,11 @@ core_sources = files(
|
|||
'nms-ifcfg-rh-reader.c',
|
||||
'nms-ifcfg-rh-utils.c',
|
||||
'nms-ifcfg-rh-writer.c',
|
||||
'shvar.c'
|
||||
'shvar.c',
|
||||
)
|
||||
|
||||
deps = [
|
||||
nm_dep
|
||||
nm_dep,
|
||||
]
|
||||
|
||||
libnms_ifcfg_rh_core = static_library(
|
||||
|
|
@ -46,7 +46,7 @@ libnm_settings_plugin_ifcfg_rh = shared_module(
|
|||
link_args: ldflags_linker_script_settings,
|
||||
link_depends: linker_script_settings,
|
||||
install: true,
|
||||
install_dir: nm_plugindir
|
||||
install_dir: nm_plugindir,
|
||||
)
|
||||
|
||||
core_plugins += libnm_settings_plugin_ifcfg_rh
|
||||
|
|
@ -56,7 +56,7 @@ core_plugins += libnm_settings_plugin_ifcfg_rh
|
|||
run_target(
|
||||
'check-local-symbols-settings-ifcfg-rh',
|
||||
command: [check_so_symbols, libnm_settings_plugin_ifcfg_rh.full_path()],
|
||||
depends: libnm_settings_plugin_ifcfg_rh
|
||||
depends: libnm_settings_plugin_ifcfg_rh,
|
||||
)
|
||||
|
||||
check-local-symbols-settings-ifcfg-rh: src/settings/plugins/ifcfg-rh/libnm-settings-plugin-ifcfg-rh.la
|
||||
|
|
|
|||
|
|
@ -6,12 +6,12 @@ exe = executable(
|
|||
test_unit,
|
||||
test_unit + '.c',
|
||||
dependencies: test_nm_dep,
|
||||
link_with: libnms_ifcfg_rh_core
|
||||
link_with: libnms_ifcfg_rh_core,
|
||||
)
|
||||
|
||||
test(
|
||||
'ifcfg-rh/' + test_unit,
|
||||
test_script,
|
||||
timeout: 90,
|
||||
args: test_args + [exe.full_path()]
|
||||
args: test_args + [exe.full_path()],
|
||||
)
|
||||
|
|
|
|||
|
|
@ -1,11 +1,11 @@
|
|||
sources = files(
|
||||
'nms-ifupdown-interface-parser.c',
|
||||
'nms-ifupdown-parser.c'
|
||||
'nms-ifupdown-parser.c',
|
||||
)
|
||||
|
||||
deps = [
|
||||
libudev_dep,
|
||||
nm_dep
|
||||
nm_dep,
|
||||
]
|
||||
|
||||
libnms_ifupdown_core = static_library(
|
||||
|
|
@ -16,7 +16,7 @@ libnms_ifupdown_core = static_library(
|
|||
|
||||
sources = files(
|
||||
'nms-ifupdown-connection.c',
|
||||
'nms-ifupdown-plugin.c'
|
||||
'nms-ifupdown-plugin.c',
|
||||
)
|
||||
|
||||
libnm_settings_plugin_ifupdown = shared_module(
|
||||
|
|
@ -27,7 +27,7 @@ libnm_settings_plugin_ifupdown = shared_module(
|
|||
link_args: ldflags_linker_script_settings,
|
||||
link_depends: linker_script_settings,
|
||||
install: true,
|
||||
install_dir: nm_plugindir
|
||||
install_dir: nm_plugindir,
|
||||
)
|
||||
|
||||
core_plugins += libnm_settings_plugin_ifupdown
|
||||
|
|
@ -37,7 +37,7 @@ core_plugins += libnm_settings_plugin_ifupdown
|
|||
run_target(
|
||||
'check-local-symbols-settings-ifupdown',
|
||||
command: [check_so_symbols, libnm_settings_plugin_ifupdown.full_path()],
|
||||
depends: libnm_settings_plugin_ifupdown
|
||||
depends: libnm_settings_plugin_ifupdown,
|
||||
)
|
||||
|
||||
check-local-symbols-settings-ifupdown: src/settings/plugins/ifupdown/libnm-settings-plugin-ifupdown.la
|
||||
|
|
|
|||
|
|
@ -4,11 +4,11 @@ exe = executable(
|
|||
test_unit,
|
||||
test_unit + '.c',
|
||||
dependencies: test_nm_dep,
|
||||
link_with: libnms_ifupdown_core
|
||||
link_with: libnms_ifupdown_core,
|
||||
)
|
||||
|
||||
test(
|
||||
'ifupdown/' + test_unit,
|
||||
test_script,
|
||||
args: test_args + [exe.full_path()]
|
||||
args: test_args + [exe.full_path()],
|
||||
)
|
||||
|
|
|
|||
|
|
@ -11,5 +11,5 @@ exe = executable(
|
|||
test(
|
||||
'keyfile/' + test_unit,
|
||||
test_script,
|
||||
args: test_args + [exe.full_path()]
|
||||
args: test_args + [exe.full_path()],
|
||||
)
|
||||
|
|
|
|||
|
|
@ -9,5 +9,5 @@ exe = executable(
|
|||
test(
|
||||
'supplicant/' + test_unit,
|
||||
test_script,
|
||||
args: test_args + [exe.full_path()]
|
||||
args: test_args + [exe.full_path()],
|
||||
)
|
||||
|
|
|
|||
|
|
@ -62,7 +62,7 @@ incs = [
|
|||
'src/libsystemd-network',
|
||||
'src/libsystemd/sd-event',
|
||||
'src/shared',
|
||||
'src/systemd'
|
||||
'src/systemd',
|
||||
)
|
||||
]
|
||||
|
||||
|
|
@ -71,5 +71,5 @@ libsystemd_nm = static_library(
|
|||
sources: sources,
|
||||
include_directories: incs,
|
||||
dependencies: nm_core_dep,
|
||||
c_args: '-DNETWORKMANAGER_COMPILATION=NM_NETWORKMANAGER_COMPILATION_SYSTEMD'
|
||||
c_args: '-DNETWORKMANAGER_COMPILATION=NM_NETWORKMANAGER_COMPILATION_SYSTEMD',
|
||||
)
|
||||
|
|
|
|||
|
|
@ -2,7 +2,7 @@ test_unit = 'test-config'
|
|||
|
||||
sources = files(
|
||||
'nm-test-device.c',
|
||||
'test-config.c'
|
||||
'test-config.c',
|
||||
)
|
||||
|
||||
test_config_dir = meson.current_source_dir()
|
||||
|
|
@ -16,5 +16,5 @@ exe = executable(
|
|||
test(
|
||||
'config/' + test_unit,
|
||||
test_script,
|
||||
args: test_args + [exe.full_path()]
|
||||
args: test_args + [exe.full_path()],
|
||||
)
|
||||
|
|
|
|||
|
|
@ -7,20 +7,20 @@ test_units = [
|
|||
'test-ip6-config',
|
||||
'test-dcb',
|
||||
'test-wired-defname',
|
||||
'test-utils'
|
||||
'test-utils',
|
||||
]
|
||||
|
||||
foreach test_unit: test_units
|
||||
exe = executable(
|
||||
test_unit,
|
||||
test_unit + '.c',
|
||||
dependencies: test_nm_dep
|
||||
dependencies: test_nm_dep,
|
||||
)
|
||||
|
||||
test(
|
||||
'src/' + test_unit,
|
||||
test_script,
|
||||
args: test_args + [exe.full_path()]
|
||||
args: test_args + [exe.full_path()],
|
||||
)
|
||||
endforeach
|
||||
|
||||
|
|
@ -37,11 +37,11 @@ exe = executable(
|
|||
include_directories: src_inc,
|
||||
dependencies: nm_core_dep,
|
||||
c_args: cflags,
|
||||
link_with: libsystemd_nm
|
||||
link_with: libsystemd_nm,
|
||||
)
|
||||
|
||||
test(
|
||||
'src/' + test_unit,
|
||||
test_script,
|
||||
args: test_args + [exe.full_path()]
|
||||
args: test_args + [exe.full_path()],
|
||||
)
|
||||
|
|
|
|||
|
|
@ -2,20 +2,20 @@ gnome.generate_vapi(
|
|||
libnm_name,
|
||||
sources: libnm_gir[0],
|
||||
packages: 'gio-2.0',
|
||||
install: true
|
||||
install: true,
|
||||
)
|
||||
|
||||
if enable_libnm_glib
|
||||
packages = [
|
||||
'dbus-glib-1',
|
||||
'gio-2.0'
|
||||
'gio-2.0',
|
||||
]
|
||||
|
||||
libnm_util_vapi = gnome.generate_vapi(
|
||||
libnm_util_name,
|
||||
sources: libnm_util_gir[0],
|
||||
packages: packages,
|
||||
install: true
|
||||
install: true,
|
||||
)
|
||||
|
||||
gnome.generate_vapi(
|
||||
|
|
@ -23,6 +23,6 @@ if enable_libnm_glib
|
|||
sources: libnm_glib_gir[0],
|
||||
packages: packages + [libnm_util_vapi],
|
||||
gir_dirs: [join_paths(meson.current_build_dir(), '..', 'libnm-util')],
|
||||
install: true
|
||||
install: true,
|
||||
)
|
||||
endif
|
||||
|
|
|
|||
Loading…
Reference in a new issue