GNOME.org
 

[dconf: 18/21] build: Add trailing commas where necessary

commit 76f60f47e54eae63cf0d979c9260f4aa142177b1
Author: Iñigo Martínez <inigomartinez gmail com>
Date:   Sat Aug 11 14:05:42 2018 +0200

    build: Add trailing commas where necessary
    
    Having trailing commas in place means that if another source file or
    parameter is added to the end of the list or function,  there won't
    be noise when adding the comma to the line above.

 bin/meson.build       |  8 ++++----
 client/meson.build    | 16 ++++++++--------
 common/meson.build    | 14 +++++++-------
 docs/meson.build      |  8 ++++----
 engine/meson.build    |  8 ++++----
 gdbus/meson.build     |  8 ++++----
 gsettings/meson.build |  4 ++--
 gvdb/meson.build      |  6 +++---
 meson.build           |  6 +++---
 service/meson.build   |  8 ++++----
 shm/meson.build       |  4 ++--
 tests/meson.build     |  8 ++++----
 12 files changed, 49 insertions(+), 49 deletions(-)
---
diff --git a/bin/meson.build b/bin/meson.build
index bb6a5d5..5c6e6bc 100644
--- a/bin/meson.build
+++ b/bin/meson.build
@@ -2,13 +2,13 @@ sources = gvdb_builder + libdconf_vapi + files(
   'dconf-dump.vala',
   'dconf-update.vala',
   'dconf.vala',
-  'gvdb.vapi'
+  'gvdb.vapi',
 )
 
 deps = [
   libdconf_common_dep,
   libdconf_dep,
-  valac.find_library('posix')
+  valac.find_library('posix'),
 ]
 
 executable(
@@ -16,12 +16,12 @@ executable(
   sources,
   include_directories: top_inc,
   dependencies: deps,
-  install: true
+  install: true,
 )
 
 if enable_bash_completion
   install_data(
     'completion/dconf',
-    install_dir: completions_dir
+    install_dir: completions_dir,
   )
 endif
diff --git a/client/meson.build b/client/meson.build
index 776665e..703f42d 100644
--- a/client/meson.build
+++ b/client/meson.build
@@ -2,12 +2,12 @@ client_inc = include_directories('.')
 
 install_headers(
   'dconf.h',
-  subdir: 'dconf'
+  subdir: 'dconf',
 )
 
 install_headers(
   'dconf-client.h',
-  subdir: join_paths('dconf', 'client')
+  subdir: join_paths('dconf', 'client'),
 )
 
 sources = files('dconf-client.c')
@@ -20,12 +20,12 @@ libdconf_client = static_library(
   include_directories: top_inc,
   dependencies: libdconf_gdbus_thread_dep,
   c_args: cflags,
-  pic: true
+  pic: true,
 )
 
 libdconf_client_dep = declare_dependency(
   dependencies: gio_dep,
-  link_with: libdconf_client
+  link_with: libdconf_client,
 )
 
 libdconf = shared_library(
@@ -36,13 +36,13 @@ libdconf = shared_library(
   include_directories: top_inc,
   dependencies: deps,
   c_args: cflags,
-  install: true
+  install: true,
 )
 
 libdconf_dep = declare_dependency(
   include_directories: client_inc,
   dependencies: gio_dep,
-  link_with: libdconf
+  link_with: libdconf,
 )
 
 pkg.generate(
@@ -53,7 +53,7 @@ pkg.generate(
   filebase: 'dconf',
   subdirs: 'dconf',
   requires: 'gio-2.0 ' + gio_req_version,
-  variables: 'exec_prefix=${prefix}'
+  variables: 'exec_prefix=${prefix}',
 )
 
 libdconf_vapi = files('dconf.vapi')
@@ -62,5 +62,5 @@ vapi_data = libdconf_vapi + files('dconf.deps')
 
 install_data(
   vapi_data,
-  install_dir: vapi_dir
+  install_dir: vapi_dir,
 )
diff --git a/common/meson.build b/common/meson.build
index 00f27ad..6cf38b5 100644
--- a/common/meson.build
+++ b/common/meson.build
@@ -3,18 +3,18 @@ common_inc = include_directories('.')
 headers = files(
   'dconf-changeset.h',
   'dconf-enums.h',
-  'dconf-paths.h'
+  'dconf-paths.h',
 )
 
 install_headers(
   headers,
-  subdir: join_paths('dconf', 'common')
+  subdir: join_paths('dconf', 'common'),
 )
 
 sources = files(
   'dconf-changeset.c',
   'dconf-error.c',
-  'dconf-paths.c'
+  'dconf-paths.c',
 )
 
 cflags = ['-DG_LOG_DOMAIN="dconf"']
@@ -25,12 +25,12 @@ libdconf_common = static_library(
   include_directories: top_inc,
   dependencies: glib_dep,
   c_args: cflags,
-  pic: true
+  pic: true,
 )
 
 libdconf_common_dep = declare_dependency(
   dependencies: glib_dep,
-  link_with: libdconf_common
+  link_with: libdconf_common,
 )
 
 cflags += cc.get_supported_arguments('-fvisibility=hidden')
@@ -41,10 +41,10 @@ libdconf_common_hidden = static_library(
   include_directories: top_inc,
   dependencies: glib_dep,
   c_args: cflags,
-  pic: true
+  pic: true,
 )
 
 libdconf_common_hidden_dep = declare_dependency(
   dependencies: glib_dep,
-  link_with: libdconf_common_hidden
+  link_with: libdconf_common_hidden,
 )
diff --git a/docs/meson.build b/docs/meson.build
index 46905fd..d510464 100644
--- a/docs/meson.build
+++ b/docs/meson.build
@@ -10,7 +10,7 @@ if get_option('gtk_doc')
     scan_args: '--rebuild-types',
     gobject_typesfile: 'dconf.types',
     install: true,
-    install_dir: join_paths(dconf_prefix, gnome.gtkdoc_html_dir('dconf'))
+    install_dir: join_paths(dconf_prefix, gnome.gtkdoc_html_dir('dconf')),
   )
 endif
 
@@ -28,13 +28,13 @@ if get_option('man')
     '--stringparam', 'man.authors.section.enabled', '0',
     '--stringparam', 'man.copyright.section.enabled', '0',
     'http://docbook.sourceforge.net/release/xsl/current/manpages/docbook.xsl',
-    '@INPUT@'
+    '@INPUT@',
   ]
 
   mans = [
     ['dconf-service.xml', 'dconf-service', '1'],
     ['dconf-tool.xml', 'dconf', '1'],
-    ['dconf-overview.xml', 'dconf', '7']
+    ['dconf-overview.xml', 'dconf', '7'],
   ]
 
   foreach man: mans
@@ -47,7 +47,7 @@ if get_option('man')
       output: output,
       command: xsltproc_cmd,
       install: true,
-      install_dir: join_paths(dconf_mandir, man_dir)
+      install_dir: join_paths(dconf_mandir, man_dir),
     )
   endforeach
 endif
diff --git a/engine/meson.build b/engine/meson.build
index 0705c75..e81d6c1 100644
--- a/engine/meson.build
+++ b/engine/meson.build
@@ -5,12 +5,12 @@ sources = files(
   'dconf-engine-source-file.c',
   'dconf-engine-source-user.c',
   'dconf-engine-source-service.c',
-  'dconf-engine-source-system.c'
+  'dconf-engine-source-system.c',
 )
 
 deps = [
   libdconf_common_dep,
-  libgvdb_dep
+  libgvdb_dep,
 ]
 
 libdconf_engine = static_library(
@@ -19,10 +19,10 @@ libdconf_engine = static_library(
   include_directories: top_inc,
   dependencies: deps + [libdconf_shm_dep],
   c_args: '-DG_LOG_DOMAIN="dconf"',
-  pic: true
+  pic: true,
 )
 
 libdconf_engine_dep = declare_dependency(
   dependencies: deps,
-  link_with: libdconf_engine
+  link_with: libdconf_engine,
 )
diff --git a/gdbus/meson.build b/gdbus/meson.build
index 666824f..ca07019 100644
--- a/gdbus/meson.build
+++ b/gdbus/meson.build
@@ -6,12 +6,12 @@ libdconf_gdbus_thread = static_library(
   include_directories: top_inc,
   dependencies: libdconf_engine_dep,
   c_args: cflags,
-  pic: true
+  pic: true,
 )
 
 libdconf_gdbus_thread_dep = declare_dependency(
   dependencies: libdconf_engine_dep,
-  link_with: libdconf_gdbus_thread
+  link_with: libdconf_gdbus_thread,
 )
 
 libdconf_gdbus_filter = static_library(
@@ -20,10 +20,10 @@ libdconf_gdbus_filter = static_library(
   include_directories: top_inc,
   dependencies: libdconf_engine_dep,
   c_args: cflags,
-  pic: true
+  pic: true,
 )
 
 libdconf_gdbus_filter_dep = declare_dependency(
   dependencies: libdconf_engine_dep,
-  link_with: libdconf_gdbus_filter
+  link_with: libdconf_gdbus_filter,
 )
diff --git a/gsettings/meson.build b/gsettings/meson.build
index 29fc7c5..aca21f0 100644
--- a/gsettings/meson.build
+++ b/gsettings/meson.build
@@ -1,6 +1,6 @@
 deps = [
   libdconf_common_hidden_dep,
-  libdconf_gdbus_thread_dep
+  libdconf_gdbus_thread_dep,
 ]
 
 libdconf_settings = shared_library(
@@ -10,7 +10,7 @@ libdconf_settings = shared_library(
   dependencies: deps,
   c_args: '-DG_LOG_DOMAIN="dconf"',
   install: true,
-  install_dir: gio_module_dir
+  install_dir: gio_module_dir,
 )
 
 envs = test_env + [
diff --git a/gvdb/meson.build b/gvdb/meson.build
index ebd23b4..3f774dd 100644
--- a/gvdb/meson.build
+++ b/gvdb/meson.build
@@ -4,7 +4,7 @@ sources = gvdb_builder + files('gvdb-reader.c')
 
 deps = [
   gio_dep,
-  glib_dep
+  glib_dep,
 ]
 
 libgvdb = static_library(
@@ -13,10 +13,10 @@ libgvdb = static_library(
   include_directories: top_inc,
   dependencies: deps,
   c_args: '-DG_LOG_DOMAIN="gvdb (via dconf)"',
-  pic: true
+  pic: true,
 )
 
 libgvdb_dep = declare_dependency(
   dependencies: deps,
-  link_with: libgvdb
+  link_with: libgvdb,
 )
diff --git a/meson.build b/meson.build
index 780e820..3aef1b9 100644
--- a/meson.build
+++ b/meson.build
@@ -2,7 +2,7 @@ project(
   'dconf', ['c', 'vala'],
   version: '0.28.0',
   license: 'LGPL2.1+',
-  meson_version: '>= 0.43.0'
+  meson_version: '>= 0.43.0',
 )
 
 dconf_prefix = get_option('prefix')
@@ -28,7 +28,7 @@ if get_option('buildtype').contains('debug')
   common_flags += cc.get_supported_arguments([
     '-fno-common',
     '-Wmissing-prototypes',
-    '-Wwrite-strings'
+    '-Wwrite-strings',
   ])
 endif
 
@@ -52,7 +52,7 @@ endif
 
 configure_file(
   output: 'config.h',
-  configuration: configuration_data()
+  configuration: configuration_data(),
 )
 
 test_env = [
diff --git a/service/meson.build b/service/meson.build
index b8c6f03..342c883 100644
--- a/service/meson.build
+++ b/service/meson.build
@@ -8,7 +8,7 @@ configure_file(
   output: service,
   configuration: service_conf,
   install: true,
-  install_dir: dbus_session_service_dir
+  install_dir: dbus_session_service_dir,
 )
 
 sources = [
@@ -18,14 +18,14 @@ sources = [
   'dconf-service.c',
   'dconf-shm-writer.c',
   'dconf-writer.c',
-  'main.c'
+  'main.c',
 ]
 
 sources += gnome.gdbus_codegen(
   'dconf-generated',
   dconf_namespace + '.xml',
   interface_prefix: dconf_namespace + '.',
-  namespace: 'DConfDBus'
+  namespace: 'DConfDBus',
 )
 
 deps = [
@@ -41,5 +41,5 @@ executable(
   include_directories: top_inc,
   dependencies: deps,
   install: true,
-  install_dir: dconf_libexecdir
+  install_dir: dconf_libexecdir,
 )
diff --git a/shm/meson.build b/shm/meson.build
index 42fe03a..57a9852 100644
--- a/shm/meson.build
+++ b/shm/meson.build
@@ -4,10 +4,10 @@ libdconf_shm = static_library(
   include_directories: top_inc,
   dependencies: glib_dep,
   c_args: '-DG_LOG_DOMAIN="dconf"',
-  pic: true
+  pic: true,
 )
 
 libdconf_shm_dep = declare_dependency(
   dependencies: glib_dep,
-  link_with: libdconf_shm
+  link_with: libdconf_shm,
 )
diff --git a/tests/meson.build b/tests/meson.build
index 96e45dc..ef0b940 100644
--- a/tests/meson.build
+++ b/tests/meson.build
@@ -1,13 +1,13 @@
 sources = files(
   'dconf-mock-dbus.c',
   'dconf-mock-gvdb.c',
-  'dconf-mock-shm.c'
+  'dconf-mock-shm.c',
 )
 
 libdconf_mock = static_library(
   'dconf-mock',
   sources: sources,
-  dependencies: glib_dep
+  dependencies: glib_dep,
 )
 
 envs = test_env + [
@@ -29,7 +29,7 @@ unit_tests = [
   ['gdbus-thread', 'dbus.c', '-DDBUS_BACKEND="/gdbus/thread"', libdconf_gdbus_thread_dep, []],
   ['gdbus-filter', 'dbus.c', '-DDBUS_BACKEND="/gdbus/filter"', libdconf_gdbus_filter_dep, []],
   ['engine', 'engine.c', '-DSRCDIR="@0@"'.format(test_dir), [dl_dep, libdconf_engine_dep, m_dep], 
libdconf_mock],
-  ['client', 'client.c', '-DSRCDIR="@0@"'.format(test_dir), [libdconf_client_dep, libdconf_engine_dep], 
libdconf_mock]
+  ['client', 'client.c', '-DSRCDIR="@0@"'.format(test_dir), [libdconf_client_dep, libdconf_engine_dep], 
libdconf_mock],
 ]
 
 foreach unit_test: unit_tests
@@ -38,7 +38,7 @@ foreach unit_test: unit_tests
     unit_test[1],
     c_args: unit_test[2],
     dependencies: unit_test[3],
-    link_with: unit_test[4]
+    link_with: unit_test[4],
   )
 
   test(unit_test[0], exe, is_parallel: false, env: envs)
[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]