summaryrefslogtreecommitdiff
path: root/clients
diff options
context:
space:
mode:
authorIñigo Martínez <inigomartinez@gmail.com>2018-10-18 12:50:20 +0200
committerThomas Haller <thaller@redhat.com>2018-12-20 13:50:34 +0100
commit35171b3c3f850a9136e48d12ead389ee80842268 (patch)
treeaf3aaf34027fe82e311c5f46d8fbe7c710ed3116 /clients
parentb00e004890b9c39fec4fe543bb95fdc263e774bc (diff)
downloadNetworkManager-35171b3c3f850a9136e48d12ead389ee80842268.tar.gz
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
Diffstat (limited to 'clients')
-rw-r--r--clients/cli/meson.build8
-rw-r--r--clients/common/meson.build16
-rw-r--r--clients/common/tests/meson.build4
-rw-r--r--clients/meson.build4
-rw-r--r--clients/tui/meson.build8
-rw-r--r--clients/tui/newt/meson.build6
6 files changed, 23 insertions, 23 deletions
diff --git a/clients/cli/meson.build b/clients/cli/meson.build
index c5669c9694..11fe1cd153 100644
--- a/clients/cli/meson.build
+++ b/clients/cli/meson.build
@@ -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,
)
diff --git a/clients/common/meson.build b/clients/common/meson.build
index 30fd2cfa96..af54cec04e 100644
--- a/clients/common/meson.build
+++ b/clients/common/meson.build
@@ -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
diff --git a/clients/common/tests/meson.build b/clients/common/tests/meson.build
index cc357cdc8c..060bab48c5 100644
--- a/clients/common/tests/meson.build
+++ b/clients/common/tests/meson.build
@@ -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()],
)
diff --git a/clients/meson.build b/clients/meson.build
index 68170c4a63..1b98ebcbe9 100644
--- a/clients/meson.build
+++ b/clients/meson.build
@@ -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')
diff --git a/clients/tui/meson.build b/clients/tui/meson.build
index 5f7f0fbb50..461b1f0a77 100644
--- a/clients/tui/meson.build
+++ b/clients/tui/meson.build
@@ -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,
)
diff --git a/clients/tui/newt/meson.build b/clients/tui/newt/meson.build
index aeec39dad0..5bb713d313 100644
--- a/clients/tui/newt/meson.build
+++ b/clients/tui/newt/meson.build
@@ -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,
)