Revision 576d5506

b/Makefile
206 206
QGALIB_GEN=$(addprefix qga/qapi-generated/, qga-qapi-types.h qga-qapi-visit.h qga-qmp-commands.h)
207 207
$(qga-obj-y) qemu-ga.o: $(QGALIB_GEN)
208 208

  
209
qemu-ga$(EXESUF): $(qga-obj-y) $(trace-obj-y) $(qapi-obj-y) $(version-obj-y) libqemuutil.a libqemustub.a
209
qemu-ga$(EXESUF): $(qga-obj-y) $(trace-obj-y) $(version-obj-y) libqemuutil.a libqemustub.a
210 210
	$(call LINK, $^)
211 211

  
212 212
clean:
b/Makefile.objs
1 1
#######################################################################
2 2
# Common libraries for tools and emulators
3 3
stub-obj-y = stubs/
4
util-obj-y = util/ qobject/
4
util-obj-y = util/ qobject/ qapi/
5 5

  
6 6
#######################################################################
7 7
# coroutines
......
30 30
block-obj-$(CONFIG_POSIX) += aio-posix.o
31 31
block-obj-$(CONFIG_WIN32) += aio-win32.o
32 32
block-obj-y += block/
33
block-obj-y += $(qapi-obj-y) qapi-types.o qapi-visit.o
33
block-obj-y += qapi-types.o qapi-visit.o
34 34

  
35 35
ifeq ($(CONFIG_VIRTIO)$(CONFIG_VIRTFS)$(CONFIG_PCI),yyy)
36 36
# Lots of the fsdev/9pcode is pulled in by vl.c via qemu_fsdev_add.
......
102 102
######################################################################
103 103
# qapi
104 104

  
105
qapi-obj-y = qapi/
106

  
107 105
common-obj-y += qmp-marshal.o qapi-visit.o qapi-types.o
108 106
common-obj-y += qmp.o hmp.o
109 107

  
......
116 114
universal-obj-y += qom/
117 115
universal-obj-y += disas/
118 116
universal-obj-y += $(trace-obj-y)
119
universal-obj-y += $(qapi-obj-y)
120
universal-obj-y += qapi-types.o qapi-visit.o
121 117

  
122 118
######################################################################
123 119
# guest agent
......
136 132
	stub-obj-y \
137 133
	util-obj-y \
138 134
	qga-obj-y \
139
	qapi-obj-y \
140 135
	block-obj-y \
141 136
	common-obj-y \
142 137
	universal-obj-y \
b/qapi/Makefile.objs
1
qapi-obj-y = qapi-visit-core.o qapi-dealloc-visitor.o qmp-input-visitor.o
2
qapi-obj-y += qmp-output-visitor.o qmp-registry.o qmp-dispatch.o
3
qapi-obj-y += string-input-visitor.o string-output-visitor.o
1
util-obj-y = qapi-visit-core.o qapi-dealloc-visitor.o qmp-input-visitor.o
2
util-obj-y += qmp-output-visitor.o qmp-registry.o qmp-dispatch.o
3
util-obj-y += string-input-visitor.o string-output-visitor.o
4 4

  
5
common-obj-y += opts-visitor.o
5
util-obj-y += opts-visitor.o
b/tests/Makefile
70 70
	tests/test-qmp-input-visitor.o tests/test-qmp-input-strict.o \
71 71
	tests/test-qmp-commands.o tests/test-visitor-serialization.o
72 72

  
73
test-qapi-obj-y =  $(qapi-obj-y)
74
test-qapi-obj-y += tests/test-qapi-visit.o tests/test-qapi-types.o
73
test-qapi-obj-y = tests/test-qapi-visit.o tests/test-qapi-types.o
75 74

  
76 75
$(test-obj-y): QEMU_INCLUDES += -Itests
77 76

  

Also available in: Unified diff