From 88554a200590008a5846461d82b8c7967f74139f Mon Sep 17 00:00:00 2001 From: Markus Armbruster Date: Thu, 14 Feb 2019 16:22:40 +0100 Subject: build: Deal with all of QAPI's .o in qapi/Makefile.objs MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 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 Signed-off-by: Markus Armbruster Reviewed-by: Marc-André Lureau Message-Id: <20190214152251.2073-8-armbru@redhat.com> --- qapi/Makefile.objs | 19 +++++++++++++++++++ 1 file changed, 19 insertions(+) (limited to 'qapi/Makefile.objs') diff --git a/qapi/Makefile.objs b/qapi/Makefile.objs index 33906ff321..05bb0564f2 100644 --- a/qapi/Makefile.objs +++ b/qapi/Makefile.objs @@ -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 -- cgit v1.2.3