All of lore.kernel.org
 help / color / mirror / Atom feed
From: ross.burton@arm.com
To: linux-trace-devel@vger.kernel.org
Cc: nd@arm.com
Subject: [PATCH 1/3] meson: add option to disable documentation
Date: Thu, 31 Aug 2023 11:04:36 +0100	[thread overview]
Message-ID: <20230831100438.3946997-1-ross.burton@arm.com> (raw)

From: Ross Burton <ross.burton@arm.com>

Building the documentation shouldn't be mandatory, as it needs asciidoc
and xmlto.  Add a "docs" option, defaulting to true, to control whether
the documentation should be built.

Signed-off-by: Ross Burton <ross.burton@arm.com>
---
 meson.build       | 15 +++++++++------
 meson_options.txt |  4 ++++
 2 files changed, 13 insertions(+), 6 deletions(-)

diff --git a/meson.build b/meson.build
index b61c873..506b0e8 100644
--- a/meson.build
+++ b/meson.build
@@ -45,10 +45,13 @@ if cunit_dep.found()
     subdir('utest')
 endif
 subdir('samples')
-subdir('Documentation')
 
-custom_target(
-    'docs',
-    output: 'docs',
-    depends: [html, man],
-    command: ['echo'])
+if get_option('docs')
+    subdir('Documentation')
+
+    custom_target(
+        'docs',
+        output: 'docs',
+        depends: [html, man],
+        command: ['echo'])
+endif
diff --git a/meson_options.txt b/meson_options.txt
index b2294f6..0611216 100644
--- a/meson_options.txt
+++ b/meson_options.txt
@@ -4,6 +4,10 @@
 
 option('plugindir', type : 'string',
        description : 'set the plugin dir')
+
+option('docs', type : 'boolean', value: true,
+       description : 'build documentation')
+
 option('htmldir', type : 'string', value : 'share/doc/libtraceevent-doc',
        description : 'directory for HTML documentation')
 option('asciidoctor', type : 'boolean', value: false,
-- 
2.34.1


             reply	other threads:[~2023-08-31 10:04 UTC|newest]

Thread overview: 3+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2023-08-31 10:04 ross.burton [this message]
2023-08-31 10:04 ` [PATCH 2/3] meson: build plugins as modules ross.burton
2023-08-31 10:04 ` [PATCH 3/3] meson: set the default plugindir to make Makefile ross.burton

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=20230831100438.3946997-1-ross.burton@arm.com \
    --to=ross.burton@arm.com \
    --cc=linux-trace-devel@vger.kernel.org \
    --cc=nd@arm.com \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body. 
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.