Revision 8f0e5c6b

b/Makefile
171 171
qemu-img-cmds.h: $(SRC_PATH)/qemu-img-cmds.hx
172 172
	$(call quiet-command,sh $(SRC_PATH)/scripts/hxtool -h < $< > $@,"  GEN   $@")
173 173

  
174
qapi-dir := qapi-generated
175 174
qemu-ga$(EXESUF): LIBS = $(LIBS_QGA)
176
qemu-ga$(EXESUF): QEMU_CFLAGS += -I $(qapi-dir)
175
qemu-ga$(EXESUF): QEMU_CFLAGS += -I qapi-generated
177 176

  
178 177
gen-out-type = $(subst .,-,$(suffix $@))
179 178

  
......
181 180
include $(SRC_PATH)/tests/Makefile
182 181
endif
183 182

  
184
$(qapi-dir)/qga-qapi-types.c $(qapi-dir)/qga-qapi-types.h :\
183
qapi-generated/qga-qapi-types.c qapi-generated/qga-qapi-types.h :\
185 184
$(SRC_PATH)/qapi-schema-guest.json $(SRC_PATH)/scripts/qapi-types.py
186
	$(call quiet-command,$(PYTHON) $(SRC_PATH)/scripts/qapi-types.py $(gen-out-type) -o "$(qapi-dir)" -p "qga-" < $<, "  GEN   $@")
187
$(qapi-dir)/qga-qapi-visit.c $(qapi-dir)/qga-qapi-visit.h :\
185
	$(call quiet-command,$(PYTHON) $(SRC_PATH)/scripts/qapi-types.py $(gen-out-type) -o qapi-generated -p "qga-" < $<, "  GEN   $@")
186
qapi-generated/qga-qapi-visit.c qapi-generated/qga-qapi-visit.h :\
188 187
$(SRC_PATH)/qapi-schema-guest.json $(SRC_PATH)/scripts/qapi-visit.py
189
	$(call quiet-command,$(PYTHON) $(SRC_PATH)/scripts/qapi-visit.py $(gen-out-type) -o "$(qapi-dir)" -p "qga-" < $<, "  GEN   $@")
190
$(qapi-dir)/qga-qmp-commands.h $(qapi-dir)/qga-qmp-marshal.c :\
188
	$(call quiet-command,$(PYTHON) $(SRC_PATH)/scripts/qapi-visit.py $(gen-out-type) -o qapi-generated -p "qga-" < $<, "  GEN   $@")
189
qapi-generated/qga-qmp-commands.h qapi-generated/qga-qmp-marshal.c :\
191 190
$(SRC_PATH)/qapi-schema-guest.json $(SRC_PATH)/scripts/qapi-commands.py
192
	$(call quiet-command,$(PYTHON) $(SRC_PATH)/scripts/qapi-commands.py $(gen-out-type) -o "$(qapi-dir)" -p "qga-" < $<, "  GEN   $@")
191
	$(call quiet-command,$(PYTHON) $(SRC_PATH)/scripts/qapi-commands.py $(gen-out-type) -o qapi-generated -p "qga-" < $<, "  GEN   $@")
193 192

  
194 193
qapi-types.c qapi-types.h :\
195 194
$(SRC_PATH)/qapi-schema.json $(SRC_PATH)/scripts/qapi-types.py
......
201 200
$(SRC_PATH)/qapi-schema.json $(SRC_PATH)/scripts/qapi-commands.py
202 201
	$(call quiet-command,$(PYTHON) $(SRC_PATH)/scripts/qapi-commands.py $(gen-out-type) -m -o "." < $<, "  GEN   $@")
203 202

  
204
QGALIB_OBJ=$(addprefix $(qapi-dir)/, qga-qapi-types.o qga-qapi-visit.o qga-qmp-marshal.o)
205
QGALIB_GEN=$(addprefix $(qapi-dir)/, qga-qapi-types.h qga-qapi-visit.h qga-qmp-commands.h)
203
QGALIB_OBJ=$(addprefix qapi-generated/, qga-qapi-types.o qga-qapi-visit.o qga-qmp-marshal.o)
204
QGALIB_GEN=$(addprefix qapi-generated/, qga-qapi-types.h qga-qapi-visit.h qga-qmp-commands.h)
206 205
$(QGALIB_OBJ): $(QGALIB_GEN)
207 206
$(qga-obj-y) qemu-ga.o: $(QGALIB_GEN)
208 207

  
......
226 225
	rm -f trace-dtrace.h trace-dtrace.h-timestamp
227 226
	rm -f $(foreach f,$(GENERATED_HEADERS),$(f) $(f)-timestamp)
228 227
	rm -f $(foreach f,$(GENERATED_SOURCES),$(f) $(f)-timestamp)
229
	rm -rf $(qapi-dir)
228
	rm -rf qapi-generated
230 229
	$(MAKE) -C tests/tcg clean
231 230
	for d in $(ALL_SUBDIRS) $(QEMULIBS) libcacard; do \
232 231
	if test -d $$d; then $(MAKE) -C $$d $@ || exit 1; fi; \

Also available in: Unified diff