[sushi] build: style fixes

[Cosimo Cecchi <cosimoc src gnome org>]

commit 46a861f6b5a7b2d5bad5d5e8915779418327bd70
Author: Rasmus Thomsen <cogitri exherbo org>
Date:   Sun Aug 12 21:09:37 2018 +0100

    build: style fixes

 data/meson.build         | 2 +-
 meson.build              | 1 +
 src/libsushi/meson.build | 8 ++++----
 src/meson.build          | 9 ++++-----
 4 files changed, 10 insertions(+), 10 deletions(-)
---
diff --git a/data/meson.build b/data/meson.build
index 5cf8155..1c6d588 100644
--- a/data/meson.build
+++ b/data/meson.build
@@ -2,7 +2,7 @@ dbus_conf = configuration_data()
 
 dbus_conf.set(
   'bindir',
-  join_paths(get_option('prefix'), get_option('bindir')),
+  bindir,
 )
 
 configure_file(
diff --git a/meson.build b/meson.build
index 7cc8284..d311f89 100644
--- a/meson.build
+++ b/meson.build
@@ -25,6 +25,7 @@ introspection_dep = dependency('gobject-introspection-1.0', version: '>=1.0.1')
 musicbrainz_dep = dependency('libmusicbrainz5')
 webkit_dep = dependency('webkit2gtk-4.0')
 
+bindir = join_paths(get_option('prefix'), get_option('bindir'))
 datadir = join_paths(get_option('prefix'), get_option('datadir'))
 libdir = join_paths(get_option('prefix'), get_option('libdir'))
 libexecdir = join_paths(get_option('prefix'), get_option('libexecdir'))
diff --git a/src/libsushi/meson.build b/src/libsushi/meson.build
index ebe6d07..8f75271 100644
--- a/src/libsushi/meson.build
+++ b/src/libsushi/meson.build
@@ -20,7 +20,7 @@ libsushi_headers = [
   'sushi-utils.h',
 ]
 
-enum = gnome.mkenums(
+libsushi_enum = gnome.mkenums(
   'libsushi_enum',
   c_template: 'sushi-enum-types.c.in',
   h_template: 'sushi-enum-types.h.in',
@@ -32,8 +32,8 @@ libsushi = shared_library(
   dependencies: deps,
   sources: [
     libsushi_c,
+    libsushi_enum,
     libsushi_headers,
-    enum,
   ],
   install: true,
   install_dir: join_paths(libdir, 'sushi'),
@@ -50,8 +50,8 @@ gnome.generate_gir(
   libsushi,
   sources: [
     libsushi_c,
+    libsushi_enum,
     libsushi_headers,
-    enum,
   ],
   nsversion: '1.0',
   namespace: 'Sushi',
@@ -63,8 +63,8 @@ gnome.generate_gir(
     'GstTag-1.0',
     'GdkPixbuf-2.0',
     'Gtk-3.0',
-    'EvinceDocument-3.0',
     'GtkSource-3.0',
+    'EvinceDocument-3.0',
   ],
   install: true,
   install_dir_gir: join_paths(datadir, 'sushi', 'gir-1.0'),
diff --git a/src/meson.build b/src/meson.build
index 720faeb..87b9b8f 100644
--- a/src/meson.build
+++ b/src/meson.build
@@ -1,6 +1,4 @@
-gnome = import(
-  'gnome'
-)
+gnome = import('gnome')
 
 sushi_sources = [
   'main.c',
@@ -56,7 +54,7 @@ sushi_resources = gnome.compile_resources(
 
 sushi_sources += sushi_resources
 
-sushi_start = executable(
+executable(
   'sushi-start',
   sushi_sources,
   # link against the just built libsushi
@@ -66,6 +64,7 @@ sushi_start = executable(
 )
 
 conf = configuration_data()
+
 conf.set(
   'pkgdatadir',
   join_paths(datadir, 'sushi'),
@@ -88,7 +87,7 @@ sushi_bin = configure_file(
 install_data(
   sushi_bin,
   install_mode: 'rwxr-xr-x',
-  install_dir: join_paths(get_option('prefix'), get_option('bindir')),
+  install_dir: bindir,
 )
 
 # Install the Javascript components without installing path.js.in as well