build: Deal with all of QAPI's .o in qapi/Makefile.objs

Adding QAPI's .o to util-obj-y, common-obj-y and obj-y is spread over
three places: Makefile.objs takes care of target-independent generated
code, Makefile.target of target-dependent generated code, and
qapi/Makefile.objs of (target-independent) hand-written code.

Do everything in qapi/Makefile.objs.

Suggested-by: Paolo Bonzini <pbonzini@redhat.com>
Signed-off-by: Markus Armbruster <armbru@redhat.com>
Reviewed-by: Marc-André Lureau <marcandre.lureau@redhat.com>
Message-Id: <20190214152251.2073-8-armbru@redhat.com>
This commit is contained in:
Markus Armbruster 2019-02-14 16:22:40 +01:00
parent c19099f637
commit 88554a2005
4 changed files with 21 additions and 18 deletions

View file

@ -4,3 +4,22 @@ util-obj-y += string-input-visitor.o string-output-visitor.o
util-obj-y += opts-visitor.o qapi-clone-visitor.o
util-obj-y += qmp-event.o
util-obj-y += qapi-util.o
QAPI_MODULES = block-core block char common crypto introspect job migration
QAPI_MODULES += misc net rdma rocker run-state sockets tpm trace transaction
QAPI_MODULES += ui
util-obj-y += qapi-builtin-types.o
util-obj-y += qapi-types.o
util-obj-y += $(QAPI_MODULES:%=qapi-types-%.o)
util-obj-y += qapi-builtin-visit.o
util-obj-y += qapi-visit.o
util-obj-y += $(QAPI_MODULES:%=qapi-visit-%.o)
util-obj-y += qapi-emit-events.o
util-obj-y += qapi-events.o
util-obj-y += $(QAPI_MODULES:%=qapi-events-%.o)
common-obj-y = qapi-commands.o
common-obj-y += $(QAPI_MODULES:%=qapi-commands-%.o)
obj-y = qapi-introspect.o