[PATCH 02/32] docs: meson: Simplify generation of html files
Just convert 'docs_html_in_files' into 'docs_html_in_gen'. The target
definitions for those were almost the same.
Signed-off-by: Peter Krempa <pkrempa(a)redhat.com>
---
docs/meson.build | 37 ++++++++-----------------------------
1 file changed, 8 insertions(+), 29 deletions(-)
diff --git a/docs/meson.build b/docs/meson.build
index 773e127ca7..c70669e071 100644
--- a/docs/meson.build
+++ b/docs/meson.build
@@ -191,35 +191,6 @@ docs_rst2html_gen = generator(
capture: true,
)
-foreach name : docs_html_in_files
- html_in_file = '@0@.html.in'.format(name)
- html_file = '@0@.html'.format(name)
-
- out_file = custom_target(
- html_file,
- input: html_in_file,
- output: html_file,
- command: [
- meson_python_prog,
- meson_html_gen_prog,
- xsltproc_prog.path(),
- xmllint_prog.path(),
- meson.build_root(),
- docs_timestamp,
- site_xsl,
- '@INPUT@',
- '@OUTPUT@',
- ],
- depends: [ aclperms_gen ],
- depend_files: [ page_xsl ],
- install: true,
- install_dir: docs_html_dir,
- )
-
- install_web_deps += out_file
- install_web_files += '@0@:@1@'.format(out_file.full_path(), docs_html_dir)
-endforeach
-
# docs_html_in_gen:
# each entry is a dictionary with following items:
@@ -227,6 +198,14 @@ endforeach
# file - generated file (required)
docs_html_in_gen = []
+foreach name : docs_html_in_files
+ html_in_file = '@0@.html.in'.format(name)
+ docs_html_in_gen += {
+ 'name': name,
+ 'file': html_in_file,
+ }
+endforeach
+
foreach name : docs_rst_files
rst_file = '@0@.rst'.format(name)
docs_html_in_gen += {
--
2.26.2