summaryrefslogtreecommitdiff
path: root/Makefile.target
diff options
context:
space:
mode:
authorAnthony Liguori <aliguori@us.ibm.com>2011-10-10 08:21:46 -0500
committerAnthony Liguori <aliguori@us.ibm.com>2011-10-10 08:21:46 -0500
commitebffe2afceb1a17b5d134b5debf553955fe5ea1a (patch)
tree223ee0630a56a8d1410d5ad283996486ec434ab7 /Makefile.target
parent057643f6c4751651ab640edb9b445cb3816edffc (diff)
parent5bc465e4b1b6f4582a400c0a7033a1c841744278 (diff)
downloadqemu-ebffe2afceb1a17b5d134b5debf553955fe5ea1a.tar.gz
qemu-ebffe2afceb1a17b5d134b5debf553955fe5ea1a.tar.bz2
qemu-ebffe2afceb1a17b5d134b5debf553955fe5ea1a.zip
Merge remote-tracking branch 'qmp/queue/qmp' into staging
Diffstat (limited to 'Makefile.target')
-rw-r--r--Makefile.target6
1 files changed, 3 insertions, 3 deletions
diff --git a/Makefile.target b/Makefile.target
index 1aa6fce690..42adfecc35 100644
--- a/Makefile.target
+++ b/Makefile.target
@@ -376,7 +376,7 @@ obj-xtensa-y += xtensa-semi.o
main.o: QEMU_CFLAGS+=$(GPROF_CFLAGS)
-monitor.o: hmp-commands.h qmp-commands.h
+monitor.o: hmp-commands.h qmp-commands-old.h
$(obj-y) $(obj-$(TARGET_BASE_ARCH)-y): $(GENERATED_HEADERS)
@@ -408,13 +408,13 @@ gdbstub-xml.c: $(TARGET_XML_FILES) $(SRC_PATH)/scripts/feature_to_c.sh
hmp-commands.h: $(SRC_PATH)/hmp-commands.hx
$(call quiet-command,sh $(SRC_PATH)/scripts/hxtool -h < $< > $@," GEN $(TARGET_DIR)$@")
-qmp-commands.h: $(SRC_PATH)/qmp-commands.hx
+qmp-commands-old.h: $(SRC_PATH)/qmp-commands.hx
$(call quiet-command,sh $(SRC_PATH)/scripts/hxtool -h < $< > $@," GEN $(TARGET_DIR)$@")
clean:
rm -f *.o *.a *~ $(PROGS) nwfpe/*.o fpu/*.o
rm -f *.d */*.d tcg/*.o ide/*.o 9pfs/*.o
- rm -f hmp-commands.h qmp-commands.h gdbstub-xml.c
+ rm -f hmp-commands.h qmp-commands-old.h gdbstub-xml.c
ifdef CONFIG_TRACE_SYSTEMTAP
rm -f *.stp
endif