From c41ebbc08687b5c072108885b7fab66512917d9b Mon Sep 17 00:00:00 2001 From: David Robillard Date: Sat, 3 Dec 2022 16:14:41 -0500 Subject: Replace duplicated dox_to_sphinx script with sphinxygen dependency --- doc/api/meson.build | 2 +- doc/meson.build | 9 +++++++-- 2 files changed, 8 insertions(+), 3 deletions(-) (limited to 'doc') diff --git a/doc/api/meson.build b/doc/api/meson.build index b6a1adb..42b69cd 100644 --- a/doc/api/meson.build +++ b/doc/api/meson.build @@ -3,7 +3,7 @@ c_zix_rst = custom_target( 'zix.rst', - command: [dox_to_sphinx, '-f', '@INPUT0@', '@OUTDIR@'], + command: [sphinxygen, '-f', '@INPUT0@', '@OUTDIR@'], input: [c_index_xml] + c_rst_files, output: 'zix.rst', ) diff --git a/doc/meson.build b/doc/meson.build index d0f1952..e08de60 100644 --- a/doc/meson.build +++ b/doc/meson.build @@ -4,10 +4,15 @@ docdir = get_option('datadir') / 'doc' doxygen = find_program('doxygen', required: get_option('docs')) -dox_to_sphinx = find_program('../scripts/dox_to_sphinx.py') +sphinxygen = find_program('sphinxygen', required: false) sphinx_build = find_program('sphinx-build', required: get_option('docs')) -build_docs = doxygen.found() and sphinx_build.found() +if not sphinxygen.found() + subproject('sphinxygen') + sphinxygen = find_program('sphinxygen', required: get_option('docs')) +endif + +build_docs = doxygen.found() and sphinxygen.found() and sphinx_build.found() if build_docs # Documentation Code -- cgit v1.2.1