From 75ddfa96c1963644bc6aa596132c4c00199baf00 Mon Sep 17 00:00:00 2001 From: Pavel Hrdina Date: Thu, 18 Jun 2020 02:23:00 +0200 Subject: [PATCH] meson: docs: introduce docs_rst2html_gen generator Signed-off-by: Pavel Hrdina Reviewed-by: Peter Krempa Reviewed-by: Neal Gompa --- docs/Makefile.am | 4 ---- docs/meson.build | 7 +++++++ 2 files changed, 7 insertions(+), 4 deletions(-) diff --git a/docs/Makefile.am b/docs/Makefile.am index 0584702f7a..a2fe2fbdc7 100644 --- a/docs/Makefile.am +++ b/docs/Makefile.am @@ -320,10 +320,6 @@ news.html.in: $(top_srcdir)/NEWS.rst $(AM_V_GEN)$(MKDIR_P) `dirname $@` && \ $(RST2HTML) --strict $< > $@ || { rm $@ && exit 1; } -%.html.in: %.rst - $(AM_V_GEN)$(MKDIR_P) `dirname $@` && \ - $(RST2HTML) --strict $< > $@ || { rm $@ && exit 1; } - %.html.tmp: %.html.in site.xsl subsite.xsl page.xsl \ $(acl_generated) $(AM_V_GEN)name=`echo $@ | sed -e 's/.tmp//'`; \ diff --git a/docs/meson.build b/docs/meson.build index f271c0aa23..2812c85c05 100644 --- a/docs/meson.build +++ b/docs/meson.build @@ -73,3 +73,10 @@ docs_api_xml = docs_api_generated[0] docs_lxc_api_xml = docs_api_generated[1] docs_qemu_api_xml = docs_api_generated[2] docs_admin_api_xml = docs_api_generated[3] + +docs_rst2html_gen = generator( + rst2html_prog, + output: '@BASENAME@.html.in', + arguments: [ '--strict', '@INPUT@' ], + capture: true, +)