On Tue, 29 Sep 2020 at 09:28, Markus Armbruster <[email protected]> wrote: > > Peter Maydell <[email protected]> writes: > > diff --git a/qapi/meson.build b/qapi/meson.build > > index 2b2872a41d8..a287ca5d9d7 100644 > > --- a/qapi/meson.build > > +++ b/qapi/meson.build > > @@ -97,7 +97,7 @@ foreach module : qapi_all_modules > > endforeach > > > > qapi_files = custom_target('shared QAPI source files', > > - output: qapi_util_outputs + qapi_specific_outputs + > > qapi_nonmodule_outputs + ['qapi-doc.texi'], > > + output: qapi_util_outputs + qapi_specific_outputs + > > qapi_nonmodule_outputs, > > input: [ files('qapi-schema.json') ], > > command: [ qapi_gen, '-o', 'qapi', '-b', '@INPUT0@' ], > > depend_files: [ qapi_inputs, qapi_gen_depends ]) > > @@ -121,5 +121,3 @@ foreach output : qapi_specific_outputs + > > qapi_nonmodule_outputs > > specific_ss.add(when: 'CONFIG_SOFTMMU', if_true: qapi_files[i]) > > i = i + 1 > > endforeach > > - > > -qapi_doc_texi = qapi_files[i] > > Doesn't storage-daemon/qapi/meson.build need a similar update?
I was previously unaware of storage-daemon/qapi... It looks like we don't actually do anything with the generated qapi-doc.texi there, so I'm not sure why we were listing it as an output. I think we should only need to remove the " + ['qapi-doc.texi']" in storage-daemon/qapi/meson.build, and that should be a separate change after this one and before we remove scripts/qapi/doc.py. thanks -- PMM
