[libvirt PATCH 320/351] meson: docs: introduce docs_rst2html_gen generator

Pavel Hrdina phrdina at redhat.com
Thu Jul 16 09:59:16 UTC 2020


Signed-off-by: Pavel Hrdina <phrdina at redhat.com>
---
 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 0584702f7a1..a2fe2fbdc75 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 bbe012491f3..b3f41a188ff 100644
--- a/docs/meson.build
+++ b/docs/meson.build
@@ -72,3 +72,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 at .html.in',
+  arguments: [ '--strict', '@INPUT@' ],
+  capture: true,
+)
-- 
2.26.2




More information about the libvir-list mailing list