meson: move files' closing brace to separate line

diff --git a/src/home/meson.build b/src/home/meson.build
index 2b48a1a1611e9a38e10d60bd8e7bca961537613a..3d3a2bc82a6ca4812156b2b80701f32003dd88a7 100644 (file)
--- a/src/home/meson.build
+++ b/src/home/meson.build
@@ -24,7 +24,8 @@ systemd_homework_sources = files(
         'homework.c',
         'homework.h',
         'user-record-util.c',
-        'user-record-util.h')
+        'user-record-util.h',
+)
 
 if conf.get('HAVE_P11KIT') == 1
         systemd_homework_sources += files('homework-pkcs11.c')
@@ -58,7 +59,8 @@ systemd_homed_sources = files(
         'user-record-sign.c',
         'user-record-sign.h',
         'user-record-util.c',
-        'user-record-util.h')
+        'user-record-util.h',
+)
 
 homed_gperf_c = custom_target(
         'homed_gperf.c',
@@ -81,7 +83,8 @@ homectl_sources = files(
         'user-record-pwquality.c',
         'user-record-pwquality.h',
         'user-record-util.c',
-        'user-record-util.h')
+        'user-record-util.h',
+)
 
 pam_systemd_home_sym = 'src/home/pam_systemd_home.sym'
 pam_systemd_home_c = files(
@@ -89,7 +92,8 @@ pam_systemd_home_c = files(
         'home-util.h',
         'pam_systemd_home.c',
         'user-record-util.c',
-        'user-record-util.h')
+        'user-record-util.h',
+)
 
 if conf.get('ENABLE_HOMED') == 1
         install_data('org.freedesktop.home1.conf',

diff --git a/src/journal-remote/meson.build b/src/journal-remote/meson.build
index 5bd93904c5cfb450aade0e5d7c349217c232187e..4bbbc1431fd04a624676112c585a0ded37b4a946 100644 (file)
--- a/src/journal-remote/meson.build
+++ b/src/journal-remote/meson.build
@@ -3,7 +3,8 @@
 systemd_journal_upload_sources = files(
         'journal-upload.h',
         'journal-upload.c',
-        'journal-upload-journal.c')
+        'journal-upload-journal.c',
+)
 
 libsystemd_journal_remote_sources = files(
         'journal-remote-parse.h',
@@ -11,12 +12,14 @@ libsystemd_journal_remote_sources = files(
         'journal-remote-write.h',
         'journal-remote-write.c',
         'journal-remote.h',
-        'journal-remote.c')
+        'journal-remote.c',
+)
 
 if conf.get('HAVE_MICROHTTPD') == 1
         libsystemd_journal_remote_sources += files(
                 'microhttpd-util.h',
-                'microhttpd-util.c')
+                'microhttpd-util.c',
+        )
 endif
 
 libsystemd_journal_remote = static_library(
@@ -36,7 +39,8 @@ systemd_journal_remote_sources = files('journal-remote-main.c')
 systemd_journal_gatewayd_sources = files(
         'journal-gatewayd.c',
         'microhttpd-util.h',
-        'microhttpd-util.c')
+        'microhttpd-util.c',
+)
 
 in_files = [
         ['journal-upload.conf',

diff --git a/src/journal/meson.build b/src/journal/meson.build
index 3bb375f69ea8b7a3655f763d806ae46534edf0a9..1e41ea149b02762e6b3b8a12e2b7452327a1d150 100644 (file)
--- a/src/journal/meson.build
+++ b/src/journal/meson.build
@@ -22,7 +22,8 @@ sources = files(
         'journald-wall.c',
         'journald-wall.h',
         'managed-journal-file.c',
-        'managed-journal-file.h')
+        'managed-journal-file.h',
+)
 
 sources += custom_target(
         'journald-gperf.c',
@@ -41,7 +42,8 @@ journal_includes = [includes, include_directories('.')]
 
 systemd_journald_sources = files(
         'journald.c',
-        'journald-server.h')
+        'journald-server.h',
+)
 
 systemd_cat_sources = files('cat.c')
 

diff --git a/src/libsystemd-network/meson.build b/src/libsystemd-network/meson.build
index b4407051ff91257079c0e35a368294c8fe4e4af1..0aa96b68385611eb59cc7eaaba5d7c91f41ae91c 100644 (file)
--- a/src/libsystemd-network/meson.build
+++ b/src/libsystemd-network/meson.build
@@ -45,7 +45,8 @@ sources = files(
         'sd-lldp-rx.c',
         'sd-lldp-tx.c',
         'sd-ndisc.c',
-        'sd-radv.c')
+        'sd-radv.c',
+)
 
 libsystemd_network = static_library(
         'systemd-network',

diff --git a/src/libsystemd/meson.build b/src/libsystemd/meson.build
index 612f5226b0ba797018de1a57286c9dc651c432d1..67b439a5dd56c54838938a4cdbdac46629bc9a90 100644 (file)
--- a/src/libsystemd/meson.build
+++ b/src/libsystemd/meson.build
@@ -21,14 +21,16 @@ sd_journal_sources = files(
         'sd-journal/lookup3.h',
         'sd-journal/mmap-cache.c',
         'sd-journal/mmap-cache.h',
-        'sd-journal/sd-journal.c')
+        'sd-journal/sd-journal.c',
+)
 
 if conf.get('HAVE_GCRYPT') == 1
         sd_journal_sources += files(
                 'sd-journal/fsprg.c',
                 'sd-journal/fsprg.h',
                 'sd-journal/journal-authenticate.c',
-                'sd-journal/journal-authenticate.h')
+                'sd-journal/journal-authenticate.h',
+        )
 endif
 
 audit_type_includes = [config_h,
@@ -59,7 +61,8 @@ sd_journal_sources += [audit_type_to_name]
 id128_sources = files(
         'sd-id128/id128-util.c',
         'sd-id128/id128-util.h',
-        'sd-id128/sd-id128.c')
+        'sd-id128/sd-id128.c',
+)
 
 ############################################################
 
@@ -71,7 +74,8 @@ sd_event_sources = files(
         'sd-event/event-source.h',
         'sd-event/event-util.c',
         'sd-event/event-util.h',
-        'sd-event/sd-event.c')
+        'sd-event/sd-event.c',
+)
 
 ############################################################
 

diff --git a/src/locale/meson.build b/src/locale/meson.build
index f55c8f4a3a8a04d0b83726588d58c25967954e04..72c44aedcf8e4edadaa7c56cc9a84cfb66902b92 100644 (file)
--- a/src/locale/meson.build
+++ b/src/locale/meson.build
@@ -3,7 +3,8 @@
 systemd_localed_sources = files(
         'localed.c',
         'keymap-util.c',
-        'keymap-util.h')
+        'keymap-util.h',
+)
 
 localectl_sources = files('localectl.c')
 

diff --git a/src/login/meson.build b/src/login/meson.build
index 000a5f9d96a913e47672eb401e47aa2b766c7997..1a2d738e840de8b8bd32861ff4ff90f60adbf85d 100644 (file)
--- a/src/login/meson.build
+++ b/src/login/meson.build
@@ -2,7 +2,8 @@
 
 systemd_logind_sources = files(
         'logind.c',
-        'logind.h')
+        'logind.h',
+)
 
 logind_gperf_c = custom_target(
         'logind_gperf.c',
@@ -40,7 +41,8 @@ liblogind_core_sources = files(
         'logind-user-dbus.h',
         'logind-user.c',
         'logind-user.h',
-        'logind-utmp.c')
+        'logind-utmp.c',
+)
 
 liblogind_core_sources += [logind_gperf_c]
 
@@ -54,7 +56,8 @@ liblogind_core = static_library(
 loginctl_sources = files(
         'loginctl.c',
         'sysfs-show.h',
-        'sysfs-show.c')
+        'sysfs-show.c',
+)
 
 user_runtime_dir_sources = files('user-runtime-dir.c')
 

diff --git a/src/machine/meson.build b/src/machine/meson.build
index 1b7f11893f51a353c1982d6529556b824a89bc4e..62977651137a429703072f71adf283c59ddf0b90 100644 (file)
--- a/src/machine/meson.build
+++ b/src/machine/meson.build
@@ -2,7 +2,8 @@
 
 systemd_machined_sources = files(
         'machined.c',
-        'machined.h')
+        'machined.h',
+)
 
 libmachine_core_sources = files(
         'image-dbus.c',
@@ -16,7 +17,8 @@ libmachine_core_sources = files(
         'machined-varlink.c',
         'machined-varlink.h',
         'operation.c',
-        'operation.h')
+        'operation.h',
+)
 
 libmachine_core = static_library(
         'machine-core',

diff --git a/src/network/meson.build b/src/network/meson.build
index ec8f58b046cf59f63da61148865c428df84e7b1e..6e50b9525f0ae5a328ea816a03c5d8e2e7a1735e 100644 (file)
--- a/src/network/meson.build
+++ b/src/network/meson.build
@@ -190,7 +190,8 @@ sources = files(
         'tc/tclass.c',
         'tc/tclass.h',
         'tc/teql.c',
-        'tc/teql.h')
+        'tc/teql.h',
+)
 
 systemd_networkd_sources = files('networkd.c')
 
@@ -199,14 +200,16 @@ systemd_networkd_wait_online_sources = files(
         'wait-online/link.h',
         'wait-online/manager.c',
         'wait-online/manager.h',
-        'wait-online/wait-online.c')
+        'wait-online/wait-online.c',
+)
 
 networkctl_sources = files('networkctl.c')
 
 network_generator_sources = files(
         'generator/main.c',
         'generator/network-generator.c',
-        'generator/network-generator.h')
+        'generator/network-generator.h',
+)
 
 sources += custom_target(
         'networkd-gperf.c',

diff --git a/src/nspawn/meson.build b/src/nspawn/meson.build
index 7a515accee2fae3f7bb039837c8fe2347aacf9b1..a42e16dd99df863d1e4ac2d2d953d886dc527f64 100644 (file)
--- a/src/nspawn/meson.build
+++ b/src/nspawn/meson.build
@@ -28,7 +28,8 @@ libnspawn_core_sources = files(
         'nspawn-setuid.h',
         'nspawn-stub-pid1.c',
         'nspawn-stub-pid1.h',
-        'nspawn.h')
+        'nspawn.h',
+)
 
 nspawn_gperf_c = custom_target(
         'nspawn-gperf.c',

diff --git a/src/oom/meson.build b/src/oom/meson.build
index f865ed26cff82ec8a73ceacf926da90b90a73d93..6926ae0d18f871b85bda47276b8ac22196e07362 100644 (file)
--- a/src/oom/meson.build
+++ b/src/oom/meson.build
@@ -7,7 +7,8 @@ systemd_oomd_sources = files(
         'oomd-manager.h',
         'oomd-util.c',
         'oomd-util.h',
-        'oomd.c')
+        'oomd.c',
+)
 
 oomctl_sources = files('oomctl.c')
 

diff --git a/src/portable/meson.build b/src/portable/meson.build
index 65ba74bc6f69cf3e2407810742a76ad5fb2de7fd..61f7924801b45eb77296cf64416b3867b85a0b19 100644 (file)
--- a/src/portable/meson.build
+++ b/src/portable/meson.build
@@ -11,7 +11,8 @@ systemd_portabled_sources = files(
         'portabled-operation.c',
         'portabled-operation.h',
         'portabled.c',
-        'portabled.h')
+        'portabled.h',
+)
 
 if conf.get('ENABLE_PORTABLED') == 1
         install_data('org.freedesktop.portable1.conf',

diff --git a/src/resolve/meson.build b/src/resolve/meson.build
index 6478b8d589e3820bcda6f8e412f78111712dcfb7..b2da249c87d05c41d28bf8260ddd861f67fa26e1 100644 (file)
--- a/src/resolve/meson.build
+++ b/src/resolve/meson.build
@@ -16,7 +16,8 @@ basic_dns_sources = files(
         'resolved-util.c',
         'resolved-util.h',
         'dns-type.c',
-        'dns-type.h')
+        'dns-type.h',
+)
 
 systemd_resolved_sources = files(
         'resolved-bus.c',
@@ -68,13 +69,15 @@ systemd_resolved_sources = files(
         'resolved-socket-graveyard.c',
         'resolved-socket-graveyard.h',
         'resolved-varlink.c',
-        'resolved-varlink.h')
+        'resolved-varlink.h',
+)
 
 resolvectl_sources = files(
          'resolvconf-compat.c',
          'resolvconf-compat.h',
          'resolvectl.c',
-         'resolvectl.h')
+         'resolvectl.h',
+)
 
 ############################################################
 
@@ -136,12 +139,14 @@ if conf.get('ENABLE_DNS_OVER_TLS') == 1
         if conf.get('DNS_OVER_TLS_USE_GNUTLS') == 1
                 systemd_resolved_sources += files(
                         'resolved-dnstls-gnutls.c',
-                        'resolved-dnstls-gnutls.h')
+                        'resolved-dnstls-gnutls.h',
+                )
                 systemd_resolved_dependencies += libgnutls
         elif conf.get('DNS_OVER_TLS_USE_OPENSSL') == 1
                 systemd_resolved_sources += files(
                         'resolved-dnstls-openssl.c',
-                        'resolved-dnstls-openssl.h')
+                        'resolved-dnstls-openssl.h',
+                )
                 systemd_resolved_dependencies += libopenssl
         else
                 error('unknown dependency for supporting DNS-over-TLS')

diff --git a/src/shared/meson.build b/src/shared/meson.build
index 7a0123636323b208746fb31c05c80c32df4f675c..fa636dfa2f405b2094e2df46152c13a76a262f60 100644 (file)
--- a/src/shared/meson.build
+++ b/src/shared/meson.build
@@ -332,13 +332,15 @@ shared_sources = files(
         'wifi-util.c',
         'wifi-util.h',
         'xml.c',
-        'xml.h')
+        'xml.h',
+)
 
 if get_option('tests') != 'false'
         shared_sources += files(
                 'test-tables.h',
                 'tests.c',
-                'tests.h')
+                'tests.h',
+        )
 endif
 
 generate_syscall_list = find_program('generate-syscall-list.py')
@@ -354,7 +356,8 @@ syscall_list_h = custom_target(
 if conf.get('HAVE_ACL') == 1
         shared_sources += files(
                 'acl-util.c',
-                'devnode-acl.c')
+                'devnode-acl.c',
+        )
 endif
 
 if conf.get('ENABLE_UTMP') == 1
@@ -373,7 +376,8 @@ endif
 if conf.get('HAVE_LIBBPF') == 1
         shared_sources += files(
                 'bpf-link.c',
-                'bpf-link.h')
+                'bpf-link.h',
+        )
 endif
 
 if conf.get('HAVE_KMOD') == 1
@@ -383,7 +387,8 @@ endif
 if conf.get('HAVE_PAM') == 1
         shared_sources += files(
                 'pam-util.c',
-                'pam-util.h')
+                'pam-util.h',
+        )
 endif
 
 if conf.get('ENABLE_NSCD') == 1

diff --git a/src/shutdown/meson.build b/src/shutdown/meson.build
index a4f4d39814febf0285c780ef48346867615f2a27..0bd09fd7b24382fae0021137ab87f74d215af93b 100644 (file)
--- a/src/shutdown/meson.build
+++ b/src/shutdown/meson.build
@@ -3,7 +3,8 @@
 systemd_shutdown_sources = files(
         'shutdown.c',
         'umount.c',
-        'umount.h')
+        'umount.h',
+)
 
 tests += [
         [files('test-umount.c',

diff --git a/src/systemd/meson.build b/src/systemd/meson.build
index 324e7cfd0cb5b1a5620422d72fb5305c38744ebc..9faee53db947b258649c71446c500aa1f56ba4bc 100644 (file)
--- a/src/systemd/meson.build
+++ b/src/systemd/meson.build
@@ -12,7 +12,8 @@ _systemd_headers = [
         'sd-journal.h',
         'sd-login.h',
         'sd-messages.h',
-        'sd-path.h']
+        'sd-path.h',
+]
 
 # https://github.com/mesonbuild/meson/issues/1633
 systemd_headers = files(_systemd_headers)
@@ -35,7 +36,8 @@ _not_installed_headers = [
         'sd-network.h',
         'sd-radv.h',
         'sd-resolve.h',
-        'sd-utf8.h']
+        'sd-utf8.h',
+]
 
 install_headers(
         systemd_headers,

diff --git a/src/udev/meson.build b/src/udev/meson.build
index db1950b128e4049dcfef08e3b43fc5cd512e7bbc..a4648be3b49ae220967ef897acc15af3b1dc3302 100644 (file)
--- a/src/udev/meson.build
+++ b/src/udev/meson.build
@@ -13,7 +13,8 @@ udevadm_sources = files(
         'udevadm-trigger.c',
         'udevadm-util.c',
         'udevadm-util.h',
-        'udevd.c')
+        'udevd.c',
+)
 
 libudevd_core_sources = files(
         'udev-ctrl.c',
@@ -39,7 +40,8 @@ libudevd_core_sources = files(
         'udev-netlink.c',
         'udev-netlink.h',
         'net/link-config.c',
-        'net/link-config.h')
+        'net/link-config.h',
+)
 
 if conf.get('HAVE_KMOD') == 1
         libudevd_core_sources += files('udev-builtin-kmod.c')

diff --git a/src/userdb/meson.build b/src/userdb/meson.build
index a17d7bb32838f4906ddfc5a09e2e376559145f39..2d786611e15f7b23acdaaa593ab3311ebe91a41f 100644 (file)
--- a/src/userdb/meson.build
+++ b/src/userdb/meson.build
@@ -5,6 +5,7 @@ systemd_userwork_sources = files('userwork.c')
 systemd_userdbd_sources = files(
         'userdbd-manager.c',
         'userdbd-manager.h',
-        'userdbd.c')
+        'userdbd.c',
+)
 
 userdbctl_sources = files('userdbctl.c')