[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PULL v8 085/152] meson: convert qapi-specific to meson
From: |
Paolo Bonzini |
Subject: |
[PULL v8 085/152] meson: convert qapi-specific to meson |
Date: |
Fri, 21 Aug 2020 06:22:22 -0400 |
From: Marc-André Lureau <marcandre.lureau@redhat.com>
Signed-off-by: Marc-André Lureau <marcandre.lureau@redhat.com>
Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
---
Makefile.objs | 2 --
Makefile.target | 1 -
qapi/Makefile.objs | 15 ---------------
qapi/meson.build | 10 +++++++---
4 files changed, 7 insertions(+), 21 deletions(-)
delete mode 100644 qapi/Makefile.objs
diff --git a/Makefile.objs b/Makefile.objs
index 3b32a4c9bb..c332323b81 100644
--- a/Makefile.objs
+++ b/Makefile.objs
@@ -64,8 +64,6 @@ common-obj-$(if $(and $(CONFIG_BZIP2),$(CONFIG_DMG)),m) +=
block-dmg-bz2$(DSOSUF
common-obj-y += hw/
common-obj-m += hw/
-common-obj-y += qapi/
-
common-obj-y += libqmp.fa
endif # CONFIG_SOFTMMU
diff --git a/Makefile.target b/Makefile.target
index bf3fda92c1..386378b9c8 100644
--- a/Makefile.target
+++ b/Makefile.target
@@ -157,7 +157,6 @@ ifdef CONFIG_SOFTMMU
obj-y += softmmu/
obj-y += gdbstub.o
obj-y += hw/
-obj-y += qapi/
LIBS := $(libs_softmmu) $(LIBS)
# Temporary until emulators are linked by Meson
diff --git a/qapi/Makefile.objs b/qapi/Makefile.objs
deleted file mode 100644
index c0a31be1a1..0000000000
--- 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 f45b80bbfa..2b2872a41d 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]
--
2.26.2
- [PULL v8 076/152] meson: convert dump/, (continued)
- [PULL v8 076/152] meson: convert dump/, Paolo Bonzini, 2020/08/21
- [PULL v8 071/152] meson: convert audio directory to Meson, Paolo Bonzini, 2020/08/21
- [PULL v8 078/152] meson: convert qemu-storage-daemon, Paolo Bonzini, 2020/08/21
- [PULL v8 079/152] meson: convert replay directory to Meson, Paolo Bonzini, 2020/08/21
- [PULL v8 080/152] meson: convert migration directory to Meson, Paolo Bonzini, 2020/08/21
- [PULL v8 070/152] meson: convert tests/qtest to meson, Paolo Bonzini, 2020/08/21
- [PULL v8 082/152] meson: convert backends directory to Meson, Paolo Bonzini, 2020/08/21
- [PULL v8 081/152] meson: convert net directory to Meson, Paolo Bonzini, 2020/08/21
- [PULL v8 077/152] meson: convert common QMP bits for qemu and qemu-storage-daemon, Paolo Bonzini, 2020/08/21
- [PULL v8 072/152] meson: convert ui directory to Meson, Paolo Bonzini, 2020/08/21
- [PULL v8 085/152] meson: convert qapi-specific to meson,
Paolo Bonzini <=
- [PULL v8 084/152] meson: convert disas directory to Meson, Paolo Bonzini, 2020/08/21
- [PULL v8 089/152] meson: convert hw/nubus, Paolo Bonzini, 2020/08/21
- [PULL v8 087/152] meson: convert hw/core, Paolo Bonzini, 2020/08/21
- [PULL v8 083/152] meson: convert fsdev/, Paolo Bonzini, 2020/08/21
- [PULL v8 086/152] meson: convert hw/xen, Paolo Bonzini, 2020/08/21
- [PULL v8 090/152] meson: convert hw/smbios, Paolo Bonzini, 2020/08/21
- [PULL v8 091/152] meson: convert hw/mem, Paolo Bonzini, 2020/08/21
- [PULL v8 093/152] meson: convert hw/virtio, Paolo Bonzini, 2020/08/21
- [PULL v8 096/152] meson: convert hw/tpm, Paolo Bonzini, 2020/08/21
- [PULL v8 098/152] meson: convert hw/rtc, Paolo Bonzini, 2020/08/21