[gnome-bluetooth: 1/14] build: Add trailing commas



commit b411df34e634ccd4b5f4619e558c5ffa4736bb26
Author: Iñigo Martínez <inigomartinez gmail com>
Date:   Thu Dec 20 12:57:32 2018 +0100

    build: 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

 docs/reference/libgnome-bluetooth/meson.build |  8 +++---
 lib/meson.build                               | 36 +++++++++++++--------------
 meson.build                                   | 12 ++++-----
 sendto/meson.build                            | 10 ++++----
 4 files changed, 33 insertions(+), 33 deletions(-)
---
diff --git a/docs/reference/libgnome-bluetooth/meson.build b/docs/reference/libgnome-bluetooth/meson.build
index 0ce31a61..dd06de74 100644
--- a/docs/reference/libgnome-bluetooth/meson.build
+++ b/docs/reference/libgnome-bluetooth/meson.build
@@ -6,7 +6,7 @@ private_headers = [
   'bluetooth-fdo-glue.h',
   'bluetooth-settings-obexpush.h',
   'bluetooth-settings-row.h',
-  'gnome-bluetooth-enum-types.h'
+  'gnome-bluetooth-enum-types.h',
 ]
 
 version_conf = configuration_data()
@@ -17,7 +17,7 @@ version_xml = 'version.xml'
 configure_file(
   input: version_xml + '.in',
   output: version_xml,
-  configuration: version_conf
+  configuration: version_conf,
 )
 
 doc_path = join_paths(gnomebt_datadir, 'gtk-doc', 'html', meson.project_name())
@@ -27,7 +27,7 @@ gnome.gtkdoc(
   main_sgml: meson.project_name() + '-docs.sgml',
   src_dir: [
     top_inc,
-    lib_inc
+    lib_inc,
   ],
   dependencies: libgnome_bluetooth_dep,
   scan_args: [
@@ -36,7 +36,7 @@ gnome.gtkdoc(
   ],
   mkdb_args: [
     '--sgml-mode',
-    '--output-format=xml'
+    '--output-format=xml',
   ],
   gobject_typesfile: meson.project_name() + '.types',
   install: true,
diff --git a/lib/meson.build b/lib/meson.build
index 6fc41fe8..685adeab 100644
--- a/lib/meson.build
+++ b/lib/meson.build
@@ -9,12 +9,12 @@ headers = enum_headers + files(
   'bluetooth-chooser-combo.h',
   'bluetooth-filter-widget.h',
   'bluetooth-settings-widget.h',
-  'bluetooth-utils.h'
+  'bluetooth-utils.h',
 )
 
 install_headers(
   headers,
-  subdir: meson.project_name()
+  subdir: meson.project_name(),
 )
 
 sources = files(
@@ -29,7 +29,7 @@ sources = files(
   'bluetooth-settings-row.c',
   'bluetooth-settings-widget.c',
   'bluetooth-utils.c',
-  'pin.c'
+  'pin.c',
 )
 
 built_sources = []
@@ -38,7 +38,7 @@ resource_data = files(
   'bluetooth-pairing-dialog.ui',
   'bluetooth-settings.css',
   'bluetooth-settings-row.ui',
-  'settings.ui'
+  'settings.ui',
 )
 
 built_sources += gnome.compile_resources(
@@ -47,7 +47,7 @@ built_sources += gnome.compile_resources(
   source_dir: '.',
   c_name: 'bluetooth_settings',
   dependencies: resource_data,
-  export: true
+  export: true,
 )
 
 enum_types = 'gnome-bluetooth-enum-types'
@@ -56,7 +56,7 @@ built_sources += gnome.mkenums(
   enum_types,
   sources: headers,
   c_template: enum_types + '.c.template',
-  h_template: enum_types + '.h.template'
+  h_template: enum_types + '.h.template',
 )
 
 client = 'bluetooth-client'
@@ -64,18 +64,18 @@ client = 'bluetooth-client'
 built_sources += gnome.gdbus_codegen(
   client + '-glue',
   client + '.xml',
-  interface_prefix: 'org.bluez'
+  interface_prefix: 'org.bluez',
 )
 
 deps = [
   gtk_dep,
   m_dep,
-  libgbt_dep
+  libgbt_dep,
 ]
 
 cflags = [
   '-DPKGDATADIR="@0@"'.format(gnomebt_pkgdatadir),
-  '-DG_LOG_DOMAIN="Bluetooth"'
+  '-DG_LOG_DOMAIN="Bluetooth"',
 ]
 
 symbol_map = join_paths(meson.current_source_dir(), meson.project_name() + '.map')
@@ -97,13 +97,13 @@ libgnome_bluetooth = shared_library(
   link_args: ldflags,
   link_depends: symbol_map,
   install: true,
-  install_dir: gnomebt_libdir
+  install_dir: gnomebt_libdir,
 )
 
 libgnome_bluetooth_dep = declare_dependency(
   link_with: libgnome_bluetooth,
   include_directories: lib_inc,
-  dependencies: deps
+  dependencies: deps,
 )
 
 pkg.generate(
@@ -115,11 +115,11 @@ pkg.generate(
   subdirs: meson.project_name(),
   requires: [
     'gio-2.0',
-    'gtk+-3.0'
+    'gtk+-3.0',
   ],
   requires_private: 'libudev',
   variables: 'exec_prefix=' + gnomebt_libexecdir,
-  install_dir: join_paths(get_option('libdir'), 'pkgconfig')
+  install_dir: join_paths(get_option('libdir'), 'pkgconfig'),
 )
 
 if enable_gir
@@ -128,7 +128,7 @@ if enable_gir
   gir_incs = [
     'GModule-2.0',
     'GObject-2.0',
-    'Gtk-3.0'
+    'Gtk-3.0',
   ]
 
   gir_extra_args = '--warn-all'
@@ -159,7 +159,7 @@ test_names = [
   'test-deviceselection',
   'test-pairing-dialog',
   'test-pin',
-  'test-settings'
+  'test-settings',
 ]
 
 foreach name: test_names
@@ -169,7 +169,7 @@ foreach name: test_names
     include_directories: top_inc,
     dependencies: deps,
     c_args: cflags,
-    link_with: libgnome_bluetooth
+    link_with: libgnome_bluetooth,
   )
 endforeach
 
@@ -177,12 +177,12 @@ database = 'pin-code-database.xml'
 
 install_data(
   database,
-  install_dir: gnomebt_pkgdatadir
+  install_dir: gnomebt_pkgdatadir,
 )
 
 custom_target(
   database,
   input: database,
   output: database + '.valid',
-  command: [find_program('xmllint'), '--output', '@OUTPUT@', '--valid', '@INPUT']
+  command: [find_program('xmllint'), '--output', '@OUTPUT@', '--valid', '@INPUT'],
 )
diff --git a/meson.build b/meson.build
index de055d83..d22eb2ba 100644
--- a/meson.build
+++ b/meson.build
@@ -3,7 +3,7 @@ project(
   version: '3.28.2',
   license: 'GPL2+',
   default_options: 'buildtype=debugoptimized',
-  meson_version: '>= 0.43.0'
+  meson_version: '>= 0.43.0',
 )
 
 gnomebt_version = meson.project_version()
@@ -75,7 +75,7 @@ common_flags = [
   '-DLIBSOUP_DISABLE_DEPRECATED',
   '-DLIBSOUP_DISABLE_SINGLE_INCLUDES',
   '-DWNCK_DISABLE_DEPRECATED',
-  '-DWNCK_DISABLE_SINGLE_INCLUDES'
+  '-DWNCK_DISABLE_SINGLE_INCLUDES',
 ]
 
 compiler_flags = []
@@ -89,7 +89,7 @@ if get_option('buildtype').contains('debug')
     '-Werror=pointer-arith',
     '-Werror=return-type',
     '-Wnested-externs',
-    '-Wstrict-prototypes'
+    '-Wstrict-prototypes',
   ]
 
   compiler_flags += cc.get_supported_arguments(test_flags)
@@ -103,7 +103,7 @@ libgbt_dep = [ dependency('gio-unix-2.0'),
                dependency('gmodule-2.0'),
                dependency('libcanberra-gtk3'),
                dependency('libnotify', version: '>= 0.7.0'),
-               dependency('libudev')
+               dependency('libudev'),
 ]
 
 gnome = import('gnome')
@@ -126,13 +126,13 @@ subdir('po')
 
 configure_file(
   output: 'config.h',
-  configuration: config_h
+  configuration: config_h,
 )
 
 meson.add_install_script(
   'meson_post_install.py',
   get_option('icon_update') ? 'icon_update' : '',
-  gnomebt_datadir
+  gnomebt_datadir,
 )
 
 output = '\nConfigure summary:\n\n'
diff --git a/sendto/meson.build b/sendto/meson.build
index fc559383..354ec7d5 100644
--- a/sendto/meson.build
+++ b/sendto/meson.build
@@ -5,17 +5,17 @@ executable(
   'main.c',
   include_directories: [
     top_inc,
-    lib_inc
+    lib_inc,
   ],
   dependencies: gtk_dep,
   link_with: libgnome_bluetooth,
   install: true,
-  install_dir: gnomebt_bindir
+  install_dir: gnomebt_bindir,
 )
 
 install_man(
   name + '.1',
-  install_dir: join_paths(gnomebt_mandir, 'man1')
+  install_dir: join_paths(gnomebt_mandir, 'man1'),
 )
 
 desktop_conf = configuration_data()
@@ -26,7 +26,7 @@ desktop = name + '.desktop'
 desktop_in = configure_file(
   input: desktop + '.in.in',
   output: desktop + '.in',
-  configuration: desktop_conf
+  configuration: desktop_conf,
 )
 
 i18n.merge_file (
@@ -36,5 +36,5 @@ i18n.merge_file (
   output: desktop,
   po_dir: po_dir,
   install: true,
-  install_dir: join_paths(gnomebt_datadir, 'applications')
+  install_dir: join_paths(gnomebt_datadir, 'applications'),
 )


[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]