Merge remote-tracking branch 'qmp/for-anthony' into staging

[qemu.git] / Makefile.objs

diff --git a/Makefile.objs b/Makefile.objs
index a82974bf9a33acd257343493fae57f0f6484c78c..6991a9f52acce561eb4c4bba236f69ca2d00a666 100644 (file)
--- a/Makefile.objs
+++ b/Makefile.objs
@@ -373,7 +373,15 @@ endif
 
 libcacard-y = cac.o event.o vcard.o vreader.o vcard_emul_nss.o vcard_emul_type.o card_7816.o
 
+######################################################################
+# qapi
+
+qapi-nested-y = qapi-visit-core.o qmp-input-visitor.o qmp-output-visitor.o qapi-dealloc-visitor.o
+qapi-nested-y += qmp-registry.o qmp-dispatch.o
+qapi-obj-y = $(addprefix qapi/, $(qapi-nested-y))
+
 vl.o: QEMU_CFLAGS+=$(GPROF_CFLAGS)
 
 vl.o: QEMU_CFLAGS+=$(SDL_CFLAGS)
 
+vl.o: QEMU_CFLAGS+=$(GLIB_CFLAGS)