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.

.dir-locals.el

@@ -20,4 +20,5 @@
             (eval . (c-set-offset 'arglist-intro '++))
             (eval . (c-set-offset 'arglist-close 0))))
  (nxml-mode . ((nxml-child-indent . 2)
-               (fill-column . 119))))
+               (fill-column . 119)))
+ (meson-mode . ((meson-indent-basic . 8))))

catalog/meson.build

@@ -1,5 +1,3 @@
-# -*- mode: meson -*-
-
 in_files = '''
         systemd.bg.catalog
         systemd.be.catalog

docs/sysvinit/meson.build

@@ -1,5 +1,3 @@
-# -*- mode: meson -*-
-
 file = configure_file(
         input : 'README.in',
         output : 'README',

docs/var-log/meson.build

@@ -1,5 +1,3 @@
-# -*- mode: meson -*-
-
 file = configure_file(
         input : 'README.in',
         output : 'README',

hwdb/meson.build

@@ -1,5 +1,3 @@
-# -*- mode: meson -*-
-
 hwdb_files = files('''
         20-pci-vendor-model.hwdb
         20-pci-classes.hwdb

man/meson.build

@@ -1,5 +1,3 @@
-# -*- mode: meson -*-
-
 # This is lame, I know, but meson has no other include mechanism
 subdir('rules')
 
@@ -26,6 +24,7 @@ xsltproc_flags = [
 
 custom_man_xsl = files('custom-man.xsl')
 custom_html_xsl = files('custom-html.xsl')
+xslt_cmd = [xsltproc, '-o', '@OUTPUT0@'] + xsltproc_flags
 
 custom_entities_ent = configure_file(
         input : 'custom-entities.ent.in',
@@ -54,14 +53,12 @@ foreach tuple : manpages
 
         mandirn = join_paths(get_option('mandir'), 'man' + section)
 
-  have = condition == '' or conf.get(condition, 0) == 1
+        if condition == '' or conf.get(condition, 0) == 1
-
-  if have
                 p1 = custom_target(
                         man,
                         input : xml,
                         output : [man] + manaliases,
-        command : [xsltproc, '-o', '@OUTPUT0@'] + xsltproc_flags + [custom_man_xsl, '@INPUT@'],
+                        command : xslt_cmd + [custom_man_xsl, '@INPUT@'],
                         depend_files : custom_entities_ent,
                         install : want_man,
                         install_dir : mandirn)
@@ -71,7 +68,7 @@ foreach tuple : manpages
                         html,
                         input : xml,
                         output : [html] + htmlaliases,
-        command : [xsltproc, '-o', '@OUTPUT0@'] + xsltproc_flags + [custom_html_xsl, '@INPUT@'],
+                        command : xslt_cmd + [custom_html_xsl, '@INPUT@'],
                         depend_files : custom_entities_ent,
                         install : want_html,
                         install_dir : join_paths(docdir, 'html'))
@@ -79,7 +76,7 @@ foreach tuple : manpages
 
                 source_xml_files += files(tuple[0] + '.xml')
         else
-    message('Skipping @0@.@1@ because @2@ is @3@'.format(stem, section, condition, have))
+                message('Skipping @0@.@1@ because @2@ is false'.format(stem, section, condition))
         endif
 endforeach
 
@@ -118,7 +115,7 @@ foreach tuple : [['systemd.directives', '7', systemd_directives_xml],
                 man,
                 input : xml,
                 output : man,
-      command : [xsltproc, '-o', '@OUTPUT0@'] + xsltproc_flags + [custom_man_xsl, '@INPUT@'],
+                command : xslt_cmd + [custom_man_xsl, '@INPUT@'],
                 install : want_man and have_lxml,
                 install_dir : mandirn)
         man_pages += [p1]
@@ -127,7 +124,7 @@ foreach tuple : [['systemd.directives', '7', systemd_directives_xml],
                 html,
                 input : xml,
                 output : html,
-      command : [xsltproc, '-o', '@OUTPUT0@'] + xsltproc_flags + [custom_html_xsl, '@INPUT@'],
+                command : xslt_cmd + [custom_html_xsl, '@INPUT@'],
                 install : want_html and have_lxml,
                 install_dir : join_paths(docdir, 'html'))
         html_pages += [p2]

meson.build

@@ -1,5 +1,3 @@
-# -*- mode: meson -*-
-
 project('systemd', 'c',
         version : '233',
         license : 'LGPLv2+',
@@ -391,7 +389,7 @@ foreach ident : [
         ['copy_file_range',   '''#include <sys/syscall.h>
                                  #include <unistd.h>'''],
         ['explicit_bzero' ,   '''#include <strings.h>'''],
-  ]
+]
 
         have = cc.has_function(ident[0], prefix : ident[1])
         conf.set10('HAVE_DECL_' + ident[0].to_upper(), have)
@@ -432,7 +430,10 @@ foreach prog : progs
         if path != ''
                 message('Using @1@ for @0@'.format(prog[0], path))
         else
-    exe = find_program(prog[0], '/usr/sbin/' + prog[0], '/sbin/' + prog[0], required: false)
+                exe = find_program(prog[0],
+                                   '/usr/sbin/' + prog[0],
+                                   '/sbin/' + prog[0],
+                                   required: false)
                 path = exe.found() ? exe.path() : prog[1]
         endif
         name = prog.length() > 2 ? prog[2] : prog[0].to_upper()
@@ -466,7 +467,8 @@ else
         endif
 endif
 message('gperf len type is @0@'.format(gperf_len_type))
-conf.set('GPERF_LEN_TYPE', gperf_len_type, description : 'The type of gperf "len" parameter')
+conf.set('GPERF_LEN_TYPE', gperf_len_type,
+         description : 'The type of gperf "len" parameter')
 
 ############################################################
 

network/meson.build

@@ -1,5 +1,3 @@
-# -*- mode: meson -*-
-
 if conf.get('ENABLE_NETWORKD', 0) == 1
         install_data('80-container-host0.network',
                      '80-container-ve.network',

po/meson.build

@@ -1,5 +1,3 @@
-# -*- mode: meson -*-
-
 i18n = import('i18n')
 i18n.gettext(meson.project_name())
 

rules/meson.build

@@ -1,5 +1,3 @@
-# -*- mode: meson -*-
-
 rules = files('''
         60-block.rules
         60-cdrom_id.rules

shell-completion/bash/meson.build

@@ -1,5 +1,3 @@
-# -*- mode: meson -*-
-
 bashcompletiondir = get_option('bashcompletiondir')
 if bashcompletiondir == ''
         bash_completion = dependency('bash-completion', required : false)

shell-completion/zsh/meson.build

@@ -1,5 +1,3 @@
-# -*- mode: meson -*-
-
 zshcompletiondir = get_option('zshcompletiondir')
 if zshcompletiondir == ''
         zshcompletiondir = join_paths(datadir, 'zsh/site-functions')

src/analyze/meson.build

@@ -1,5 +1,3 @@
-# -*- mode: meson -*-
-
 systemd_analyze_sources = files('''
         analyze.c
         analyze-verify.c

src/basic/meson.build

@@ -1,5 +1,3 @@
-# -*- mode: meson -*-
-
 basic_sources_plain = files('''
         af-list.c
         af-list.h

src/boot/efi/meson.build

@@ -187,5 +187,6 @@ if have_gnu_efi
                 'test-efi-disk.img',
                 input : [systemd_boot_so, stub_so_stub],
                 output : 'test-efi-disk.img',
-    command : [test_efi_create_disk_sh, '@OUTPUT@', '@INPUT0@', '@INPUT1@', splash_bmp])
+                command : [test_efi_create_disk_sh, '@OUTPUT@',
+                           '@INPUT0@', '@INPUT1@', splash_bmp])
 endif

src/core/meson.build

@@ -1,5 +1,3 @@
-# -*- mode: meson -*-
-
 libcore_la_sources = '''
         unit.c
         unit.h
@@ -174,8 +172,8 @@ foreach item : in_files
         file = item[0]
         dir = item[1]
 
-  # If "no", disable generation completely.
+        # If 'no', disable generation completely.
-  # If "", generate, but do not install.
+        # If '', generate, but do not install.
         if dir != 'no'
                 gen = configure_file(
                         input : file + '.in',

src/coredump/meson.build

@@ -1,5 +1,3 @@
-# -*- mode: meson -*-
-
 systemd_coredump_sources = files('''
         coredump.c
         coredump-vacuum.c
@@ -23,4 +21,4 @@ tests += [
          [],
          [],
          'ENABLE_COREDUMP', 'manual'],
-  ]
+]

src/hostname/meson.build

@@ -1,5 +1,3 @@
-# -*- mode: meson -*-
-
 install_data('org.freedesktop.hostname1.conf',
              install_dir : dbuspolicydir)
 install_data('org.freedesktop.hostname1.service',

src/import/meson.build

@@ -1,5 +1,3 @@
-# -*- mode: meson -*-
-
 systemd_importd_sources = files('''
         importd.c
 '''.split())
@@ -76,4 +74,4 @@ tests += [
          [libshared],
          [libz],
          'HAVE_ZLIB', 'manual'],
-  ]
+]

src/journal-remote/meson.build

@@ -1,5 +1,3 @@
-# -*- mode: meson -*-
-
 systemd_journal_upload_sources = files('''
         journal-upload.h
         journal-upload.c

src/journal/meson.build

@@ -1,5 +1,3 @@
-# -*- mode: meson -*-
-
 journal_internal_sources = files('''
         audit-type.c
         audit-type.h
@@ -94,16 +92,20 @@ endif
 install_data('journald.conf',
              install_dir : pkgsysconfdir)
 
-meson.add_install_script('sh', '-c',
+meson.add_install_script(
+        'sh', '-c',
         mkdir_p.format('/var/log/journal'))
-meson.add_install_script('sh', '-c',
+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',
+        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',
+        meson.add_install_script(
+                'sh', '-c',
                 'setfacl -nm g:wheel:rx,d:g:wheel:rx $DESTDIR/var/log/journal || :')
 endif

src/kernel-install/meson.build

@@ -1,5 +1,3 @@
-# -*- mode: meson -*-
-
 install_data('kernel-install',
              install_mode : 'rwxr-xr-x',
              install_dir : bindir)

src/libsystemd-network/meson.build

@@ -1,5 +1,3 @@
-# -*- mode: meson -*-
-
 sources = files('''
         sd-dhcp-client.c
         sd-dhcp-server.c

src/libsystemd/meson.build

@@ -1,5 +1,3 @@
-# -*- mode: meson -*-
-
 sd_login_c = files('sd-login/sd-login.c')
 
 libsystemd_internal_sources = files('''

src/libudev/meson.build

@@ -1,5 +1,3 @@
-# -*- mode: meson -*-
-
 libudev_sources = files('''
         libudev-private.h
         libudev-device-internal.h

src/locale/meson.build

@@ -1,5 +1,3 @@
-# -*- mode: meson -*-
-
 systemd_localed_sources = files('''
         localed.c
         keymap-util.c
@@ -39,4 +37,4 @@ tests += [
           'src/locale/keymap-util.h'],
          [libshared],
          [libdl]],
-  ]
+]

src/login/meson.build

@@ -1,5 +1,3 @@
-# -*- mode: meson -*-
-
 systemd_logind_sources = files('''
         logind.c
         logind.h

src/machine/meson.build

@@ -1,5 +1,3 @@
-# -*- mode: meson -*-
-
 systemd_machined_sources = files('''
         machined.c
         machined.h
@@ -45,4 +43,4 @@ tests += [
           libudev],
          [threads],
          'ENABLE_MACHINED'],
-  ]
+]

src/network/meson.build

@@ -1,5 +1,3 @@
-# -*- mode: meson -*-
-
 sources = files('''
         netdev/bond.c
         netdev/bond.h

src/nspawn/meson.build

@@ -1,5 +1,3 @@
-# -*- mode: meson -*-
-
 systemd_nspawn_sources = files('''
         nspawn.c
         nspawn-settings.c
@@ -39,4 +37,4 @@ tests += [
          [libshared],
          [libacl],
          '', 'manual'],
-  ]
+]

src/resolve/meson.build

@@ -1,5 +1,3 @@
-# -*- mode: meson -*-
-
 basic_dns_sources = files('''
         resolved-dns-dnssec.c
         resolved-dns-dnssec.h
@@ -116,14 +114,12 @@ resolved_gperf_c = custom_target(
         output : 'resolved-gperf.c',
         command : [gperf, '@INPUT@', '--output-file', '@OUTPUT@'])
 
-systemd_resolved_sources = (
+systemd_resolved_sources = (basic_dns_sources +
-  basic_dns_sources +
                             [resolved_gperf_c] +
                             systemd_resolved_only_sources +
                             dns_type_headers)
 
-systemd_resolve_sources = (
+systemd_resolve_sources = (basic_dns_sources +
-  basic_dns_sources +
                            systemd_resolve_only_sources +
                            dns_type_headers)
 
@@ -176,4 +172,4 @@ tests += [
          [],
          [],
          'ENABLE_RESOLVED', 'manual'],
-  ]
+]

src/shared/meson.build

@@ -1,5 +1,3 @@
-# -*- mode: meson -*-
-
 shared_sources = '''
         acl-util.h
         acpi-fpdt.c

src/sulogin-shell/meson.build

@@ -1,5 +1,3 @@
-# -*- mode: meson -*-
-
 gen = configure_file(
         input : 'systemd-sulogin-shell.in',
         output : 'systemd-sulogin-shell',

src/systemd/meson.build

@@ -1,5 +1,3 @@
-# -*- mode: meson -*-
-
 _systemd_headers = '''
         sd-bus.h
         sd-bus-protocol.h

src/test/meson.build

@@ -1,5 +1,3 @@
-# -*- mode: meson -*-
-
 awkscript = 'test-hashmap-ordered.awk'
 test_hashmap_ordered_c = custom_target(
         'test-hashmap-ordered.c',
@@ -594,7 +592,7 @@ tests += [
          [],
          [libdl],
          '', 'manual'],
-  ]
+]
 
 ############################################################
 
@@ -706,7 +704,7 @@ tests += [
           libshared],
          [liblz4,
           libxz]],
-  ]
+]
 
 ############################################################
 
@@ -875,7 +873,7 @@ tests += [
          [libshared,
           libsystemd_network],
          []],
-  ]
+]
 
 ############################################################
 
@@ -894,4 +892,4 @@ tests += [
           libshared,
           libudev],
          [threads]],
-  ]
+]

src/timedate/meson.build

@@ -1,5 +1,3 @@
-# -*- mode: meson -*-
-
 if conf.get('ENABLE_TIMEDATED', 0) == 1
         install_data('org.freedesktop.timedate1.conf',
                      install_dir : dbuspolicydir)

src/timesync/meson.build

@@ -1,5 +1,3 @@
-# -*- mode: meson -*-
-
 systemd_timesyncd_sources = files('''
         timesyncd.c
         timesyncd-manager.c

src/udev/meson.build

@@ -1,5 +1,3 @@
-# -*- mode: meson -*-
-
 udevadm_sources = files('''
         udevadm.c
         udevadm-info.c

src/vconsole/meson.build

@@ -1,5 +1,3 @@
-# -*- mode: meson -*-
-
 if conf.get('ENABLE_VCONSOLE', 0) == 1
         vconsole_rules = configure_file(
                 input : '90-vconsole.rules.in',

sysctl.d/meson.build

@@ -1,5 +1,3 @@
-# -*- mode: meson -*-
-
 install_data(
         '50-default.conf',
         install_dir : sysctldir)

sysusers.d/meson.build

@@ -1,5 +1,3 @@
-# -*- mode: meson -*-
-
 in_files = ['basic.conf']
 
 enable_sysusers = conf.get('ENABLE_SYSUSERS', 0) == 1

tmpfiles.d/meson.build

@@ -1,5 +1,3 @@
-# -*- mode: meson -*-
-
 enable_tmpfiles = conf.get('ENABLE_TMPFILES', 0) == 1
 
 tmpfiles = [['home.conf',            ''],
@@ -19,8 +17,8 @@ foreach pair : tmpfiles
         elif pair[1] == '' or conf.get(pair[1], 0) == 1
                 install_data(pair[0], install_dir : tmpfilesdir)
         else
-    message('Not installing tmpfiles.d/@0@ because @1@ is @2@'.format(
+                message('Not installing tmpfiles.d/@0@ because @1@ is @2@'
-        pair[0], pair[1], conf.get(pair[1], 0)))
+                        .format(pair[0], pair[1], conf.get(pair[1], 0)))
         endif
 endforeach
 
@@ -39,6 +37,7 @@ foreach file : m4_files
 endforeach
 
 if enable_tmpfiles
-  meson.add_install_script('sh', '-c',
+        meson.add_install_script(
+                'sh', '-c',
                 mkdir_p.format(join_paths(sysconfdir, 'tmpfiles.d')))
 endif

units/meson.build

@@ -1,5 +1,3 @@
-# -*- mode: meson -*-
-
 units = [
         ['basic.target',                        ''],
         ['bluetooth.target',                    ''],
@@ -304,7 +302,8 @@ foreach tuple : units
 
                 if tuple.length() > 2
                         foreach target : tuple[2].split()
-        meson.add_install_script('meson-add-wants.sh', systemunitdir, target, file)
+                                meson.add_install_script(
+                                        'meson-add-wants.sh', systemunitdir, target, file)
                         endforeach
                 endif
         endif
@@ -320,7 +319,8 @@ meson.add_install_script(meson_make_symlink,
                          join_paths(dbussessionservicedir, 'org.freedesktop.systemd1.service'))
 if conf.get('HAVE_SYSV_COMPAT', 0) == 1
         foreach i : [1, 2, 3, 4, 5]
-    meson.add_install_script('sh', '-c',
+                meson.add_install_script(
+                        'sh', '-c',
                         mkdir_p
                         .format(join_paths(systemunitdir, 'runlevel@0@.target.wants'.format(i))))
         endforeach

units/user/meson.build

@@ -1,5 +1,3 @@
-# -*- mode: meson -*-
-
 units = [
         'basic.target',
         'bluetooth.target',
@@ -14,17 +12,16 @@ units = [
         'sockets.target',
         'sound.target',
         'timers.target',
-  ]
+]
 
 foreach file : units
         install_data(file,
                      install_dir : userunitdir)
 endforeach
 
-
 in_units = [
         'systemd-exit.service',
-  ]
+]
 
 foreach file : in_units
         gen = configure_file(