Commit 35171b3c authored by Inigo Martínez's avatar Inigo Martínez Committed by Thomas Haller

build: meson: Add trailing commas

Add missing trailing commas that avoids getting noise when another
file/parameter is added and eases reviewing changes[0].

[0] https://gitlab.gnome.org/GNOME/dconf/merge_requests/11#note_291585
parent b00e0048
......@@ -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,
)
......@@ -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
......
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',
]