From: bellard Date: Sat, 2 Jul 2005 22:07:19 +0000 (+0000) Subject: simplified X-Git-Tag: release_0_7_1~44 X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=f68c781c2d08fec54ae460749b76b422c2a1921f;p=thirdparty%2Fqemu.git simplified git-svn-id: svn://svn.savannah.nongnu.org/qemu/trunk@1491 c046a42c-6fe2-441c-8c8c-71466251a162 --- diff --git a/Makefile.target b/Makefile.target index 59ce7eb49a3..74b5da830ba 100644 --- a/Makefile.target +++ b/Makefile.target @@ -44,78 +44,10 @@ endif ifdef CONFIG_USER_ONLY PROGS=$(QEMU_USER) else -ifeq ($(TARGET_ARCH), i386) - -ifeq ($(ARCH), i386) PROGS+=$(QEMU_SYSTEM) ifndef CONFIG_SOFTMMU CONFIG_STATIC=y endif -else -# the system emulator using soft mmu is portable -ifdef CONFIG_SOFTMMU -PROGS+=$(QEMU_SYSTEM) -endif -endif # ARCH != i386 - -endif # TARGET_ARCH = i386 - -ifeq ($(TARGET_ARCH), x86_64) -ifdef CONFIG_SOFTMMU -PROGS+=$(QEMU_SYSTEM) -endif -endif # TARGET_ARCH = x86_64 - -ifeq ($(TARGET_ARCH), ppc) - -ifeq ($(ARCH), ppc) -PROGS+=$(QEMU_SYSTEM) -endif - -endif # TARGET_ARCH = ppc - -ifeq ($(TARGET_ARCH), mips) - -ifeq ($(ARCH), i386) -ifdef CONFIG_SOFTMMU -PROGS+=$(QEMU_SYSTEM) -endif -endif # ARCH = i386 - -ifeq ($(ARCH), x86_64) -ifdef CONFIG_SOFTMMU -PROGS+=$(QEMU_SYSTEM) -endif -endif # ARCH = x86_64 - -endif # TARGET_ARCH = mips - -ifeq ($(TARGET_ARCH), sparc) - -ifeq ($(ARCH), ppc) -PROGS+=$(QEMU_SYSTEM) -endif - -ifeq ($(ARCH), i386) -ifdef CONFIG_SOFTMMU -PROGS+=$(QEMU_SYSTEM) -endif -endif # ARCH = i386 - -ifeq ($(ARCH), x86_64) -ifdef CONFIG_SOFTMMU -PROGS+=$(QEMU_SYSTEM) -endif -endif # ARCH = x86_64 - -endif # TARGET_ARCH = sparc - -ifeq ($(TARGET_ARCH), sparc64) -ifdef CONFIG_SOFTMMU -PROGS+=$(QEMU_SYSTEM) -endif -endif # TARGET_ARCH = sparc64 - endif # !CONFIG_USER_ONLY ifdef CONFIG_STATIC