summaryrefslogtreecommitdiff
path: root/src/journal
diff options
context:
space:
mode:
authorZbigniew Jędrzejewski-Szmek <zbyszek@in.waw.pl>2017-04-17 19:25:00 -0400
committerZbigniew Jędrzejewski-Szmek <zbyszek@in.waw.pl>2017-04-23 21:47:29 -0400
commit37efbbd8211bd40e2d1f1732e27bd7d3ca504a12 (patch)
tree2f445eca4ba6baa5bb3f41b1af4f3680b6ddae17 /src/journal
parent0a76b0e8a2043936b6dd598a7a3f924bd683eec8 (diff)
meson: reindent all files with 8 spaces
The indentation for emacs'es meson-mode is added .dir-locals. All files are reindented automatically, using the lasest meson-mode from git. Indentation should now be fairly consistent.
Diffstat (limited to 'src/journal')
-rw-r--r--src/journal/meson.build136
1 files changed, 69 insertions, 67 deletions
diff --git a/src/journal/meson.build b/src/journal/meson.build
index 2457bc7234..71396af529 100644
--- a/src/journal/meson.build
+++ b/src/journal/meson.build
@@ -1,25 +1,23 @@
-# -*- mode: meson -*-
-
journal_internal_sources = files('''
- audit-type.c
- audit-type.h
- catalog.c
- catalog.h
- compress.c
- compress.h
- journal-def.h
- journal-file.c
- journal-file.h
- journal-send.c
- journal-vacuum.c
- journal-vacuum.h
- journal-verify.c
- journal-verify.h
- lookup3.c
- lookup3.h
- mmap-cache.c
- mmap-cache.h
- sd-journal.c
+ audit-type.c
+ audit-type.h
+ catalog.c
+ catalog.h
+ compress.c
+ compress.h
+ journal-def.h
+ journal-file.c
+ journal-file.h
+ journal-send.c
+ journal-vacuum.c
+ journal-vacuum.h
+ journal-verify.c
+ journal-verify.h
+ lookup3.c
+ lookup3.h
+ mmap-cache.c
+ mmap-cache.h
+ sd-journal.c
'''.split())
############################################################
@@ -28,82 +26,86 @@ audit_type_includes = [config_h,
missing_h,
'linux/audit.h']
if conf.get('HAVE_AUDIT', 0) == 1
- audit_type_includes += 'libaudit.h'
+ audit_type_includes += 'libaudit.h'
endif
generate_audit_type_list = find_program('generate-audit_type-list.sh')
audit_type_list_txt = custom_target(
- 'audit_type-list.txt',
- output : 'audit_type-list.txt',
- command : [generate_audit_type_list, cpp] + audit_type_includes,
- capture : true)
+ 'audit_type-list.txt',
+ output : 'audit_type-list.txt',
+ command : [generate_audit_type_list, cpp] + audit_type_includes,
+ capture : true)
audit_type_to_name = custom_target(
- 'audit_type-to-name.h',
- input : ['audit_type-to-name.awk', audit_type_list_txt],
- output : 'audit_type-to-name.h',
- command : [awk, '-f', '@INPUT0@', '@INPUT1@'],
- capture : true)
+ 'audit_type-to-name.h',
+ input : ['audit_type-to-name.awk', audit_type_list_txt],
+ output : 'audit_type-to-name.h',
+ command : [awk, '-f', '@INPUT0@', '@INPUT1@'],
+ capture : true)
journal_internal_sources += [audit_type_to_name]
############################################################
libjournal_core_sources = files('''
- journald-kmsg.c
- journald-kmsg.h
- journald-syslog.c
- journald-syslog.h
- journald-stream.c
- journald-stream.h
- journald-server.c
- journald-server.h
- journald-console.c
- journald-console.h
- journald-wall.c
- journald-wall.h
- journald-native.c
- journald-native.h
- journald-audit.c
- journald-audit.h
- journald-rate-limit.c
- journald-rate-limit.h
- journal-internal.h
+ journald-kmsg.c
+ journald-kmsg.h
+ journald-syslog.c
+ journald-syslog.h
+ journald-stream.c
+ journald-stream.h
+ journald-server.c
+ journald-server.h
+ journald-console.c
+ journald-console.h
+ journald-wall.c
+ journald-wall.h
+ journald-native.c
+ journald-native.h
+ journald-audit.c
+ journald-audit.h
+ journald-rate-limit.c
+ journald-rate-limit.h
+ journal-internal.h
'''.split())
systemd_journald_sources = files('''
- journald.c
- journald-server.h
+ journald.c
+ journald-server.h
'''.split())
journald_gperf_c = custom_target(
- 'journald-gperf.c',
- input : 'journald-gperf.gperf',
- output : 'journald-gperf.c',
- command : [gperf, '@INPUT@', '--output-file', '@OUTPUT@'])
+ 'journald-gperf.c',
+ input : 'journald-gperf.gperf',
+ output : 'journald-gperf.c',
+ command : [gperf, '@INPUT@', '--output-file', '@OUTPUT@'])
systemd_cat_sources = files('cat.c')
journalctl_sources = files('journalctl.c')
if conf.get('HAVE_QRENCODE', 0) == 1
- journalctl_sources += files('journal-qrcode.c',
- 'journal-qrcode.h')
+ journalctl_sources += files('journal-qrcode.c',
+ 'journal-qrcode.h')
endif
install_data('journald.conf',
install_dir : pkgsysconfdir)
-meson.add_install_script('sh', '-c',
- mkdir_p.format('/var/log/journal'))
-meson.add_install_script('sh', '-c',
- 'chown 0:0 $DESTDIR/var/log/journal &&
- chmod 755 $DESTDIR/var/log/journal || :')
+meson.add_install_script(
+ 'sh', '-c',
+ mkdir_p.format('/var/log/journal'))
+meson.add_install_script(
+ 'sh', '-c',
+ 'chown 0:0 $DESTDIR/var/log/journal &&
+ chmod 755 $DESTDIR/var/log/journal || :')
if get_option('adm-group')
- meson.add_install_script('sh', '-c',
- 'setfacl -nm g:adm:rx,d:g:adm:rx $DESTDIR/var/log/journal || :')
+ meson.add_install_script(
+ 'sh', '-c',
+ 'setfacl -nm g:adm:rx,d:g:adm:rx $DESTDIR/var/log/journal || :')
endif
if get_option('wheel-group')
- meson.add_install_script('sh', '-c',
- 'setfacl -nm g:wheel:rx,d:g:wheel:rx $DESTDIR/var/log/journal || :')
+ meson.add_install_script(
+ 'sh', '-c',
+ 'setfacl -nm g:wheel:rx,d:g:wheel:rx $DESTDIR/var/log/journal || :')
endif