aboutsummaryrefslogtreecommitdiff
path: root/Makefile.objs
diff options
context:
space:
mode:
authorPaolo Bonzini <pbonzini@redhat.com>2012-12-20 15:03:18 +0100
committerPaolo Bonzini <pbonzini@redhat.com>2013-01-12 18:42:51 +0100
commit59cacde8cdf2e85de9b1aff63e456e89a8a5c59d (patch)
tree1b946b46092da0daa4d8520542ec608a92e8e6bd /Makefile.objs
parent9444e9e640d56039253d885ba88c3fa818a00149 (diff)
build: move QAPI definitions for QEMU out of qapi-obj-y
There is no reason why for example qemu-ga should include all the definitions for the QEMU monitor. However, there are a few that are needed (qapi_free_SocketAddress, qapi_free_InetSocketAddress, ErrorClass_lookup). These should be moved to a separate "core" .json schema that goes into libqemuutil.a. For now, make this clearer by moving the qapi-*.o definitions out of libqemuutil.a. Once the above refactoring is done, qga-obj-y should not include anymore qapi-types.o and qapi-visit.o. Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
Diffstat (limited to 'Makefile.objs')
-rw-r--r--Makefile.objs6
1 files changed, 4 insertions, 2 deletions
diff --git a/Makefile.objs b/Makefile.objs
index f2f43b2385..48a7173e68 100644
--- a/Makefile.objs
+++ b/Makefile.objs
@@ -103,7 +103,6 @@ common-obj-$(CONFIG_SMARTCARD_NSS) += $(libcacard-y)
# qapi
qapi-obj-y = qapi/
-qapi-obj-y += qapi-types.o qapi-visit.o
common-obj-y += qmp-marshal.o qapi-visit.o qapi-types.o
common-obj-y += qmp.o hmp.o
@@ -118,11 +117,14 @@ universal-obj-y += qom/
universal-obj-y += disas/
universal-obj-y += $(trace-obj-y)
universal-obj-y += $(qapi-obj-y)
+universal-obj-y += qapi-types.o qapi-visit.o
######################################################################
# guest agent
-qga-obj-y = qga/
+# FIXME: a few definitions from qapi-types.o/qapi-visit.o are needed
+# by libqemuutil.a. These should be moved to a separate .json schema.
+qga-obj-y = qga/ qapi-types.o qapi-visit.o
vl.o: QEMU_CFLAGS+=$(GPROF_CFLAGS)