mirrors/qemu
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

meson: drop sphinx_extn_depends

Browse Source 
Module dependencies is now handled by depfile.py.

Signed-off-by: Marc-André Lureau <marcandre.lureau@redhat.com>
Reviewed-by: John Snow <jsnow@redhat.com>
Reviewed-by: Paolo Bonzini <pbonzini@redhat.com>
This commit is contained in:
Marc-André Lureau 2021-10-15 14:36:16 +04:00
parent 706bbad2ba
commit 89bcfe780a
2 changed files with 1 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
docs/meson.build
View File

@ -37,13 +37,6 @@ endif
if build_docs if build_docs
SPHINX_ARGS += ['-Dversion=' + meson.project_version(), '-Drelease=' + config_host['PKGVERSION']] 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' ] sphinx_template_files = [ meson.project_source_root() / 'docs/_templates/footer.html' ]
have_ga = have_tools and config_host.has_key('CONFIG_GUEST_AGENT') have_ga = have_tools and config_host.has_key('CONFIG_GUEST_AGENT')
@ -77,7 +70,7 @@ if build_docs
output: 'docs.stamp', output: 'docs.stamp',
input: files('conf.py'), input: files('conf.py'),
depfile: 'docs.d', depfile: 'docs.d',
depend_files: [ sphinx_extn_depends, sphinx_template_files ], depend_files: [ sphinx_template_files ],
command: [SPHINX_ARGS, '-Ddepfile=@DEPFILE@', command: [SPHINX_ARGS, '-Ddepfile=@DEPFILE@',
'-Ddepfile_stamp=@OUTPUT0@', '-Ddepfile_stamp=@OUTPUT0@',
'-b', 'html', '-d', private_dir, '-b', 'html', '-d', private_dir,

1
tests/qapi-schema/meson.build
View File

@ -241,7 +241,6 @@ if build_docs
output: ['doc-good.txt'], output: ['doc-good.txt'],
input: files('doc-good.json', 'doc-good.rst'), input: files('doc-good.json', 'doc-good.rst'),
build_by_default: true, build_by_default: true,
depend_files: sphinx_extn_depends,
depfile: 'docs.d', depfile: 'docs.d',
# We use -E to suppress Sphinx's caching, because # We use -E to suppress Sphinx's caching, because
# we want it to always really run the QAPI doc # we want it to always really run the QAPI doc