[tracker: 1/3] build: Separate manpages install option from gtk-doc generation
- From: Carlos Garnacho <carlosg src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [tracker: 1/3] build: Separate manpages install option from gtk-doc generation
- Date: Mon, 18 Feb 2019 22:28:11 +0000 (UTC)
commit 016ee4711ecddc4448910d909dbe03619cf9ff74
Author: Mart Raudsepp <leio gentoo org>
Date: Wed Feb 13 12:28:53 2019 +0200
build: Separate manpages install option from gtk-doc generation
The main use case for the docs option seems to be to not spend time on
gtk-doc generation. It is rather unexpected this also disables the
installation of manpages, which are just installed as-is with no work
involved.
docs/meson.build | 10 +++++++---
meson.build | 6 +-----
meson_options.txt | 4 +++-
3 files changed, 11 insertions(+), 9 deletions(-)
---
diff --git a/docs/meson.build b/docs/meson.build
index 76e59797e..e43b12a8b 100644
--- a/docs/meson.build
+++ b/docs/meson.build
@@ -1,3 +1,7 @@
-subdir('tools')
-subdir('manpages')
-subdir('reference')
+if get_option('man')
+ subdir('manpages')
+endif
+if get_option('docs')
+ subdir('tools')
+ subdir('reference')
+endif
diff --git a/meson.build b/meson.build
index 10bb5d1bd..1cf715eb1 100644
--- a/meson.build
+++ b/meson.build
@@ -328,11 +328,7 @@ typelib_dir = gobject_introspection.get_pkgconfig_variable('typelibdir',
subdir('src')
subdir('data')
-
-if get_option('docs')
- subdir('docs')
-endif
-
+subdir('docs')
subdir('examples')
subdir('utils')
diff --git a/meson_options.txt b/meson_options.txt
index b36ba1d1e..030940dd4 100644
--- a/meson_options.txt
+++ b/meson_options.txt
@@ -1,11 +1,13 @@
option('docs', type: 'boolean', value: true,
- description: 'Enable the documentation')
+ description: 'Generate API documentation with gtk-doc')
option('fts', type: 'boolean', value: true,
description: 'Enable the Tracker full-text search feature')
option('functional_tests', type: 'boolean', value: true,
description: 'Enable the Tracker functional test suite')
option('journal', type: 'boolean', value: true,
description: 'Enable database journal backup mechanism')
+option('man', type: 'boolean', value: true,
+ description: 'Install man pages')
option('network_manager', type: 'combo', choices: ['auto', 'no', 'yes'], value: 'auto',
description: 'Enable connection detection through NetworkManager')
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]