Revision 54c2e502

b/Makefile
173 173
	$(call quiet-command,sh $(SRC_PATH)/scripts/hxtool -h < $< > $@,"  GEN   $@")
174 174

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

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

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

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

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

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

  
209 207
qemu-ga$(EXESUF): qemu-ga.o $(qga-obj-y) $(tools-obj-y) $(qapi-obj-y) $(qobject-obj-y) $(version-obj-y)
......
227 225
	rm -f $(foreach f,$(GENERATED_HEADERS),$(f) $(f)-timestamp)
228 226
	rm -f $(foreach f,$(GENERATED_SOURCES),$(f) $(f)-timestamp)
229 227
	rm -rf qapi-generated
228
	rm -rf qga/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; \
b/qga/Makefile.objs
1 1
qga-obj-y = commands.o guest-agent-command-state.o
2 2
qga-obj-$(CONFIG_POSIX) += commands-posix.o channel-posix.o
3 3
qga-obj-$(CONFIG_WIN32) += commands-win32.o channel-win32.o service-win32.o
4
qga-obj-y += ../qapi-generated/qga-qapi-types.o ../qapi-generated/qga-qapi-visit.o
5
qga-obj-y += ../qapi-generated/qga-qmp-marshal.o
4
qga-obj-y += qapi-generated/qga-qapi-types.o qapi-generated/qga-qapi-visit.o
5
qga-obj-y += qapi-generated/qga-qmp-marshal.o

Also available in: Unified diff