shaba/systemd-stable
1
1
Fork 0
mirror of https://github.com/systemd/systemd-stable.git synced 2024-12-22 13:33:56 +03:00
Code

meson: move files' closing brace to separate line

Browse Source
This commit is contained in:
Zbigniew Jędrzejewski-Szmek 2022-03-03 12:14:13 +01:00
parent b9acb5074e
commit 2f492a739c
18 changed files with 86 additions and 43 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
src/home/meson.build
View File

@ -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',

12
src/journal-remote/meson.build
View File

@ -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',

6
src/journal/meson.build
View File

@ -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')

3
src/libsystemd-network/meson.build
View File

@ -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',

12
src/libsystemd/meson.build
View File

@ -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',
)
############################################################

3
src/locale/meson.build
View File

@ -3,7 +3,8 @@
systemd_localed_sources = files(
'localed.c',
'keymap-util.c',
'keymap-util.h')
'keymap-util.h',
)
localectl_sources = files('localectl.c')

9
src/login/meson.build
View File

@ -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')

6
src/machine/meson.build
View File

@ -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',

9
src/network/meson.build
View File

@ -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',

3
src/nspawn/meson.build
View File

@ -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',

3
src/oom/meson.build
View File

@ -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')

3
src/portable/meson.build
View File

@ -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',

15
src/resolve/meson.build
View File

@ -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')

15
src/shared/meson.build
View File

@ -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

3
src/shutdown/meson.build
View File

@ -3,7 +3,8 @@
systemd_shutdown_sources = files(
'shutdown.c',
'umount.c',
'umount.h')
'umount.h',
)
tests += [
[files('test-umount.c',

6
src/systemd/meson.build
View File

@ -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,

6
src/udev/meson.build
View File

@ -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')

3
src/userdb/meson.build
View File

@ -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')