[libvirt PATCH 319/351] meson: docs: generate aclperms.htmlinc

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


Signed-off-by: Pavel Hrdina <phrdina at redhat.com>
---
 docs/Makefile.am |  6 ------
 docs/meson.build | 10 ++++++++++
 2 files changed, 10 insertions(+), 6 deletions(-)

diff --git a/docs/Makefile.am b/docs/Makefile.am
index f54336cf35d..0584702f7a1 100644
--- a/docs/Makefile.am
+++ b/docs/Makefile.am
@@ -300,12 +300,6 @@ html_DATA = $(dot_html)
 schemadir = $(pkgdatadir)/schemas
 schema_DATA = $(wildcard $(srcdir)/schemas/*.rng)
 
-acl_generated = aclperms.htmlinc
-
-aclperms.htmlinc: $(top_srcdir)/src/access/viraccessperm.h \
-        $(top_srcdir)/scripts/genaclperms.py Makefile.am
-	$(AM_V_GEN)$(RUNUTF8) $(PYTHON) $(top_srcdir)/scripts/genaclperms.py $< > $@
-
 hvsupport.html: hvsupport.html.in
 
 hvsupport.html.in: $(top_srcdir)/scripts/hvsupport.py $(api_DATA) \
diff --git a/docs/meson.build b/docs/meson.build
index 8a0b459f598..bbe012491f3 100644
--- a/docs/meson.build
+++ b/docs/meson.build
@@ -29,6 +29,16 @@ docs_assets = [
 
 install_data(docs_assets, install_dir: docs_html_dir)
 
+aclperms_gen = custom_target(
+  'aclperms.htmlinc',
+  input: access_perm_h,
+  output: 'aclperms.htmlinc',
+  command: [
+    meson_python_prog, genaclperms_prog, '@INPUT@',
+  ],
+  capture: true,
+)
+
 docs_timestamp = run_command(meson_timestamp_prog).stdout()
 
 docs_api_generated = custom_target(
-- 
2.26.2




More information about the libvir-list mailing list