aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAnthony Liguori <aliguori@us.ibm.com>2011-08-29 09:55:36 -0500
committerAnthony Liguori <aliguori@us.ibm.com>2011-09-02 10:34:55 -0500
commit9aed1e036dc0de49d08d713f9e5c4655e94acb56 (patch)
tree1e3feda337f548d00a9881e2f8e511dc5dc9b64f
parent12d4536f7d911b6d87a766ad7300482ea663cea2 (diff)
Rename qemu -> qemu-system-i386
This has been discussed before in the past. The special casing really makes no sense anymore. This seems like a good change to make for 1.0. Signed-off-by: Anthony Liguori <aliguori@us.ibm.com>
-rw-r--r--Makefile5
-rw-r--r--Makefile.target4
2 files changed, 2 insertions, 7 deletions
diff --git a/Makefile b/Makefile
index 13be25a382..e0cf51a8bf 100644
--- a/Makefile
+++ b/Makefile
@@ -366,9 +366,8 @@ tar:
rm -rf /tmp/$(FILE)
SYSTEM_TARGETS=$(filter %-softmmu,$(TARGET_DIRS))
-SYSTEM_PROGS=$(patsubst qemu-system-i386,qemu, \
- $(patsubst %-softmmu,qemu-system-%, \
- $(SYSTEM_TARGETS)))
+SYSTEM_PROGS=$(patsubst %-softmmu,qemu-system-%, \
+ $(SYSTEM_TARGETS))
USER_TARGETS=$(filter %-user,$(TARGET_DIRS))
USER_PROGS=$(patsubst %-bsd-user,qemu-%, \
diff --git a/Makefile.target b/Makefile.target
index 25c16d7f16..0787758ad6 100644
--- a/Makefile.target
+++ b/Makefile.target
@@ -27,12 +27,8 @@ ifdef CONFIG_USER_ONLY
QEMU_PROG=qemu-$(TARGET_ARCH2)
else
# system emulator name
-ifeq ($(TARGET_ARCH), i386)
-QEMU_PROG=qemu$(EXESUF)
-else
QEMU_PROG=qemu-system-$(TARGET_ARCH2)$(EXESUF)
endif
-endif
PROGS=$(QEMU_PROG)
STPFILES=