doc: reduce whitespace in meson build file
authorBruce Richardson <bruce.richardson@intel.com>
Fri, 10 Jan 2020 21:52:03 +0000 (21:52 +0000)
committerDavid Marchand <david.marchand@redhat.com>
Wed, 15 Jan 2020 07:50:28 +0000 (08:50 +0100)
For building the guides, we can make the meson.build easier to read by
using the subdir_done function to quit early.

Cc: stable@dpdk.org
Signed-off-by: Bruce Richardson <bruce.richardson@intel.com>
Acked-by: Aaron Conole <aconole@redhat.com>
Acked-by: Luca Boccassi <bluca@debian.org>
doc/guides/meson.build

index 7931ef3..80c21d1 100644 (file)
@@ -3,26 +3,28 @@
 
 sphinx = find_program('sphinx-build', required: get_option('enable_docs'))
 
-if sphinx.found()
-       htmldir = join_paths('share', 'doc', 'dpdk')
-       html_guides_build = custom_target('html_guides_build',
-               input: meson.current_source_dir(),
-               output: 'guides',
-               command: [sphinx, '-b', 'html',
-                       '-d', meson.current_build_dir() + '/.doctrees',
-                       '@INPUT@', meson.current_build_dir() + '/guides'],
-               build_by_default: get_option('enable_docs'),
-               install: get_option('enable_docs'),
-               install_dir: htmldir)
+if not sphinx.found()
+       subdir_done()
+endif
 
-       doc_targets += html_guides_build
-       doc_target_names += 'HTML_Guides'
+htmldir = join_paths('share', 'doc', 'dpdk')
+html_guides = custom_target('html_guides',
+       input: meson.current_source_dir(),
+       output: 'guides',
+       command: [sphinx, '-b', 'html',
+               '-d', meson.current_build_dir() + '/.doctrees',
+               '@INPUT@', meson.current_build_dir() + '/guides'],
+       build_by_default: get_option('enable_docs'),
+       install: get_option('enable_docs'),
+       install_dir: htmldir)
 
-       # sphinx leaves a .buildinfo in the target directory, which we don't
-       # want to install. Note that sh -c has to be used, otherwise the
-       # env var does not get expanded if calling rm/install directly.
-       meson.add_install_script('sh', '-c',
-               'rm -f $MESON_INSTALL_DESTDIR_PREFIX/share/doc/dpdk/guides/.buildinfo')
-       meson.add_install_script('sh', '-c',
-               'install -D -m0644 $MESON_SOURCE_ROOT/doc/guides/custom.css $MESON_INSTALL_DESTDIR_PREFIX/share/doc/dpdk/guides/_static/css/custom.css')
-endif
+doc_targets += html_guides
+doc_target_names += 'HTML_Guides'
+
+# sphinx leaves a .buildinfo in the target directory, which we don't
+# want to install. Note that sh -c has to be used, otherwise the
+# env var does not get expanded if calling rm/install directly.
+meson.add_install_script('sh', '-c',
+       'rm -f $MESON_INSTALL_DESTDIR_PREFIX/share/doc/dpdk/guides/.buildinfo')
+meson.add_install_script('sh', '-c',
+       'install -D -m0644 $MESON_SOURCE_ROOT/doc/guides/custom.css $MESON_INSTALL_DESTDIR_PREFIX/share/doc/dpdk/guides/_static/css/custom.css')