docs|access: Don't build the ACL flags into a separate XML

Since we now build it into the libvirt-api.xml or equivalents we don't
need the extra XML files.

Signed-off-by: Peter Krempa <pkrempa@redhat.com>
Reviewed-by: Ján Tomko <jtomko@redhat.com>

diff --git a/docs/html/meson.build b/docs/html/meson.build
index 4e818f9142c92a1b5ca5df0a60f4c3303254b4cd..b18a8ccb5fa2140b718d9c4fd9632b231fc06753 100644 (file)
--- a/docs/html/meson.build
+++ b/docs/html/meson.build
@@ -27,14 +27,12 @@ index_api_gen = custom_target(
   command: [
     xsltproc_prog, '--nonet', '-o', docs_builddir,
     '--stringparam', 'builddir', meson.project_build_root(),
-    '--stringparam', 'aclxmlpath', docs_acl_xml.full_path(),
     '--stringparam', 'timestamp', docs_timestamp,
     '--stringparam', 'indexfile', 'index.html',
     '@INPUT@',
   ],
   install: true,
   install_dir: docs_html_dir / 'html',
-  depends: docs_acl_xml,
   depend_files: [
     page_xsl,
   ],
@@ -43,7 +41,7 @@ index_api_gen = custom_target(
 docs_html_gen += index_api_gen.to_list()
 docs_html_dep += index_api_gen
 
-foreach name : [ 'lxc', 'qemu' ]
+foreach name : [ 'admin', 'lxc', 'qemu' ]
   index_api_gen = custom_target(
     'index-@0@-api'.format(name),
     input: [
@@ -56,13 +54,11 @@ foreach name : [ 'lxc', 'qemu' ]
     command: [
       xsltproc_prog, '--nonet', '-o', docs_builddir,
       '--stringparam', 'builddir', meson.project_build_root(),
-      '--stringparam', 'aclxmlpath', get_variable('docs_acl_@0@_xml'.format(name)).full_path(),
       '--stringparam', 'timestamp', docs_timestamp,
       '@INPUT@',
     ],
     install: true,
     install_dir: docs_html_dir / 'html',
-    depends:  get_variable('docs_acl_@0@_xml'.format(name)),
     depend_files: [
       page_xsl,
     ],
@@ -72,32 +68,6 @@ foreach name : [ 'lxc', 'qemu' ]
   docs_html_dep += index_api_gen
 endforeach
 
-index_api_gen = custom_target(
-  'index-admin-api'.format(name),
-  input: [
-    newapi_xsl,
-    docs_admin_api_xml,
-    ],
-  output: [
-    'libvirt-libvirt-admin.html'
-    ],
-  command: [
-    xsltproc_prog, '--nonet', '-o', docs_builddir,
-    '--stringparam', 'builddir', meson.project_build_root(),
-    '--stringparam', 'aclxmlpath', '',
-    '--stringparam', 'timestamp', docs_timestamp,
-    '@INPUT@',
-    ],
-  install: true,
-  install_dir: docs_html_dir / 'html',
-  depend_files: [
-    page_xsl,
-    ],
-  )
-
-docs_html_gen += index_api_gen.to_list()
-docs_html_dep += index_api_gen
-
 docs_html_paths = []
 
 install_web_deps += docs_html_dep

diff --git a/src/access/meson.build b/src/access/meson.build
index 0b12581dc16fdf3de17afa8b5f25591c6f78db32..07c703e8b5a05b390a7bc1776f3d7b2c18e34927 100644 (file)
--- a/src/access/meson.build
+++ b/src/access/meson.build
@@ -23,12 +23,10 @@ foreach name : [ 'remote', 'qemu', 'lxc' ]
     header_file = 'viraccessapicheck.h'
     source_file = 'viraccessapicheck.c'
     syms_file = 'libvirt_access.syms'
-    xml_file = 'libvirt_access.xml'
   else
     header_file = 'viraccessapicheck@0@.h'.format(name)
     source_file = 'viraccessapicheck@0@.c'.format(name)
     syms_file = 'libvirt_access_@0@.syms'.format(name)
-    xml_file = 'libvirt_access_@0@.xml'.format(name)
   endif
   protocol_file = remote_path / '@0@_protocol.x'.format(name)
 
@@ -62,22 +60,8 @@ foreach name : [ 'remote', 'qemu', 'lxc' ]
       gendispatch_prog, '--mode=aclsym', name, name.to_upper(), '@INPUT@',
     ]
   )
-
-  access_gen_xml += custom_target(
-    xml_file,
-    input: protocol_file,
-    output: xml_file,
-    capture: true,
-    command: [
-      gendispatch_prog, '--mode=aclapi', name, name.to_upper(), '@INPUT@',
-    ],
-  )
 endforeach
 
-docs_acl_xml = access_gen_xml[0]
-docs_acl_qemu_xml = access_gen_xml[1]
-docs_acl_lxc_xml = access_gen_xml[2]
-
 if conf.has('WITH_POLKIT')
   access_sources += access_polkit_sources