From 89bcfe780a8e1a900d94014dfdef756cc3eb8221 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Marc-Andr=C3=A9=20Lureau?= Date: Fri, 15 Oct 2021 14:36:16 +0400 Subject: [PATCH] meson: drop sphinx_extn_depends MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Module dependencies is now handled by depfile.py. Signed-off-by: Marc-André Lureau Reviewed-by: John Snow Reviewed-by: Paolo Bonzini --- docs/meson.build | 9 +-------- tests/qapi-schema/meson.build | 1 - 2 files changed, 1 insertion(+), 9 deletions(-) diff --git a/docs/meson.build b/docs/meson.build index 19cce670a2..34fda6853d 100644 --- a/docs/meson.build +++ b/docs/meson.build @@ -37,13 +37,6 @@ endif if build_docs SPHINX_ARGS += ['-Dversion=' + meson.project_version(), '-Drelease=' + config_host['PKGVERSION']] - sphinx_extn_depends = [ meson.current_source_dir() / 'sphinx/depfile.py', - meson.current_source_dir() / 'sphinx/hxtool.py', - meson.current_source_dir() / 'sphinx/kerneldoc.py', - meson.current_source_dir() / 'sphinx/kernellog.py', - meson.current_source_dir() / 'sphinx/qapidoc.py', - meson.current_source_dir() / 'sphinx/qmp_lexer.py', - qapi_gen_depends ] sphinx_template_files = [ meson.project_source_root() / 'docs/_templates/footer.html' ] have_ga = have_tools and config_host.has_key('CONFIG_GUEST_AGENT') @@ -77,7 +70,7 @@ if build_docs output: 'docs.stamp', input: files('conf.py'), depfile: 'docs.d', - depend_files: [ sphinx_extn_depends, sphinx_template_files ], + depend_files: [ sphinx_template_files ], command: [SPHINX_ARGS, '-Ddepfile=@DEPFILE@', '-Ddepfile_stamp=@OUTPUT0@', '-b', 'html', '-d', private_dir, diff --git a/tests/qapi-schema/meson.build b/tests/qapi-schema/meson.build index d91d972af2..caf0791ba8 100644 --- a/tests/qapi-schema/meson.build +++ b/tests/qapi-schema/meson.build @@ -241,7 +241,6 @@ if build_docs output: ['doc-good.txt'], input: files('doc-good.json', 'doc-good.rst'), build_by_default: true, - depend_files: sphinx_extn_depends, depfile: 'docs.d', # We use -E to suppress Sphinx's caching, because # we want it to always really run the QAPI doc