diff options
| author | Markus Armbruster <armbru@redhat.com> | 2019-02-14 16:22:40 +0100 |
|---|---|---|
| committer | Markus Armbruster <armbru@redhat.com> | 2019-02-18 14:44:04 +0100 |
| commit | 88554a200590008a5846461d82b8c7967f74139f (patch) | |
| tree | 3154172b114740f554c4192076cf2ecf79acc21a /Makefile.objs | |
| parent | c19099f637d650ae1d1a1fa4cce85f9689e315b6 (diff) | |
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>
Diffstat (limited to 'Makefile.objs')
| -rw-r--r-- | Makefile.objs | 16 |
1 files changed, 1 insertions, 15 deletions
diff --git a/Makefile.objs b/Makefile.objs index bc78e26f55..5fb022d7ad 100644 --- a/Makefile.objs +++ b/Makefile.objs @@ -1,20 +1,7 @@ -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 - ####################################################################### # Common libraries for tools and emulators stub-obj-y = stubs/ crypto/ util-obj-y = util/ qobject/ qapi/ -util-obj-y += qapi/qapi-builtin-types.o -util-obj-y += qapi/qapi-types.o -util-obj-y += $(QAPI_MODULES:%=qapi/qapi-types-%.o) -util-obj-y += qapi/qapi-builtin-visit.o -util-obj-y += qapi/qapi-visit.o -util-obj-y += $(QAPI_MODULES:%=qapi/qapi-visit-%.o) -util-obj-y += qapi/qapi-emit-events.o -util-obj-y += qapi/qapi-events.o -util-obj-y += $(QAPI_MODULES:%=qapi/qapi-events-%.o) chardev-obj-y = chardev/ slirp-obj-$(CONFIG_SLIRP) = slirp/ @@ -92,9 +79,8 @@ common-obj-$(CONFIG_FDT) += device_tree.o ###################################################################### # qapi -common-obj-y += qapi/qapi-commands.o -common-obj-y += $(QAPI_MODULES:%=qapi/qapi-commands-%.o) common-obj-y += qmp.o hmp.o +common-obj-y += qapi/ endif ####################################################################### |