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

meson: convert qapi-specific to meson

Browse Source 
Signed-off-by: Marc-André Lureau <marcandre.lureau@redhat.com>
Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
This commit is contained in:
Marc-André Lureau 2019-08-15 12:01:26 +04:00 committed by Paolo Bonzini
parent c574e16112
commit 5242523b5f
4 changed files with 7 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Makefile.objs
View File

@ -64,8 +64,6 @@ common-obj-$(if $(and $(CONFIG_BZIP2),$(CONFIG_DMG)),m) += block-dmg-bz2$(DSOSUF
common-obj-y += hw/ common-obj-y += hw/
common-obj-m += hw/ common-obj-m += hw/
common-obj-y += qapi/
common-obj-y += libqmp.fa common-obj-y += libqmp.fa
endif # CONFIG_SOFTMMU endif # CONFIG_SOFTMMU

1
Makefile.target
View File

@ -157,7 +157,6 @@ ifdef CONFIG_SOFTMMU
obj-y += softmmu/ obj-y += softmmu/
obj-y += gdbstub.o obj-y += gdbstub.o
obj-y += hw/ obj-y += hw/
obj-y += qapi/
LIBS := $(libs_softmmu) $(LIBS) LIBS := $(libs_softmmu) $(LIBS)
# Temporary until emulators are linked by Meson # Temporary until emulators are linked by Meson

15
qapi/Makefile.objs
View File

@ -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

10
qapi/meson.build
View File

@ -114,8 +114,12 @@ foreach output : qapi_util_outputs
i = i + 1 i = i + 1
endforeach endforeach
# These are still handled by the Makefile foreach output : qapi_specific_outputs + qapi_nonmodule_outputs
i += qapi_nonmodule_outputs.length() if output.endswith('.h')
i += qapi_specific_outputs.length() 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] qapi_doc_texi = qapi_files[i]