summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMarcelo Tosatti <mtosatti@redhat.com>2009-10-14 18:15:24 -0300
committerMarcelo Tosatti <mtosatti@redhat.com>2009-10-14 18:15:24 -0300
commit3441c132da02cf235af2f2524296dcfd5ed8d730 (patch)
tree437bc0bb0507c571245a075ad98c1d872aed64c1 /Makefile.target
parentMerge commit 'fe0d4d3f7769d5b024e8166fc075148f9cf76ba9' into upstream-merge (diff)
parentGenerate gdbstub-xml.c only when needed (diff)
downloadqemu-kvm-3441c132da02cf235af2f2524296dcfd5ed8d730.tar.gz
qemu-kvm-3441c132da02cf235af2f2524296dcfd5ed8d730.tar.bz2
qemu-kvm-3441c132da02cf235af2f2524296dcfd5ed8d730.zip
Merge commit '3d0f151783dcb56284d56502c3ffe5430e540e38' into upstream-merge
* commit '3d0f151783dcb56284d56502c3ffe5430e540e38': Generate gdbstub-xml.c only when needed Conflicts: Makefile.target Signed-off-by: Marcelo Tosatti <mtosatti@redhat.com>
Diffstat (limited to 'Makefile.target')
-rw-r--r--Makefile.target14
1 files changed, 6 insertions, 8 deletions
diff --git a/Makefile.target b/Makefile.target
index b325e26ce..f76c1f6d2 100644
--- a/Makefile.target
+++ b/Makefile.target
@@ -101,7 +101,7 @@ ifdef CONFIG_LINUX_USER
VPATH+=:$(SRC_PATH)/linux-user:$(SRC_PATH)/linux-user/$(TARGET_ABI_DIR)
QEMU_CFLAGS+=-I$(SRC_PATH)/linux-user -I$(SRC_PATH)/linux-user/$(TARGET_ABI_DIR)
obj-y = main.o syscall.o strace.o mmap.o signal.o thunk.o \
- elfload.o linuxload.o uaccess.o gdbstub.o gdbstub-xml.o
+ elfload.o linuxload.o uaccess.o gdbstub.o
obj-$(CONFIG_CPU_EMULATION) += tcg-runtime.o
obj-y += host-utils.o
@@ -137,7 +137,7 @@ LDFLAGS+=-Wl,-segaddr,__STD_PROG_ZONE,0x1000 -image_base 0x0e000000
LIBS+=-lmx
obj-y = main.o commpage.o machload.o mmap.o signal.o syscall.o thunk.o \
- gdbstub.o gdbstub-xml.o
+ gdbstub.o
obj-i386-y += ioport-user.o
@@ -154,7 +154,7 @@ VPATH+=:$(SRC_PATH)/bsd-user
QEMU_CFLAGS+=-I$(SRC_PATH)/bsd-user -I$(SRC_PATH)/bsd-user/$(TARGET_ARCH)
obj-y = main.o bsdload.o elfload.o mmap.o signal.o strace.o syscall.o \
- gdbstub.o gdbstub-xml.o uaccess.o
+ gdbstub.o uaccess.o
obj-i386-y += ioport-user.o
@@ -167,7 +167,7 @@ endif #CONFIG_BSD_USER
ifdef CONFIG_SOFTMMU
obj-y = vl.o monitor.o pci.o isa_mmio.o machine.o \
- gdbstub.o gdbstub-xml.o
+ gdbstub.o
# virtio has to be here due to weird dependency between PCI and virtio-net.
# need to fix this properly
obj-y += virtio-blk.o virtio-balloon.o virtio-net.o virtio-console.o virtio-pci.o
@@ -339,16 +339,14 @@ ARLIBS=../libqemu_common.a libqemu.a $(HWLIB)
endif # CONFIG_SOFTMMU
+obj-$(CONFIG_GDBSTUB_XML) += gdbstub-xml.o
+
$(QEMU_PROG): $(obj-y) $(obj-$(TARGET_BASE_ARCH)-y) $(ARLIBS)
$(call LINK,$(obj-y) $(obj-$(TARGET_BASE_ARCH)-y))
gdbstub-xml.c: $(TARGET_XML_FILES) feature_to_c.sh
-ifeq ($(TARGET_XML_FILES),)
- $(call quiet-command,rm -f $@ && echo > $@," GEN $(TARGET_DIR)$@")
-else
$(call quiet-command,rm -f $@ && $(SHELL) $(SRC_PATH)/feature_to_c.sh $@ $(TARGET_XML_FILES)," GEN $(TARGET_DIR)$@")
-endif
qemu-options.h: $(SRC_PATH)/qemu-options.hx
$(call quiet-command,sh $(SRC_PATH)/hxtool -h < $< > $@," GEN $(TARGET_DIR)$@")