From f077d0c042974043daaef50f853770deebad5711 Mon Sep 17 00:00:00 2001
From: William Hubbs <w.d.hubbs@gmail.com>
Date: Fri, 2 Jul 2021 13:24:22 -0500
Subject: [PATCH] format build files consistently

---
 doc/meson.build              | 10 +++++-----
 meson.build                  | 14 +++++++++-----
 meson_options.txt            |  4 ++--
 services/systemd/meson.build |  9 ++++-----
 src/meson.build              |  4 +---
 5 files changed, 21 insertions(+), 20 deletions(-)

diff --git a/doc/meson.build b/doc/meson.build
index 9645649..f055bb4 100644
--- a/doc/meson.build
+++ b/doc/meson.build
@@ -1,8 +1,8 @@
 ronn = find_program('ronn', required: get_option('man'))
-
 if ronn.found()
-    custom_target('man', input:files('espeakup.8.ronn'),
-        output:'espeakup.8',
-        command:[ronn, '--output-dir', '@OUTDIR@', '--roff', '@INPUT@'],
-        install: true, install_dir: join_paths(get_option('mandir'),'man8'))
+  custom_target('man',
+    input : files('espeakup.8.ronn'),
+    output : 'espeakup.8',
+    command : [ronn, '--output-dir', '@OUTDIR@', '--roff', '@INPUT@'],
+    install : true, install_dir: join_paths(get_option('mandir'),'man8'))
 endif
diff --git a/meson.build b/meson.build
index 2ba7c86..0002729 100644
--- a/meson.build
+++ b/meson.build
@@ -1,5 +1,9 @@
 project('espeakup', 'c',
-  default_options : ['buildtype=debugoptimized', 'c_std=gnu11', 'warning_level=3'],
+  default_options : [
+    'buildtype=debugoptimized',
+    'c_std=gnu11',
+    'warning_level=3'
+    ],
   license : 'GPL-3.0-or-later',
   version : '0.90',
   meson_version : '>=0.47.0')
@@ -15,7 +19,7 @@ subdir('services')
 subdir('src')
 
 executable('espeakup',
-           espeakup_version,
-           espeakup_sources,
-           dependencies : [thread_dep, espeak_dep, alsa_dep, math_dep],
-           install : true)
+  espeakup_version,
+  espeakup_sources,
+  dependencies : [thread_dep, espeak_dep, alsa_dep, math_dep],
+  install : true)
diff --git a/meson_options.txt b/meson_options.txt
index c7e35d9..c8560b6 100644
--- a/meson_options.txt
+++ b/meson_options.txt
@@ -1,4 +1,4 @@
-option('systemd', type : 'feature', value : 'auto',
-       description :'enable systemd support')
 option('man', type : 'feature', value : 'auto',
        description : 'build manpage with ronn')
+option('systemd', type : 'feature', value : 'auto',
+       description :'enable systemd support')
diff --git a/services/systemd/meson.build b/services/systemd/meson.build
index 4a693ed..9ae652e 100644
--- a/services/systemd/meson.build
+++ b/services/systemd/meson.build
@@ -3,15 +3,14 @@ prefixdir = get_option('prefix')
 bindir = join_paths(prefixdir, get_option('bindir'))
 
 unit_conf = configuration_data()
-
 unit_conf.set('bindir', bindir)
 
 service_file = configure_file(
-    input : 'espeakup.service.in',
-    output : 'espeakup.service',
-    configuration : unit_conf
+  input : 'espeakup.service.in',
+  output : 'espeakup.service',
+  configuration : unit_conf
 )
 
 install_data(service_file,
-    install_dir : unitdir
+  install_dir : unitdir
 )
diff --git a/src/meson.build b/src/meson.build
index f1c4610..6221208 100644
--- a/src/meson.build
+++ b/src/meson.build
@@ -1,6 +1,3 @@
-espeakup_version = vcs_tag(input : 'version.h.in', output : 'version.h')
-
-
 espeakup_sources = files([
         'cli.c',
         'espeak.c',
@@ -10,3 +7,4 @@ espeakup_sources = files([
         'softsynth.c',
         'stringhandling.c'
 ])
+espeakup_version = vcs_tag(input : 'version.h.in', output : 'version.h')