meson: docs: build news.html from NEWS.rst

Signed-off-by: Pavel Hrdina <phrdina@redhat.com>
Reviewed-by: Peter Krempa <pkrempa@redhat.com>
Reviewed-by: Neal Gompa <ngompa13@gmail.com>

diff --git a/docs/Makefile.am b/docs/Makefile.am
index 73d3d26422aa81328ce2a718c5063d5cea9d71c3..1a5ae23b0aef51c4b3c5d794d7b7a1c28ab7fafd 100644 (file)
--- a/docs/Makefile.am
+++ b/docs/Makefile.am
@@ -277,17 +277,6 @@ manpages/virkeyname-%.rst: $(top_srcdir)/src/keycodemapdb/data/keymaps.csv \
 manpagesdir = $(HTML_DIR)/manpages
 manpages_DATA = $(manpages_html)
 
-dot_rst_html_in = \
-  news.html.in \
-  $(NULL)
-dot_html = \
-  $(dot_html_generated_in:%.html.in=%.html) \
-  $(dot_html_in:%.html.in=%.html) \
-  $(dot_rst_html_in:%.html.in=%.html)
-
-htmldir = $(HTML_DIR)
-html_DATA = $(dot_html)
-
 schemadir = $(pkgdatadir)/schemas
 schema_DATA = $(wildcard $(srcdir)/schemas/*.rng)
 
@@ -298,10 +287,6 @@ manpages/%.html.in: manpages/%.rst
             -e 's|RUNSTATEDIR|$(runstatedir)|g' | \
          $(RST2HTML) --strict > $@ || { rm $@ && exit 1; }
 
-news.html.in: $(top_srcdir)/NEWS.rst
-       $(AM_V_GEN)$(MKDIR_P) `dirname $@` && \
-         $(RST2HTML) --strict $< > $@ || { rm $@ && exit 1; }
-
 $(apihtml_generated): html/index.html
 $(apiadminhtml_generated): html/index-admin.html
 $(apiqemuhtml_generated): html/index-qemu.html

diff --git a/docs/meson.build b/docs/meson.build
index a9e8c1a74f1caf3d60fc79c32b5fc1d0885d7719..d86d9c6c1dac1b22ec3dbb16bc111f5fcadbf144 100644 (file)
--- a/docs/meson.build
+++ b/docs/meson.build
@@ -254,6 +254,12 @@ docs_html_in_gen += {
   'file': hvsupport_html_in,
 }
 
+news_html_in = docs_rst2html_gen.process(meson.source_root() / 'NEWS.rst')
+docs_html_in_gen += {
+  'name': 'news',
+  'file': news_html_in,
+}
+
 foreach data : docs_html_in_gen
   html_file = '@0@.html'.format(data['name'])
   rst_in_file = '@0@.rst'.format(data['name'])