diff options
author | Iñigo Martínez <inigomartinez@gmail.com> | 2018-12-17 15:48:39 +0100 |
---|---|---|
committer | Iñigo Martínez <inigomartinez@gmail.com> | 2019-01-04 16:33:53 +0100 |
commit | f4ee93b06cfc4d9f727f9174e40d08097a25d571 (patch) | |
tree | 6dd68ea2ec3540a8a835c3f479373273995130e9 /monitor | |
parent | c25bc351bb2605e57bc9a6d9250c9d4748c3d9e0 (diff) | |
download | gvfs-f4ee93b06cfc4d9f727f9174e40d08097a25d571.tar.gz |
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
Diffstat (limited to 'monitor')
-rw-r--r-- | monitor/afc/meson.build | 8 | ||||
-rw-r--r-- | monitor/goa/meson.build | 8 | ||||
-rw-r--r-- | monitor/gphoto2/meson.build | 8 | ||||
-rw-r--r-- | monitor/meson.build | 6 | ||||
-rw-r--r-- | monitor/mtp/meson.build | 8 | ||||
-rw-r--r-- | monitor/proxy/meson.build | 18 | ||||
-rw-r--r-- | monitor/udisks2/meson.build | 8 |
7 files changed, 32 insertions, 32 deletions
diff --git a/monitor/afc/meson.build b/monitor/afc/meson.build index 741f64e5..ff1177ca 100644 --- a/monitor/afc/meson.build +++ b/monitor/afc/meson.build @@ -1,7 +1,7 @@ sources = files( 'afcvolumemonitordaemon.c', 'afcvolume.c', - 'afcvolumemonitor.c' + 'afcvolumemonitor.c', ) deps = [ @@ -9,13 +9,13 @@ deps = [ gobject_dep, libimobiledevice_dep, libplist_dep, - libgvfsproxyvolumemonitordaemon_noin_dep + libgvfsproxyvolumemonitordaemon_noin_dep, ] cflags = [ '-DG_LOG_DOMAIN="GVFS-AFC"', '-DGIO_MODULE_DIR="@0@"'.format(gio_module_dir), - '-DGVFS_LOCALEDIR="@0@"'.format(gvfs_localedir) + '-DGVFS_LOCALEDIR="@0@"'.format(gvfs_localedir), ] executable( @@ -26,5 +26,5 @@ executable( c_args: cflags, install: true, install_rpath: gvfs_rpath, - install_dir: gvfs_libexecdir + install_dir: gvfs_libexecdir, ) diff --git a/monitor/goa/meson.build b/monitor/goa/meson.build index 563d380c..e9f13bdf 100644 --- a/monitor/goa/meson.build +++ b/monitor/goa/meson.build @@ -1,20 +1,20 @@ sources = files( 'goavolumemonitordaemon.c', 'goavolume.c', - 'goavolumemonitor.c' + 'goavolumemonitor.c', ) deps = [ glib_dep, goa_dep, gobject_dep, - libgvfsproxyvolumemonitordaemon_noin_dep + libgvfsproxyvolumemonitordaemon_noin_dep, ] cflags = [ '-DG_LOG_DOMAIN="GVFS-GOA"', '-DGIO_MODULE_DIR="@0@"'.format(gio_module_dir), - '-DGVFS_LOCALEDIR="@0@"'.format(gvfs_localedir) + '-DGVFS_LOCALEDIR="@0@"'.format(gvfs_localedir), ] executable( @@ -25,5 +25,5 @@ executable( c_args: cflags, install: true, install_rpath: gvfs_rpath, - install_dir: gvfs_libexecdir + install_dir: gvfs_libexecdir, ) diff --git a/monitor/gphoto2/meson.build b/monitor/gphoto2/meson.build index 63b4e8c7..76a0768e 100644 --- a/monitor/gphoto2/meson.build +++ b/monitor/gphoto2/meson.build @@ -1,7 +1,7 @@ sources = files( 'gphoto2-volume-monitor-daemon.c', 'ggphoto2volume.c', - 'ggphoto2volumemonitor.c' + 'ggphoto2volumemonitor.c', ) deps = [ @@ -9,13 +9,13 @@ deps = [ gobject_dep, libgphoto2_dep, libgvfscommon_gphoto2_dep, - libgvfsproxyvolumemonitordaemon_noin_dep + libgvfsproxyvolumemonitordaemon_noin_dep, ] cflags = [ '-DG_LOG_DOMAIN="GVFS-GPhoto2"', '-DGIO_MODULE_DIR="@0@"'.format(gio_module_dir), - '-DGVFS_LOCALEDIR="@0@"'.format(gvfs_localedir) + '-DGVFS_LOCALEDIR="@0@"'.format(gvfs_localedir), ] executable( @@ -26,5 +26,5 @@ executable( c_args: cflags, install: true, install_rpath: gvfs_rpath, - install_dir: gvfs_libexecdir + install_dir: gvfs_libexecdir, ) diff --git a/monitor/meson.build b/monitor/meson.build index 53e18806..15934e7f 100644 --- a/monitor/meson.build +++ b/monitor/meson.build @@ -39,7 +39,7 @@ foreach monitor: monitors output: service, install: true, install_dir: systemd_user_unit_dir, - configuration: service_conf + configuration: service_conf, ) dbus_systemd_service = 'SystemdService=' + service @@ -49,7 +49,7 @@ foreach monitor: monitors install_data( monitor_data, - install_dir: gvfs_remote_volume_monitors_dir + install_dir: gvfs_remote_volume_monitors_dir, ) dbus_service_conf = configuration_data() @@ -62,7 +62,7 @@ foreach monitor: monitors output: dbus_service + '.service', install: true, install_dir: dbus_service_dir, - configuration: dbus_service_conf + configuration: dbus_service_conf, ) if monitor[1] diff --git a/monitor/mtp/meson.build b/monitor/mtp/meson.build index ec94c688..0b107871 100644 --- a/monitor/mtp/meson.build +++ b/monitor/mtp/meson.build @@ -1,20 +1,20 @@ sources = files( 'mtp-volume-monitor-daemon.c', 'gmtpvolume.c', - 'gmtpvolumemonitor.c' + 'gmtpvolumemonitor.c', ) deps = [ gio_unix_dep, gobject_dep, libgvfscommon_gphoto2_dep, - libgvfsproxyvolumemonitordaemon_noin_dep + libgvfsproxyvolumemonitordaemon_noin_dep, ] cflags = [ '-DG_LOG_DOMAIN="GVFS-MTP"', '-DGIO_MODULE_DIR="@0@"'.format(gio_module_dir), - '-DGVFS_LOCALEDIR="@0@"'.format(gvfs_localedir) + '-DGVFS_LOCALEDIR="@0@"'.format(gvfs_localedir), ] executable( @@ -25,5 +25,5 @@ executable( c_args: cflags, install: true, install_rpath: gvfs_rpath, - install_dir: gvfs_libexecdir + install_dir: gvfs_libexecdir, ) diff --git a/monitor/proxy/meson.build b/monitor/proxy/meson.build index d2bc2cdb..fb285ebd 100644 --- a/monitor/proxy/meson.build +++ b/monitor/proxy/meson.build @@ -2,7 +2,7 @@ dbus_sources = gnome.gdbus_codegen( 'gvfsvolumemonitordbus', 'dbus-interfaces.xml', interface_prefix: 'org.gtk.Private.', - namespace: 'GVfs' + namespace: 'GVfs', ) sources = files( @@ -12,19 +12,19 @@ sources = files( 'gproxymountoperation.c', 'gproxyshadowmount.c', 'gproxyvolume.c', - 'gproxyvolumemonitor.c' + 'gproxyvolumemonitor.c', ) deps = [ gio_unix_dep, - libgvfscommon_dep + libgvfscommon_dep, ] cflags = [ '-DG_LOG_DOMAIN="GVFS-RemoteVolumeMonitor"', '-DGIO_MODULE_DIR="@0@"'.format(gio_module_dir), '-DGVFS_LOCALEDIR="@0@"'.format(gvfs_localedir), - '-DREMOTE_VOLUME_MONITORS_DIR="@0@"'.format(gvfs_remote_volume_monitors_dir) + '-DREMOTE_VOLUME_MONITORS_DIR="@0@"'.format(gvfs_remote_volume_monitors_dir), ] symbol_map = join_paths(meson.current_source_dir(), 'symbol.map') @@ -44,7 +44,7 @@ libgioremote_volume_monitor = shared_module( link_depends: symbol_map, install: true, install_rpath: gvfs_rpath, - install_dir: gio_module_dir + install_dir: gio_module_dir, ) sources = files('gvfsproxyvolumemonitordaemon.c') @@ -52,12 +52,12 @@ sources = files('gvfsproxyvolumemonitordaemon.c') deps = [ gio_dep, gio_unix_dep, - glib_dep + glib_dep, ] cflags = [ '-DG_LOG_DOMAIN="GVFS-RemoteVolumeMonitorDaemon"', - '-DGVFS_LOCALEDIR="@0@"'.format(gvfs_localedir) + '-DGVFS_LOCALEDIR="@0@"'.format(gvfs_localedir), ] libgvfsproxyvolumemonitordaemon_noin = static_library( @@ -65,11 +65,11 @@ libgvfsproxyvolumemonitordaemon_noin = static_library( sources: sources + [dbus_sources], include_directories: top_inc, dependencies: deps, - c_args: cflags + c_args: cflags, ) libgvfsproxyvolumemonitordaemon_noin_dep = declare_dependency( include_directories: include_directories('.'), dependencies: gio_dep, - link_with: libgvfsproxyvolumemonitordaemon_noin + link_with: libgvfsproxyvolumemonitordaemon_noin, ) diff --git a/monitor/udisks2/meson.build b/monitor/udisks2/meson.build index 26ccc142..19cd852a 100644 --- a/monitor/udisks2/meson.build +++ b/monitor/udisks2/meson.build @@ -4,7 +4,7 @@ sources = files( 'gvfsudisks2mount.c', 'gvfsudisks2utils.c', 'gvfsudisks2volume.c', - 'gvfsudisks2volumemonitor.c' + 'gvfsudisks2volumemonitor.c', ) deps = [ @@ -14,7 +14,7 @@ deps = [ gudev_dep, libgvfscommon_monitor_dep, libgvfsproxyvolumemonitordaemon_noin_dep, - udisks2_dep + udisks2_dep, ] if enable_logind @@ -30,7 +30,7 @@ cflags = [ '-DG_DISABLE_DEPRECATED', '-DGIO_MODULE_DIR="@0@"'.format(gio_module_dir), '-DGVFS_LOCALEDIR="@0@"'.format(gvfs_localedir), - '-DUDISKS_API_IS_SUBJECT_TO_CHANGE' + '-DUDISKS_API_IS_SUBJECT_TO_CHANGE', ] executable( @@ -41,5 +41,5 @@ executable( c_args: cflags, install: true, install_rpath: gvfs_rpath, - install_dir: gvfs_libexecdir + install_dir: gvfs_libexecdir, ) |