build: general cleanups

This commit does the following:
  * Canonicalize the style:
    * Use two-space indentations.
    * Un-Autotools-ify option names.
    * Don’t align arguments, simply increase indentation.
    * Don’t add a space before opening parenthesis in calls.
  * Remove unused variables.
  * Remove unused dependencies.
  * Remove config.h.meson.
  * Optimize dependencies.
  * Use disabler functionality for libselinux dependency, to save lines.

1 files changed, 96 insertions, 60 deletions

diff --git a/data/meson.build b/data/meson.build
index e185428f4..00a451fc9 100644
--- a/data/meson.build
+++ b/data/meson.build
@@ -1,63 +1,99 @@
-subdir ('icons')
-
-po_dir = join_paths (meson.source_root (), 'po')
-
-line_up_parameters = executable ('lineup-parameters',
-                                 'lineup-parameters.c',
-                                 dependencies: [gio, gio_unix])
-
-desktop = i18n.merge_file ('desktop',
-                           input: 'org.gnome.Nautilus.desktop.in',
-                           output: 'org.gnome.Nautilus.desktop',
-                           install: true,
-                           install_dir: desktopdir,
-                           po_dir: po_dir,
-                           type: 'desktop')
-
-desktop_autorun_software = i18n.merge_file ('desktop-autorun-software',
-                                            input: 'nautilus-autorun-software.desktop.in',
-                                            output: 'nautilus-autorun-software.desktop',
-                                            install: true,
-                                            install_dir: desktopdir,
-                                            po_dir: po_dir,
-                                            type: 'desktop')
-
-appdata = i18n.merge_file ('appdata',
-                           input: 'org.gnome.Nautilus.appdata.xml.in',
-                           output: 'org.gnome.Nautilus.appdata.xml',
-                           install: true,
-                           install_dir: appdatadir,
-                           po_dir: po_dir,)
-
-service_conf = configuration_data ()
-service_conf.set ('bindir', join_paths (prefix, bindir))
-
-configure_file (input: 'org.gnome.Nautilus.service.in',
-                output: 'org.gnome.Nautilus.service',
-                configuration: service_conf,
-                install_dir: servicedir)
-
-configure_file (input: 'org.freedesktop.FileManager1.service.in',
-                output: 'org.freedesktop.FileManager1.service',
-                configuration: service_conf,
-                install_dir: servicedir)
-
-install_data ('nautilus-search-provider.ini',
-              install_dir: searchproviderdir)
-
-install_data ('org.gnome.nautilus.gschema.xml',
-              install_dir: schemadir)
-
-desktop_file_validate = find_program ('desktop-file-validate', required: false)
-if desktop_file_validate.found ()
-    test ('validate-desktop', desktop_file_validate,
-          args: [desktop.full_path ()])
-    test ('validate-desktop-autorun-software', desktop_file_validate,
-          args: [desktop_autorun_software.full_path ()])
+install_subdir(
+  join_paths('icons', 'hicolor'),
+  install_dir: join_paths(datadir, 'icons')
+)
+
+po_dir = join_paths(meson.source_root(), 'po')
+
+line_up_parameters = executable(
+  'lineup-parameters',
+  'lineup-parameters.c',
+  dependencies: [
+    gio,
+    gio_unix,
+  ]
+)
+
+desktop = i18n.merge_file(
+  'desktop',
+  input: 'org.gnome.Nautilus.desktop.in',
+  output: 'org.gnome.Nautilus.desktop',
+  install: true,
+  install_dir: desktopdir,
+  po_dir: po_dir,
+  type: 'desktop'
+)
+
+desktop_autorun_software = i18n.merge_file(
+  'desktop-autorun-software',
+  input: 'nautilus-autorun-software.desktop.in',
+  output: 'nautilus-autorun-software.desktop',
+  install: true,
+  install_dir: desktopdir,
+  po_dir: po_dir,
+  type: 'desktop'
+)
+
+appdata = i18n.merge_file(
+  'appdata',
+  input: 'org.gnome.Nautilus.appdata.xml.in',
+  output: 'org.gnome.Nautilus.appdata.xml',
+  install: true,
+  install_dir: join_paths(datadir, 'appdata'),
+  po_dir: po_dir
+)
+
+service_conf = configuration_data()
+service_conf.set('bindir', join_paths(prefix, bindir))
+
+configure_file(
+  input: 'org.gnome.Nautilus.service.in',
+  output: 'org.gnome.Nautilus.service',
+  configuration: service_conf,
+  install_dir: servicedir
+)
+
+configure_file(
+  input: 'org.freedesktop.FileManager1.service.in',
+  output: 'org.freedesktop.FileManager1.service',
+  configuration: service_conf,
+  install_dir: servicedir
+)
+
+install_data(
+  'nautilus-search-provider.ini',
+  install_dir: join_paths(datadir, 'gnome-shell', 'search-providers')
+)
+
+install_data(
+  'org.gnome.nautilus.gschema.xml',
+  install_dir: join_paths(datadir, 'glib-2.0', 'schemas')
+)
+
+desktop_file_validate = find_program('desktop-file-validate', required: false)
+if desktop_file_validate.found()
+  test(
+    'validate-desktop',
+    desktop_file_validate,
+    args: [
+      desktop.full_path()
+    ]
+  )
+  test(
+    'validate-desktop-autorun-software',
+    desktop_file_validate,
+    args: [
+      desktop_autorun_software.full_path()
+    ]
+  )
 endif
 
-appstream_util = find_program ('appstream-util', required: false)
-if appstream_util.found ()
-    test ('validate-appdata', appstream_util,
-          args: ['validate-relax', appdata.full_path ()])
+appstream_util = find_program('appstream-util', required: false)
+if appstream_util.found()
+  test(
+    'validate-appdata', appstream_util,
+    args: [
+      'validate-relax', appdata.full_path()
+    ]
+  )
 endif