Signed-off-by: Paolo Bonzini <pbonz...@redhat.com>
---
Makefile.objs | 6 ++----
qapi/Makefile | 3 +++
2 files changed, 5 insertions(+), 4 deletions(-)
create mode 100644 qapi/Makefile
diff --git a/Makefile.objs b/Makefile.objs
index 6a3ff49..54ab6e6 100644
--- a/Makefile.objs
+++ b/Makefile.objs
@@ -373,10 +373,7 @@ libcacard-y = cac.o event.o vcard.o vreader.o
vcard_emul_nss.o vcard_emul_type.o
######################################################################
# qapi
-qapi-nested-y = qapi-visit-core.o qapi-dealloc-visitor.o qmp-input-visitor.o
-qapi-nested-y += qmp-output-visitor.o qmp-registry.o qmp-dispatch.o
-qapi-nested-y += string-input-visitor.o string-output-visitor.o
-qapi-obj-y = $(addprefix qapi/, $(qapi-nested-y))
+qapi-obj-y = qapi/
common-obj-y += qmp-marshal.o qapi-visit.o qapi-types.o
common-obj-y += qmp.o hmp.o
@@ -403,6 +400,7 @@ QEMU_CFLAGS+=$(GLIB_CFLAGS)
nested-vars += \
block-obj-y \
qom-obj-y \
+ qapi-obj-y \
user-obj-y \
common-obj-y
dummy := $(foreach var, $(nested-vars), $(call unnest-var,$(var)))
diff --git a/qapi/Makefile b/qapi/Makefile
new file mode 100644
index 0000000..d0b0c16
--- /dev/null
+++ b/qapi/Makefile
@@ -0,0 +1,3 @@
+qapi-obj-y = qapi-visit-core.o qapi-dealloc-visitor.o qmp-input-visitor.o
+qapi-obj-y += qmp-output-visitor.o qmp-registry.o qmp-dispatch.o
+qapi-obj-y += string-input-visitor.o string-output-visitor.o
--
1.7.10.1
