Revision 136594f1

b/Makefile
160 160
qemu-img.o: qemu-img-cmds.h
161 161

  
162 162
tools-obj-y = $(oslib-obj-y) $(trace-obj-y) qemu-tool.o qemu-timer.o \
163
	main-loop.o notify.o iohandler.o async.o error.o
163
	main-loop.o iohandler.o error.o
164 164
tools-obj-$(CONFIG_POSIX) += compatfd.o
165 165

  
166 166
qemu-img$(EXESUF): qemu-img.o $(tools-obj-y) $(block-obj-y)
......
169 169

  
170 170
qemu-bridge-helper$(EXESUF): qemu-bridge-helper.o
171 171

  
172
vscclient$(EXESUF): $(libcacard-y) $(oslib-obj-y) $(trace-obj-y) $(tools-obj-y) qemu-timer-common.o libcacard/vscclient.o
172
vscclient$(EXESUF): $(libcacard-y) $(oslib-obj-y) $(trace-obj-y) libcacard/vscclient.o
173 173
	$(call quiet-command,$(CC) $(LDFLAGS) -o $@ $^ $(libcacard_libs) $(LIBS),"  LINK  $@")
174 174

  
175 175
fsdev/virtfs-proxy-helper$(EXESUF): fsdev/virtfs-proxy-helper.o fsdev/virtio-9p-marshal.o oslib-posix.o $(trace-obj-y)
......
212 212
QGALIB_GEN=$(addprefix qga/qapi-generated/, qga-qapi-types.h qga-qapi-visit.h qga-qmp-commands.h)
213 213
$(qga-obj-y) qemu-ga.o: $(QGALIB_GEN)
214 214

  
215
qemu-ga$(EXESUF): qemu-ga.o $(qga-obj-y) $(tools-obj-y) $(qapi-obj-y) $(qobject-obj-y) $(version-obj-y)
215
qemu-ga$(EXESUF): qemu-ga.o $(qga-obj-y) $(oslib-obj-y) $(trace-obj-y) $(qapi-obj-y) $(qobject-obj-y) $(version-obj-y)
216 216

  
217 217
QEMULIBS=libuser libdis libdis-user
218 218

  
b/Makefile.objs
228 228
######################################################################
229 229
# guest agent
230 230

  
231
qga-obj-y = qga/ qemu-ga.o module.o
232
qga-obj-$(CONFIG_WIN32) += oslib-win32.o
233
qga-obj-$(CONFIG_POSIX) += oslib-posix.o qemu-sockets.o qemu-option.o
231
qga-obj-y = qga/ qemu-ga.o module.o qemu-tool.o
232
qga-obj-$(CONFIG_POSIX) += qemu-sockets.o qemu-option.o
234 233

  
235 234
vl.o: QEMU_CFLAGS+=$(GPROF_CFLAGS)
236 235

  
b/tests/Makefile
36 36
	tests/test-qmp-input-visitor.o tests/test-qmp-input-strict.o \
37 37
	tests/test-qmp-commands.o tests/test-visitor-serialization.o
38 38

  
39
test-qapi-obj-y =  $(qobject-obj-y) $(qapi-obj-y) $(tools-obj-y)
39
test-qapi-obj-y =  $(qobject-obj-y) $(qapi-obj-y) qemu-tool.o
40 40
test-qapi-obj-y += tests/test-qapi-visit.o tests/test-qapi-types.o
41 41
test-qapi-obj-y += module.o
42 42

  
......
47 47
tests/check-qdict$(EXESUF): tests/check-qdict.o qdict.o qfloat.o qint.o qstring.o qbool.o qlist.o
48 48
tests/check-qlist$(EXESUF): tests/check-qlist.o qlist.o qint.o
49 49
tests/check-qfloat$(EXESUF): tests/check-qfloat.o qfloat.o
50
tests/check-qjson$(EXESUF): tests/check-qjson.o $(qobject-obj-y) $(tools-obj-y)
51
tests/test-coroutine$(EXESUF): tests/test-coroutine.o $(coroutine-obj-y) $(tools-obj-y) iov.o
50
tests/check-qjson$(EXESUF): tests/check-qjson.o $(qobject-obj-y) qemu-tool.o
51
tests/test-coroutine$(EXESUF): tests/test-coroutine.o $(coroutine-obj-y) $(tools-obj-y) $(block-obj-y) iov.o
52 52
tests/test-iov$(EXESUF): tests/test-iov.o iov.o
53 53

  
54 54
tests/test-qapi-types.c tests/test-qapi-types.h :\
......
81 81
QTEST_TARGETS=$(foreach TARGET,$(TARGETS), $(if $(check-qtest-$(TARGET)-y), $(TARGET),))
82 82
check-qtest-$(CONFIG_POSIX)=$(foreach TARGET,$(TARGETS), $(check-qtest-$(TARGET)-y))
83 83

  
84
qtest-obj-y = tests/libqtest.o $(oslib-obj-y) $(tools-obj-y)
84
qtest-obj-y = tests/libqtest.o $(oslib-obj-y)
85 85
$(check-qtest-y): $(qtest-obj-y)
86 86

  
87 87
.PHONY: check-help

Also available in: Unified diff