use new meson format

5 files changed, 547 insertions, 227 deletions

diff --git a/meson.build b/meson.build
index 8e5b7de..19aabcd 100644
--- a/meson.build
+++ b/meson.build
@@ -1,15 +1,21 @@
-project('sqmail', 'c', 'cpp',
-  meson_version   : '>=1.3',
-  version         : '4.2.29a',
-  default_options : ['c_std=gnu99', 'cpp_std=c++11'])
+project(
+  'sqmail',
+  'c',
+  'cpp',
+  meson_version : '>=1.3',
+  version : '4.2.29a',
+  default_options : ['c_std=gnu99', 'cpp_std=c++11'],
+)
 
 qlibs_dep = dependency('qlibs', fallback : ['fehQlibs', 'qlibs_dep'])
 dnsresolv_dep = dependency('dnsresolv', fallback : ['fehQlibs', 'qlibs_dnsresolv_dep'])
 
 if get_option('build-clients') or get_option('build-pam')
-  ucspissl_dep = dependency('ucspissl',
-                   fallback : ['ucspi-ssl', 'ucspissl_dep'],
-                   default_options : ['lib-only=true'])
+  ucspissl_dep = dependency(
+    'ucspissl',
+    fallback : ['ucspi-ssl', 'ucspissl_dep'],
+    default_options : ['lib-only=true'],
+  )
 else
   ucspissl_dep = disabler()
 endif
diff --git a/meson.format b/meson.format
new file mode 100644
index 0000000..fe8362b
--- /dev/null
+++ b/meson.format
@@ -0,0 +1,5 @@
+max_line_length = 100
+indent_by = '  '
+wide_colon = true
+end_of_line = lf
+sort_files = true
diff --git a/src/include/meson.build b/src/include/meson.build
index 4f4bbe5..4ce0bf8 100644
--- a/src/include/meson.build
+++ b/src/include/meson.build
@@ -23,8 +23,7 @@ if idn2_dep.found()
   config.set('IDN2', true)
 endif
 
-auto_qmail = run_command('head', '-n1',
-  meson.project_source_root() / 'conf-home', check : true).stdout().strip()
+auto_qmail = run_command('head', '-n1', meson.project_source_root() / 'conf-home', check : true).stdout().strip()
 config.set('auto_qmail', auto_qmail)
 
 config.set('auto_usera', 'alias')
@@ -34,8 +33,15 @@ config.set('auto_patrn', get_option('patrn'))
 config.set('auto_spawn', get_option('spawn'))
 
 user_groups = [
-  'alias', 'qmaild', 'qmaill', 'qmailp', 'qmailq', 'qmailr', 'qmails',
-  'sqmail', 'nofiles',
+  'alias',
+  'qmaild',
+  'qmaill',
+  'qmailp',
+  'qmailq',
+  'qmailr',
+  'qmails',
+  'sqmail',
+  'nofiles',
 ]
 
 foreach id : user_groups
@@ -49,11 +55,12 @@ configure_file(
   input : 'fehsqm-config.h.in',
   output : 'fehsqm-config.h',
   install_dir : get_option('includedir') / sqmail_hdrs_subdir,
-  install_tag : 'devel')
+  install_tag : 'devel',
+)
 
 add_project_arguments('-DUSE_CONFIG', language : 'c')
 
-sqmail_hdrs = [
+sqmail_hdrs = files(
   'base64.h',
   'commands.h',
   'control.h',
@@ -108,7 +115,7 @@ sqmail_hdrs = [
   'token822.h',
   'trigger.h',
   'wildmat.h',
-]
+)
 
 install_headers(sqmail_hdrs, subdir : sqmail_hdrs_subdir)
 
diff --git a/src/meson.build b/src/meson.build
index 6b40c42..cb95142 100644
--- a/src/meson.build
+++ b/src/meson.build
@@ -4,357 +4,589 @@ auto_break = get_option('break')
 assert(auto_break[0] == auto_break)
 assert(auto_break not in ['"', '\\'])
 auto_break_c = custom_target(
-  output  : 'auto_break.c',
+  output : 'auto_break.c',
   command : ['echo', f'char auto_break[] = "@auto_break@";'],
-  capture : true)
+  capture : true,
+)
 
 
 datetime_c = ['datetime.c', 'datetime_un.c']
 
-
 if get_option('build-srs')
 
-  executable('srsforward',
-    'srsforward.c', 'control.c', 'qmail.c', 'sha1.c', 'srs2.c',
+  executable(
+    'srsforward',
+    'srsforward.c',
+    'control.c',
+    'qmail.c',
+    'sha1.c',
+    'srs2.c',
     include_directories : inc,
     install : true,
-    dependencies : qlibs_dep)
+    dependencies : qlibs_dep,
+  )
 
-  executable('srsreverse',
-    'srsreverse.c', auto_break_c, 'control.c', 'qmail.c', 'sha1.c', 'srs2.c',
+  executable(
+    'srsreverse',
+    'srsreverse.c',
+    auto_break_c,
+    'control.c',
+    'qmail.c',
+    'sha1.c',
+    'srs2.c',
     include_directories : inc,
     install : true,
-    dependencies : qlibs_dep)
+    dependencies : qlibs_dep,
+  )
 
 endif
 
-
 if get_option('build-user')
 
-  executable('qmail-getpw', 'qmail-getpw.c', auto_break_c,
+  executable(
+    'qmail-getpw',
+    'qmail-getpw.c',
+    auto_break_c,
     include_directories : inc,
     install : true,
-    dependencies : qlibs_dep)
+    dependencies : qlibs_dep,
+  )
 
-  executable('qmail-newu', 'qmail-newu.c',
+  executable(
+    'qmail-newu',
+    'qmail-newu.c',
     include_directories : inc,
     dependencies : qlibs_dep,
-    install : true)
+    install : true,
+  )
 
-  executable('qmail-pw2u', 'qmail-pw2u.c', auto_break_c, 'control.c',
+  executable(
+    'qmail-pw2u',
+    'qmail-pw2u.c',
+    auto_break_c,
+    'control.c',
     include_directories : inc,
     install : true,
-    dependencies : qlibs_dep)
+    dependencies : qlibs_dep,
+  )
 
-  executable('qmail-newmrh', 'qmail-newmrh.c',
+  executable(
+    'qmail-newmrh',
+    'qmail-newmrh.c',
     include_directories : inc,
     dependencies : qlibs_dep,
-    install : true)
+    install : true,
+  )
 
 endif
 
-
 if get_option('build-server')
 
-  executable('qmail-qmtpd',
-    'qmail-qmtpd.c', 'control.c', 'date822fmt.c', datetime_c, 'now.c',
-    'qmail.c', 'rcpthosts.c', 'received.c',
-    include_directories : inc,
-    install : true,
-    dependencies : qlibs_dep)
-
-  executable('qmail-qmqpd',
-    'qmail-qmqpd.c', 'date822fmt.c', datetime_c, 'now.c', 'received.c', 'qmail.c',
+  executable(
+    'qmail-qmtpd',
+    'qmail-qmtpd.c',
+    'control.c',
+    'date822fmt.c',
+    datetime_c,
+    'now.c',
+    'qmail.c',
+    'rcpthosts.c',
+    'received.c',
     include_directories : inc,
     install : true,
-    dependencies : qlibs_dep)
+    dependencies : qlibs_dep,
+  )
 
-  executable('qmail-smtpd',
-    'qmail-smtpd.c', auto_break_c, 'commands.c', 'control.c', 'date822fmt.c',
-    datetime_c, 'dns.c', 'ipme.c', 'mfrules.c', 'now.c', 'qmail.c',
-    'rcpthosts.c', 'received.c', 'recipients.c', 'smtpdlog.c', 'spf.c',
-    'spfdnsip.c', 'tls_start.c', 'wildmat.c',
+  executable(
+    'qmail-qmqpd',
+    'qmail-qmqpd.c',
+    'date822fmt.c',
+    datetime_c,
+    'now.c',
+    'received.c',
+    'qmail.c',
     include_directories : inc,
     install : true,
-    dependencies : [qlibs_dep, dnsresolv_dep])
+    dependencies : qlibs_dep,
+  )
+
+  executable(
+    'qmail-smtpd',
+    'qmail-smtpd.c',
+    auto_break_c,
+    'commands.c',
+    'control.c',
+    'date822fmt.c',
+    datetime_c,
+    'dns.c',
+    'ipme.c',
+    'mfrules.c',
+    'now.c',
+    'qmail.c',
+    'rcpthosts.c',
+    'received.c',
+    'recipients.c',
+    'smtpdlog.c',
+    'spf.c',
+    'spfdnsip.c',
+    'tls_start.c',
+    'wildmat.c',
+    include_directories : inc,
+    install : true,
+    dependencies : [qlibs_dep, dnsresolv_dep],
+  )
 
 endif
 
-
 if get_option('build-queue')
 
-  executable('qmail-qread',
-    'qmail-qread.c', 'date822fmt.c', datetime_c, 'fmtqfn.c', 'readsubdir.c',
+  executable(
+    'qmail-qread',
+    'qmail-qread.c',
+    'date822fmt.c',
+    datetime_c,
+    'fmtqfn.c',
+    'readsubdir.c',
     include_directories : inc,
     install : true,
-    dependencies : qlibs_dep)
+    dependencies : qlibs_dep,
+  )
 
-  executable('qmail-tcpto', 'qmail-tcpto.c', datetime_c, 'now.c',
+  executable(
+    'qmail-tcpto',
+    'qmail-tcpto.c',
+    datetime_c,
+    'now.c',
     include_directories : inc,
     install : true,
-    dependencies : qlibs_dep)
+    dependencies : qlibs_dep,
+  )
 
-  executable('qmail-tcpok', 'qmail-tcpok.c',
+  executable(
+    'qmail-tcpok',
+    'qmail-tcpok.c',
     include_directories : inc,
     dependencies : qlibs_dep,
-    install : true)
+    install : true,
+  )
 
 endif
 
-
 if get_option('build-pam')
 
-  executable('qmail-authuser',
-    'qmail-authuser.c', 'control.c', 'hmac_md5.c', 'md5c.c', 'sha1.c', 'sha256.c',
+  executable(
+    'qmail-authuser',
+    'qmail-authuser.c',
+    'control.c',
+    'hmac_md5.c',
+    'md5c.c',
+    'sha1.c',
+    'sha256.c',
     include_directories : inc,
     install : true,
-    dependencies : [qlibs_dep, crypt_dep])
+    dependencies : [qlibs_dep, crypt_dep],
+  )
 
-  executable('qmail-smtpam',
-    'qmail-smtpam.c', 'control.c', 'now.c', 'dns.c',
-    'ipme.c', 'quote.c', 'tcpto.c', 'tls_timeoutio.c', 'tls_errors.c',
-    'tls_remote.c', 'dns_tlsa.c',
+  executable(
+    'qmail-smtpam',
+    'qmail-smtpam.c',
+    'control.c',
+    'now.c',
+    'dns.c',
+    'ipme.c',
+    'quote.c',
+    'tcpto.c',
+    'tls_timeoutio.c',
+    'tls_errors.c',
+    'tls_remote.c',
+    'dns_tlsa.c',
     include_directories : inc,
     install : true,
-    dependencies : [qlibs_dep, dnsresolv_dep, ucspissl_dep, ssl_dep, crypto_dep])
+    dependencies : [qlibs_dep, dnsresolv_dep, ucspissl_dep, ssl_dep, crypto_dep],
+  )
 
-  executable('qmail-vmailuser', 'qmail-vmailuser.c', 'control.c',
+  executable(
+    'qmail-vmailuser',
+    'qmail-vmailuser.c',
+    'control.c',
     include_directories : inc,
     install : true,
-    dependencies : qlibs_dep)
+    dependencies : qlibs_dep,
+  )
 
   executable('qmail-postgrey', 'qmail-postgrey.c', dependencies : qlibs_dep, install : true)
 
 endif
 
-
 if get_option('build-log')
 
   executable('splogger', 'splogger.c', dependencies : qlibs_dep, install : true)
-  executable('qmail-mrtg', 'qmail-mrtg.c', 'now.c',
+
+  executable(
+    'qmail-mrtg',
+    'qmail-mrtg.c',
+    'now.c',
     include_directories : inc,
     install : true,
-    dependencies : qlibs_dep)
+    dependencies : qlibs_dep,
+  )
+
   executable('tai64nfrac', 'tai64nfrac.c', dependencies : qlibs_dep, install : true)
 
 endif
 
-
 if get_option('build-control')
 
-  executable('qmail-badmimetypes', 'qmail-badmimetypes.c',
+  executable(
+    'qmail-badmimetypes',
+    'qmail-badmimetypes.c',
     include_directories : inc,
     install : true,
-    dependencies : qlibs_dep)
+    dependencies : qlibs_dep,
+  )
 
-  executable('qmail-badloadertypes', 'qmail-badloadertypes.c',
+  executable(
+    'qmail-badloadertypes',
+    'qmail-badloadertypes.c',
     include_directories : inc,
     install : true,
-    dependencies : qlibs_dep)
+    dependencies : qlibs_dep,
+  )
 
-  executable('qmail-mfrules', 'qmail-mfrules.c',
+  executable(
+    'qmail-mfrules',
+    'qmail-mfrules.c',
     include_directories : inc,
     dependencies : qlibs_dep,
-    install : true)
+    install : true,
+  )
 
-  executable('qmail-recipients', 'qmail-recipients.c',
+  executable(
+    'qmail-recipients',
+    'qmail-recipients.c',
     include_directories : inc,
     dependencies : qlibs_dep,
-    install : true)
+    install : true,
+  )
 
-  executable('qmail-showctl', 'qmail-showctl.c', 'control.c', auto_break_c,
+  executable(
+    'qmail-showctl',
+    'qmail-showctl.c',
+    'control.c',
+    auto_break_c,
     include_directories : inc,
     install : true,
-    dependencies : qlibs_dep)
+    dependencies : qlibs_dep,
+  )
 
 endif
 
-
 if get_option('build-forward') or get_option('build-mbox')
-  executable('forward', 'forward.c', 'qmail.c',
+
+  executable(
+    'forward',
+    'forward.c',
+    'qmail.c',
     include_directories : inc,
     install : true,
-    dependencies : qlibs_dep)
-endif
+    dependencies : qlibs_dep,
+  )
 
+endif
 
 if get_option('build-forward')
 
-  executable('fastforward', 'fastforward.c', 'qmail.c', 'strset.c',
+  executable(
+    'fastforward',
+    'fastforward.c',
+    'qmail.c',
+    'strset.c',
     include_directories : inc,
     install : true,
-    dependencies : qlibs_dep)
+    dependencies : qlibs_dep,
+  )
 
   executable('printforward', 'printforward.c', dependencies : qlibs_dep, install : true)
 
   executable('setforward', 'setforward.c', dependencies : qlibs_dep, install : true)
 
-  executable('newaliases', 'newaliases.c', 'token822.c', 'control.c',
+  executable(
+    'newaliases',
+    'newaliases.c',
+    'token822.c',
+    'control.c',
     include_directories : inc,
     install : true,
-    dependencies : qlibs_dep)
+    dependencies : qlibs_dep,
+  )
 
   executable('printmaillist', 'printmaillist.c', dependencies : qlibs_dep, install : true)
 
   executable('setmaillist', 'setmaillist.c', dependencies : qlibs_dep, install : true)
 
-  executable('newinclude', 'newinclude.c', 'token822.c', 'control.c',
+  executable(
+    'newinclude',
+    'newinclude.c',
+    'token822.c',
+    'control.c',
     include_directories : inc,
     install : true,
-    dependencies : qlibs_dep)
+    dependencies : qlibs_dep,
+  )
 
 endif
 
-
 if get_option('build-setup')
 
-  executable('install-sqmail', 'install.c', 'hier.c', 'fifo.c',
+  executable(
+    'install-sqmail',
+    'install.c',
+    'hier.c',
+    'fifo.c',
     include_directories : inc,
     install : true,
-    dependencies : qlibs_dep)
+    dependencies : qlibs_dep,
+  )
 
-  executable('instcheck', 'instcheck.c', 'hier.c',
+  executable(
+    'instcheck',
+    'instcheck.c',
+    'hier.c',
     include_directories : inc,
     install : true,
-    dependencies : qlibs_dep)
+    dependencies : qlibs_dep,
+  )
 
 endif
 
-
 if get_option('build-pop')
 
-  executable('qmail-popup', 'qmail-popup.c', 'commands.c', 'now.c', 'tls_start.c',
+  executable(
+    'qmail-popup',
+    'qmail-popup.c',
+    'commands.c',
+    'now.c',
+    'tls_start.c',
     include_directories : inc,
     install : true,
-    dependencies : qlibs_dep)
+    dependencies : qlibs_dep,
+  )
 
-  executable('qmail-pop3d',
-    'qmail-pop3d.c', 'commands.c', 'maildir.c', 'prioq.c', 'now.c',
+  executable(
+    'qmail-pop3d',
+    'qmail-pop3d.c',
+    'commands.c',
+    'maildir.c',
+    'prioq.c',
+    'now.c',
     include_directories : inc,
     install : true,
-    dependencies : qlibs_dep)
+    dependencies : qlibs_dep,
+  )
 
 endif
 
-
 if get_option('build-dns')
 
-  executable('dnscname', 'dnscname.c', 'dns.c',
+  executable(
+    'dnscname',
+    'dnscname.c',
+    'dns.c',
     include_directories : inc,
     install : true,
-    dependencies : [qlibs_dep, dnsresolv_dep])
+    dependencies : [qlibs_dep, dnsresolv_dep],
+  )
 
-  executable('dnsptr', 'dnsptr.c', 'dns.c',
+  executable(
+    'dnsptr',
+    'dnsptr.c',
+    'dns.c',
     include_directories : inc,
     install : true,
-    dependencies : [qlibs_dep, dnsresolv_dep])
+    dependencies : [qlibs_dep, dnsresolv_dep],
+  )
 
-  executable('dnsip', 'dnsip.c', 'dns.c',
+  executable(
+    'dnsip',
+    'dnsip.c',
+    'dns.c',
     include_directories : inc,
     install : true,
-    dependencies : [qlibs_dep, dnsresolv_dep])
+    dependencies : [qlibs_dep, dnsresolv_dep],
+  )
 
-  executable('dnsmxip', 'dnsmxip.c', 'dns.c',
+  executable(
+    'dnsmxip',
+    'dnsmxip.c',
+    'dns.c',
     include_directories : inc,
     install : true,
-    dependencies : [qlibs_dep, dnsresolv_dep])
+    dependencies : [qlibs_dep, dnsresolv_dep],
+  )
 
-  executable('dnsfq', 'dnsfq.c', 'dns.c',
+  executable(
+    'dnsfq',
+    'dnsfq.c',
+    'dns.c',
     include_directories : inc,
     install : true,
-    dependencies : [qlibs_dep, dnsresolv_dep])
+    dependencies : [qlibs_dep, dnsresolv_dep],
+  )
 
-  executable('dnstlsa', 'dnstlsa.c', 'dns_tlsa.c', 'dns.c',
+  executable(
+    'dnstlsa',
+    'dnstlsa.c',
+    'dns_tlsa.c',
+    'dns.c',
     include_directories : inc,
     install : true,
-    dependencies : [qlibs_dep, dnsresolv_dep])
+    dependencies : [qlibs_dep, dnsresolv_dep],
+  )
 
-  executable('dnstxt', 'dnstxt.c', 'dns.c',
+  executable(
+    'dnstxt',
+    'dnstxt.c',
+    'dns.c',
     include_directories : inc,
     install : true,
-    dependencies : [qlibs_dep, dnsresolv_dep])
+    dependencies : [qlibs_dep, dnsresolv_dep],
+  )
 
   executable('hostname', 'hostname.c', dependencies : [qlibs_dep, dnsresolv_dep], install : true)
 
-  executable('ipmeprint', 'ipmeprint.c', 'ipme.c',
+  executable(
+    'ipmeprint',
+    'ipmeprint.c',
+    'ipme.c',
     include_directories : inc,
     install : true,
-    dependencies : [qlibs_dep, dnsresolv_dep])
+    dependencies : [qlibs_dep, dnsresolv_dep],
+  )
 
-  executable('spfquery',
-    'spfquery.c', 'spf.c', 'ipme.c', 'now.c', 'dns.c', 'spfdnsip.c', datetime_c,
+  executable(
+    'spfquery',
+    'spfquery.c',
+    'spf.c',
+    'ipme.c',
+    'now.c',
+    'dns.c',
+    'spfdnsip.c',
+    datetime_c,
     include_directories : inc,
     install : true,
-    dependencies : [qlibs_dep, dnsresolv_dep])
+    dependencies : [qlibs_dep, dnsresolv_dep],
+  )
 
 endif
 
-
 if get_option('build-dkim')
 
-  dkim_slib = static_library('qdkim',
-    'dkim.cpp', 'dkimbase.cpp', 'dkimsign.cpp', 'dkimverify.cpp',
+  dkim_slib = static_library(
+    'qdkim',
+    'dkim.cpp',
+    'dkimbase.cpp',
+    'dkimsign.cpp',
+    'dkimverify.cpp',
     include_directories : inc,
     dependencies : [dnsresolv_dep, ssl_dep, crypto_dep],
-    build_by_default : false)
+    build_by_default : false,
+  )
 
-  executable('qmail-dkim', 'qmail-dkim.c',
+  executable(
+    'qmail-dkim',
+    'qmail-dkim.c',
     include_directories : inc,
     install : true,
     link_with : dkim_slib,
-    dependencies : qlibs_dep)
+    dependencies : qlibs_dep,
+  )
 
-  executable('qmail-dksign',
-    'qmail-dksign.c', 'control.c', 'fmtqfn.c', 'rcpthosts.c',
+  executable(
+    'qmail-dksign',
+    'qmail-dksign.c',
+    'control.c',
+    'fmtqfn.c',
+    'rcpthosts.c',
     include_directories : inc,
     install : true,
-    dependencies : qlibs_dep)
+    dependencies : qlibs_dep,
+  )
 
-  executable('qmail-dkverify',
-    'qmail-dkverify.c', 'control.c', 'fmtqfn.c',
+  executable(
+    'qmail-dkverify',
+    'qmail-dkverify.c',
+    'control.c',
+    'fmtqfn.c',
     include_directories : inc,
     install : true,
-    dependencies : qlibs_dep)
+    dependencies : qlibs_dep,
+  )
 
 endif
 
-
 if get_option('build-clients')
 
-  executable('qmail-remote',
-    'qmail-remote.c', 'control.c', 'tcpto.c', 'now.c', 'dns.c',
-    'ipme.c', 'quote.c', 'tls_timeoutio.c', 'tls_errors.c', 'tls_remote.c',
-    'dns_tlsa.c', 'base64.c', 'md5c.c', 'hmac_md5.c',
+  executable(
+    'qmail-remote',
+    'qmail-remote.c',
+    'control.c',
+    'tcpto.c',
+    'now.c',
+    'dns.c',
+    'ipme.c',
+    'quote.c',
+    'tls_timeoutio.c',
+    'tls_errors.c',
+    'tls_remote.c',
+    'dns_tlsa.c',
+    'base64.c',
+    'md5c.c',
+    'hmac_md5.c',
+    include_directories : inc,
+    install : true,
+    dependencies : [qlibs_dep, dnsresolv_dep, idn2_dep, ssl_dep, crypto_dep, ucspissl_dep],
+  )
+
+  executable(
+    'qmail-qmqpc',
+    'qmail-qmqpc.c',
+    'control.c',
     include_directories : inc,
     install : true,
-    dependencies : [qlibs_dep, dnsresolv_dep, idn2_dep, ssl_dep, crypto_dep, ucspissl_dep])
-
-  executable('qmail-qmqpc', 'qmail-qmqpc.c', 'control.c',
-    include_directories : inc,
-    install : true,
-    dependencies : qlibs_dep)
+    dependencies : qlibs_dep,
+  )
 
-  executable('sendmail', 'sendmail.c',
+  executable(
+    'sendmail',
+    'sendmail.c',
     include_directories : inc,
     dependencies : qlibs_dep,
-    install : true)
+    install : true,
+  )
 
 endif
 
-
 if get_option('build-mbox')
 
-  executable('predate', 'predate.c', datetime_c,
+  executable(
+    'predate',
+    'predate.c',
+    datetime_c,
     include_directories : inc,
     install : true,
-    dependencies : qlibs_dep)
+    dependencies : qlibs_dep,
+  )
 
   executable('preline', 'preline.c', dependencies : qlibs_dep, install : true)
 
-  executable('condredirect', 'condredirect.c', 'qmail.c',
+  executable(
+    'condredirect',
+    'condredirect.c',
+    'qmail.c',
     include_directories : inc,
     install : true,
-    dependencies : qlibs_dep)
+    dependencies : qlibs_dep,
+  )
 
   executable('bouncesaying', 'bouncesaying.c', dependencies : qlibs_dep, install : true)
 
@@ -362,100 +594,191 @@ if get_option('build-mbox')
 
   executable('maildirmake', 'maildirmake.c', dependencies : qlibs_dep, install : true)
 
-  executable('maildir2mbox',
-    'maildir2mbox.c', 'maildir.c', 'prioq.c', 'now.c', 'myctime.c', 'gfrom.c', datetime_c,
+  executable(
+    'maildir2mbox',
+    'maildir2mbox.c',
+    'maildir.c',
+    'prioq.c',
+    'now.c',
+    'myctime.c',
+    'gfrom.c',
+    datetime_c,
     include_directories : inc,
     install : true,
-    dependencies : qlibs_dep)
+    dependencies : qlibs_dep,
+  )
 
-  executable('maildirwatch',
-    'maildirwatch.c', 'hfield.c', 'headerbody.c', 'maildir.c', 'prioq.c', 'now.c',
+  executable(
+    'maildirwatch',
+    'maildirwatch.c',
+    'hfield.c',
+    'headerbody.c',
+    'maildir.c',
+    'prioq.c',
+    'now.c',
     include_directories : inc,
     install : true,
-    dependencies : qlibs_dep)
+    dependencies : qlibs_dep,
+  )
 
-  executable('qbiff', 'qbiff.c', 'headerbody.c', 'hfield.c',
+  executable(
+    'qbiff',
+    'qbiff.c',
+    'headerbody.c',
+    'hfield.c',
     include_directories : inc,
     install : true,
-    dependencies : qlibs_dep)
+    dependencies : qlibs_dep,
+  )
 
-  executable('qreceipt',
-    'qreceipt.c', 'headerbody.c', 'hfield.c', 'quote.c', 'token822.c', 'qmail.c',
+  executable(
+    'qreceipt',
+    'qreceipt.c',
+    'headerbody.c',
+    'hfield.c',
+    'quote.c',
+    'token822.c',
+    'qmail.c',
     include_directories : inc,
     install : true,
-    dependencies : qlibs_dep)
+    dependencies : qlibs_dep,
+  )
 
 endif
 
-
 if get_option('build-base')
 
-  executable('qmail-local',
-    'qmail-local.c', 'qmail.c', 'quote.c', 'now.c', 'gfrom.c', 'myctime.c',
-    auto_break_c, datetime_c,
+  executable(
+    'qmail-local',
+    'qmail-local.c',
+    'qmail.c',
+    'quote.c',
+    'now.c',
+    'gfrom.c',
+    'myctime.c',
+    auto_break_c,
+    datetime_c,
     include_directories : inc,
     install : true,
-    dependencies : qlibs_dep)
+    dependencies : qlibs_dep,
+  )
 
-  executable('qmail-rspawn',
-    'qmail-rspawn.c', 'spawn.c', 'tcpto_clean.c', 'now.c',
+  executable(
+    'qmail-rspawn',
+    'qmail-rspawn.c',
+    'spawn.c',
+    'tcpto_clean.c',
+    'now.c',
     include_directories : inc,
     install : true,
-    dependencies : qlibs_dep)
+    dependencies : qlibs_dep,
+  )
 
-  executable('qmail-lspawn', 'qmail-lspawn.c', 'spawn.c',
+  executable(
+    'qmail-lspawn',
+    'qmail-lspawn.c',
+    'spawn.c',
     include_directories : inc,
     install : true,
-    dependencies : qlibs_dep)
-
-  executable('qmail-send',
-    'qmail-send.c', 'qsutil.c', 'control.c', 'newfield.c',
-    'prioq.c', 'trigger.c', 'fmtqfn.c', 'quote.c', 'now.c', 'readsubdir.c',
-    'qmail.c', 'date822fmt.c', datetime_c,
+    dependencies : qlibs_dep,
+  )
+
+  executable(
+    'qmail-send',
+    'qmail-send.c',
+    'qsutil.c',
+    'control.c',
+    'newfield.c',
+    'prioq.c',
+    'trigger.c',
+    'fmtqfn.c',
+    'quote.c',
+    'now.c',
+    'readsubdir.c',
+    'qmail.c',
+    'date822fmt.c',
+    datetime_c,
     include_directories : inc,
     install : true,
-    dependencies : qlibs_dep)
+    dependencies : qlibs_dep,
+  )
 
-  executable('qmail-qmaint',
-    'qmail-qmaint.c', 'fifo.c', 'fmtqfn.c', 'readsubdir.c',
+  executable(
+    'qmail-qmaint',
+    'qmail-qmaint.c',
+    'fifo.c',
+    'fmtqfn.c',
+    'readsubdir.c',
     include_directories : inc,
     install : true,
-    dependencies : qlibs_dep)
+    dependencies : qlibs_dep,
+  )
 
-  executable('qmail-clean',
-    'qmail-clean.c', 'fmtqfn.c', 'now.c',
+  executable(
+    'qmail-clean',
+    'qmail-clean.c',
+    'fmtqfn.c',
+    'now.c',
     include_directories : inc,
     install : true,
-    dependencies : qlibs_dep)
+    dependencies : qlibs_dep,
+  )
 
-  executable('qmail-start', 'qmail-start.c',
+  executable(
+    'qmail-start',
+    'qmail-start.c',
     include_directories : inc,
     dependencies : qlibs_dep,
-    install : true)
+    install : true,
+  )
 
-  executable('qmail-queue',
-    'qmail-queue.c', 'trigger.c', 'fmtqfn.c', 'now.c', 'date822fmt.c', datetime_c,
+  executable(
+    'qmail-queue',
+    'qmail-queue.c',
+    'trigger.c',
+    'fmtqfn.c',
+    'now.c',
+    'date822fmt.c',
+    datetime_c,
     include_directories : inc,
     install : true,
-    dependencies : qlibs_dep)
-
-  executable('qmail-inject',
-    'qmail-inject.c', 'headerbody.c', 'hfield.c', 'newfield.c', 'quote.c', 'now.c',
-    'control.c', 'date822fmt.c', 'qmail.c', 'token822.c', datetime_c,
+    dependencies : qlibs_dep,
+  )
+
+  executable(
+    'qmail-inject',
+    'qmail-inject.c',
+    'headerbody.c',
+    'hfield.c',
+    'newfield.c',
+    'quote.c',
+    'now.c',
+    'control.c',
+    'date822fmt.c',
+    'qmail.c',
+    'token822.c',
+    datetime_c,
     include_directories : inc,
     install : true,
-    dependencies : qlibs_dep)
+    dependencies : qlibs_dep,
+  )
 
-  executable('qmail-todo',
-    'qmail-todo.c', 'control.c', 'trigger.c', 'fmtqfn.c', 'now.c',
-    'qsutil.c', 'readsubdir.c',
+  executable(
+    'qmail-todo',
+    'qmail-todo.c',
+    'control.c',
+    'trigger.c',
+    'fmtqfn.c',
+    'now.c',
+    'qsutil.c',
+    'readsubdir.c',
     include_directories : inc,
     install : true,
-    dependencies : qlibs_dep)
+    dependencies : qlibs_dep,
+  )
 
 endif
 
-
 if get_option('build-analog')
 
   executable('matchup', 'matchup.c', dependencies : qlibs_dep, install : true)
@@ -463,27 +786,3 @@ if get_option('build-analog')
   executable('columnt', 'columnt.c', dependencies : qlibs_dep, install : true)
 
 endif
-
-
-#it-analog: ddist deferrals failures senders successes suids \
-#  recipients rhosts rhosts rxdelay xqp xrecipient xsender zddist zdeferrals \
-#  zfailures zrecipients zrhosts zrxdelay zsenders zsendmail zsuccesses zsuids zoverall
-#it-mbox: datemail
-#it-clients: mailsubj
-#it-setup: config config-fast
-#it-log: qmail-mrtg-queue
-#it-queue: qmail-qstat qmail-upq
-
-#hasmkffo.h: trymkffo.c compile load
-#	( ( ./compile trymkffo.c && ./load trymkffo ) >/dev/null \
-#	2>&1 \
-#	&& echo \#define HASMKFIFO 1 || exit 0 ) > hasmkffo.h
-#	rm -f trymkffo.o trymkffo
-#
-#hasshsgr.h: chkshsgr warn-shsgr tryshsgr.c compile load
-#	./chkshsgr || ( cat warn-shsgr; exit 1 )
-#	( ( ./compile tryshsgr.c \
-#	&& ./load tryshsgr && ./tryshsgr ) >/dev/null 2>&1 \
-#	&& echo \#define HASSHORTSETGROUPS 1 || exit 0 ) > \
-#	hasshsgr.h
-#	rm -f tryshsgr.o tryshsgr
diff --git a/tests/meson.build b/tests/meson.build
index 20629a4..49519a3 100644
--- a/tests/meson.build
+++ b/tests/meson.build
@@ -1,5 +1,8 @@
 
-t1 = executable('openssl_get_subj_alt_dns', 'openssl_get_subj_alt_dns.c',
-       dependencies : [ssl_dep, crypto_dep])
+t1 = executable(
+  'openssl_get_subj_alt_dns',
+  'openssl_get_subj_alt_dns.c',
+  dependencies : [ssl_dep, crypto_dep],
+)
 
 test('get_subj_alt_dns', t1, workdir : meson.current_source_dir())