[frogr] meson: Fix small style and consistency issues in the code

[Mario Sanchez Prada <msanchez src gnome org>]

commit 59d92956d69057a7e47b0bf96d5fc8fe32384cf9
Author: Mario Sanchez Prada <msanchez gnome org>
Date:   Wed May 24 07:14:07 2017 +0100

    meson: Fix small style and consistency issues in the code

 data/meson.build |   54 +++++++++++++++++++++++++++---------------------------
 meson.build      |   33 +++++++++++++++++----------------
 2 files changed, 44 insertions(+), 43 deletions(-)
---
diff --git a/data/meson.build b/data/meson.build
index acbb83b..0e024a6 100644
--- a/data/meson.build
+++ b/data/meson.build
@@ -1,49 +1,49 @@
-frogrdir = join_paths (datadir, project_name)
+frogrdir = join_paths(datadir, project_name)
 
 # Icons
-icondir = join_paths (datadir, 'icons')
-install_subdir ('icons/hicolor',
-                install_dir: icondir)
+icondir = join_paths(datadir, 'icons')
+install_subdir('icons/hicolor',
+               install_dir: icondir)
 
 # Images
-imagesdir = join_paths (frogrdir, 'images')
+imagesdir = join_paths(frogrdir, 'images')
 install_data(join_paths('images', 'mpictures.png'),
              install_dir : imagesdir)
 
 # UI Files
-gtkbuilderdir = join_paths (frogrdir, 'gtkbuilder')
-install_subdir ('gtkbuilder',
-                install_dir: frogrdir)
+gtkbuilderdir = join_paths(frogrdir, 'gtkbuilder')
+install_subdir('gtkbuilder',
+               install_dir: frogrdir)
 
 # Man pages
-mandir = join_paths (datadir, project_name, 'man')
+mandir = join_paths(datadir, project_name, 'man')
 install_man(join_paths('manpages', 'frogr.1'))
 
 # Desktop file
-desktopdir = join_paths (datadir, 'applications')
+desktopdir = join_paths(datadir, 'applications')
 
-po_dir = join_paths (meson.source_root (), 'po')
+po_dir = join_paths(meson.source_root(), 'po')
 
 data_conf = configuration_data()
-data_conf.set ('BINDIR', join_paths (prefix, bindir))
+data_conf.set('BINDIR', join_paths(prefix, bindir))
 generated_desktop = configure_file(input: 'org.gnome.frogr.desktop.in.in',
                                    output: 'org.gnome.frogr.desktop.in',
                                    configuration: data_conf)
-i18n.merge_file ('desktop',
-                 input: generated_desktop,
-                 output: 'org.gnome.frogr.desktop',
-                 install: true,
-                 install_dir: desktopdir,
-                 po_dir: po_dir,
-                 type: 'desktop')
+i18n.merge_file('desktop',
+                input: generated_desktop,
+                output: 'org.gnome.frogr.desktop',
+                install: true,
+                install_dir: desktopdir,
+                po_dir: po_dir,
+                type: 'desktop')
 
 # Appdata XML file
-appdatadir = join_paths (datadir, 'appdata')
-i18n.merge_file ('desktop',
-                 input: 'org.gnome.frogr.appdata.xml.in',
-                 output: 'org.gnome.frogr.appdata.xml',
-                 install: true,
-                 install_dir: appdatadir,
-                 po_dir: po_dir,
-                 type: 'xml')
+appdatadir = join_paths(datadir, 'appdata')
+i18n.merge_file('desktop',
+                input: 'org.gnome.frogr.appdata.xml.in',
+                output: 'org.gnome.frogr.appdata.xml',
+                install: true,
+                install_dir: appdatadir,
+                po_dir: po_dir,
+                type: 'xml')
 
diff --git a/meson.build b/meson.build
index e72c3ef..a196e0d 100644
--- a/meson.build
+++ b/meson.build
@@ -5,19 +5,19 @@ project('frogr', 'c',
 project_name = meson.project_name()
 project_version = meson.project_version()
 
-prefix = get_option ('prefix')
-bindir = get_option ('bindir')
-datadir = get_option ('datadir')
-localedir = get_option ('localedir')
+prefix = get_option('prefix')
+bindir = get_option('bindir')
+datadir = get_option('datadir')
+localedir = get_option('localedir')
 
 frogr_conf = configuration_data()
 frogr_conf.set_quoted('VERSION', project_version)
-frogr_conf.set_quoted ('PACKAGE_VERSION', project_version)
-frogr_conf.set_quoted ('PACKAGE_NAME', project_name)
-frogr_conf.set_quoted ('DATADIR', join_paths (prefix, datadir))
-frogr_conf.set_quoted ('LOCALEDIR', join_paths (prefix, localedir))
+frogr_conf.set_quoted('PACKAGE_VERSION', project_version)
+frogr_conf.set_quoted('PACKAGE_NAME', project_name)
+frogr_conf.set_quoted('DATADIR', join_paths(prefix, datadir))
+frogr_conf.set_quoted('LOCALEDIR', join_paths(prefix, localedir))
 
-add_global_arguments ('-Wno-deprecated-declarations', language:'c')
+add_global_arguments('-Wno-deprecated-declarations', language:'c')
 
 compiler = meson.get_compiler('c')
 
@@ -30,7 +30,7 @@ xml2_ver = '2.6.8'
 json_glib_ver = '0.12'
 gcrypt_ver = '1.5.0'
 
-glib = dependency ('glib-2.0', version: '>=@0@'.format(glib_ver))
+glib = dependency('glib-2.0', version: '>=@0@'.format(glib_ver))
 soup = dependency('libsoup-2.4', version: '>=@0@'.format(soup_ver))
 exif = dependency('libexif', version: '>=@0@'.format(exif_ver))
 xml2 = dependency('libxml-2.0', version: '>=@0@'.format(xml2_ver))
@@ -54,7 +54,7 @@ if get_option('enable-header-bar')
 endif
 
 if not get_variable('has_header_bar', false)
-     gtk = dependency('gtk+-3.0', version: '>=@0@'.format(gtk_ver))
+    gtk = dependency('gtk+-3.0', version: '>=@0@'.format(gtk_ver))
 endif
 
 frogr_conf.set10('USE_HEADER_BAR', get_variable('has_header_bar', false))
@@ -85,8 +85,9 @@ configure_file(output: 'config.h',
                configuration: frogr_conf)
 
 # Build frogr
-frogr_top_dir = include_directories ('.')
-subdir ('src')
-subdir ('data')
-subdir ('help')
-subdir ('po')
+frogr_top_dir = include_directories('.')
+
+subdir('src')
+subdir('data')
+subdir('help')
+subdir('po')