Revision 640e5404 Makefile

b/Makefile
162 162
check-qfloat: check-qfloat.o qfloat.o $(CHECK_PROG_DEPS)
163 163
check-qjson: check-qjson.o qfloat.o qint.o qdict.o qstring.o qlist.o qbool.o qjson.o json-streamer.o json-lexer.o json-parser.o error.o qerror.o qemu-error.o $(CHECK_PROG_DEPS)
164 164

  
165
$(qapi-obj-y): $(GENERATED_HEADERS)
166
qapi-dir := qapi-generated
167
test-visitor.o: QEMU_CFLAGS += -I $(qapi-dir)
168

  
169
$(qapi-dir)/test-qapi-types.c: $(qapi-dir)/test-qapi-types.h
170
$(qapi-dir)/test-qapi-types.h: $(SRC_PATH)/qapi-schema-test.json $(SRC_PATH)/scripts/qapi-types.py
171
	$(call quiet-command,python $(SRC_PATH)/scripts/qapi-types.py -o "$(qapi-dir)" -p "test-" < $<, "  GEN   $@")
172
$(qapi-dir)/test-qapi-visit.c: $(qapi-dir)/test-qapi-visit.h
173
$(qapi-dir)/test-qapi-visit.h: $(SRC_PATH)/qapi-schema-test.json $(SRC_PATH)/scripts/qapi-visit.py
174
	$(call quiet-command,python $(SRC_PATH)/scripts/qapi-visit.py -o "$(qapi-dir)" -p "test-" < $<, "  GEN   $@")
175

  
176
test-visitor.o: $(addprefix $(qapi-dir)/, test-qapi-types.c test-qapi-types.h test-qapi-visit.c test-qapi-visit.h) $(qapi-obj-y)
177
test-visitor: test-visitor.o qfloat.o qint.o qdict.o qstring.o qlist.o qbool.o $(qapi-obj-y) error.o osdep.o qemu-malloc.o $(oslib-obj-y) qjson.o json-streamer.o json-lexer.o json-parser.o qerror.o qemu-error.o qemu-tool.o $(qapi-dir)/test-qapi-visit.o $(qapi-dir)/test-qapi-types.o
178

  
165 179
QEMULIBS=libhw32 libhw64 libuser libdis libdis-user
166 180

  
167 181
clean:
......
170 184
	rm -f qemu-options.def
171 185
	rm -f *.o *.d *.a *.lo $(TOOLS) TAGS cscope.* *.pod *~ */*~
172 186
	rm -Rf .libs
173
	rm -f slirp/*.o slirp/*.d audio/*.o audio/*.d block/*.o block/*.d net/*.o net/*.d fsdev/*.o fsdev/*.d ui/*.o ui/*.d
187
	rm -f slirp/*.o slirp/*.d audio/*.o audio/*.d block/*.o block/*.d net/*.o net/*.d fsdev/*.o fsdev/*.d ui/*.o ui/*.d qapi/*.o qapi/*.d
174 188
	rm -f qemu-img-cmds.h
175 189
	rm -f trace.c trace.h trace.c-timestamp trace.h-timestamp
176 190
	rm -f trace-dtrace.dtrace trace-dtrace.dtrace-timestamp
177 191
	rm -f trace-dtrace.h trace-dtrace.h-timestamp
192
	rm -rf $(qapi-dir)
178 193
	$(MAKE) -C tests clean
179 194
	for d in $(ALL_SUBDIRS) $(QEMULIBS) libcacard; do \
180 195
	if test -d $$d; then $(MAKE) -C $$d $@ || exit 1; fi; \
......
363 378
	$(mandir)/man8/qemu-nbd.8
364 379

  
365 380
# Include automatically generated dependency files
366
-include $(wildcard *.d audio/*.d slirp/*.d block/*.d net/*.d ui/*.d)
381
-include $(wildcard *.d audio/*.d slirp/*.d block/*.d net/*.d ui/*.d qapi/*.d)

Also available in: Unified diff