From 983892a656743cf2db89e6f824a9afb25c71b075 Mon Sep 17 00:00:00 2001 From: Ernestas Kulik Date: Wed, 13 Dec 2017 20:13:54 +0200 Subject: build: general cleanups MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 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. --- docs/meson.build | 4 +-- docs/reference/libnautilus-extension/meson.build | 32 ++++++++++++++---------- docs/reference/meson.build | 2 +- 3 files changed, 22 insertions(+), 16 deletions(-) (limited to 'docs') diff --git a/docs/meson.build b/docs/meson.build index 036ecd4d8..b039cb631 100644 --- a/docs/meson.build +++ b/docs/meson.build @@ -1,3 +1,3 @@ -install_man ('nautilus.1') +install_man('nautilus.1') -subdir ('reference') +subdir('reference') diff --git a/docs/reference/libnautilus-extension/meson.build b/docs/reference/libnautilus-extension/meson.build index 2921cb9ac..151c857af 100644 --- a/docs/reference/libnautilus-extension/meson.build +++ b/docs/reference/libnautilus-extension/meson.build @@ -1,15 +1,21 @@ -docs_conf = configuration_data () -docs_conf.set ('NAUTILUS_EXTENSION_VERSION_INFO', nautilus_extension_version) +docs_conf = configuration_data() +docs_conf.set('NAUTILUS_EXTENSION_VERSION_INFO', nautilus_extension_version) -docs_version = configure_file (input: 'version.xml.in', - output: 'version.xml', - configuration: docs_conf) +configure_file( + input: 'version.xml.in', + output: 'version.xml', + configuration: docs_conf +) -gnome.gtkdoc ('libnautilus-extension', - main_xml: 'libnautilus-extension-docs.xml', - src_dir: join_paths (meson.source_root (), 'libnautilus-extension'), - dependencies: nautilus_extension, - gobject_typesfile: 'libnautilus-extension.types', - install: true, - scan_args: ['--ignore-headers=nautilus-extension-private.h', - '--rebuild-types']) +gnome.gtkdoc( + 'libnautilus-extension', + main_xml: 'libnautilus-extension-docs.xml', + src_dir: join_paths(meson.source_root(), 'libnautilus-extension'), + dependencies: nautilus_extension, + gobject_typesfile: 'libnautilus-extension.types', + install: true, + scan_args: [ + '--ignore-headers=nautilus-extension-private.h', + '--rebuild-types' + ] +) diff --git a/docs/reference/meson.build b/docs/reference/meson.build index 46b538208..a352d2680 100644 --- a/docs/reference/meson.build +++ b/docs/reference/meson.build @@ -1 +1 @@ -subdir ('libnautilus-extension') +subdir('libnautilus-extension') -- cgit v1.2.1