diff options
| author | Marc-André Lureau <marcandre.lureau@redhat.com> | 2019-08-15 12:01:26 +0400 |
|---|---|---|
| committer | Paolo Bonzini <pbonzini@redhat.com> | 2020-08-21 06:30:24 -0400 |
| commit | 5242523b5f35813c8e088bc8eae2fb4d4aa50dd6 (patch) | |
| tree | 8266deab63138d256ea691c331679074bcedd818 /qapi | |
| parent | c574e161120aa0b8c76ee90d21d43c6e53e7f1ba (diff) | |
| download | qemu-5242523b5f35813c8e088bc8eae2fb4d4aa50dd6.zip qemu-5242523b5f35813c8e088bc8eae2fb4d4aa50dd6.tar.gz qemu-5242523b5f35813c8e088bc8eae2fb4d4aa50dd6.tar.bz2 | |
meson: convert qapi-specific to meson
Signed-off-by: Marc-André Lureau <marcandre.lureau@redhat.com>
Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
Diffstat (limited to 'qapi')
| -rw-r--r-- | qapi/Makefile.objs | 15 | ||||
| -rw-r--r-- | qapi/meson.build | 10 |
2 files changed, 7 insertions, 18 deletions
diff --git a/qapi/Makefile.objs b/qapi/Makefile.objs deleted file mode 100644 index c0a31be..0000000 --- a/qapi/Makefile.objs +++ /dev/null @@ -1,15 +0,0 @@ -QAPI_TARGET_MODULES = machine-target misc-target - -obj-y = qapi-introspect.o -obj-y += $(QAPI_TARGET_MODULES:%=qapi-types-%.o) -obj-y += qapi-types.o -obj-y += $(QAPI_TARGET_MODULES:%=qapi-visit-%.o) -obj-y += qapi-visit.o -obj-y += $(QAPI_TARGET_MODULES:%=qapi-events-%.o) -obj-y += qapi-events.o -obj-y += $(QAPI_TARGET_MODULES:%=qapi-commands-%.o) -obj-y += qapi-commands.o -obj-y += qapi-init-commands.o - -QAPI_MODULES_STORAGE_DAEMON = block-core char common control crypto -QAPI_MODULES_STORAGE_DAEMON += introspect job qom sockets pragma transaction diff --git a/qapi/meson.build b/qapi/meson.build index f45b80b..2b2872a 100644 --- a/qapi/meson.build +++ b/qapi/meson.build @@ -114,8 +114,12 @@ foreach output : qapi_util_outputs i = i + 1 endforeach -# These are still handled by the Makefile -i += qapi_nonmodule_outputs.length() -i += qapi_specific_outputs.length() +foreach output : qapi_specific_outputs + qapi_nonmodule_outputs + if output.endswith('.h') + genh += qapi_files[i] + endif + specific_ss.add(when: 'CONFIG_SOFTMMU', if_true: qapi_files[i]) + i = i + 1 +endforeach qapi_doc_texi = qapi_files[i] |