filename fixes

git-svn-id: svn://svn.savannah.nongnu.org/qemu/trunk@403 c046a42c-6fe2-441c-8c8c-71466251a162

diff --git a/Makefile.target b/Makefile.target
index ee544386741ab54f40eb9b0c22072f8efaef2fce..cfb3cd88fceedc37c9dce328cbb7f5d9cdf57bb7 100644 (file)
--- a/Makefile.target
+++ b/Makefile.target
@@ -17,8 +17,14 @@ else
 QEMU_SYSTEM=qemu
 endif
 
-ifndef CONFIG_SOFTMMU
+ifdef CONFIG_USER_ONLY
 PROGS=$(QEMU_USER)
+else
+ifeq ($(ARCH),i386)
+ifeq ($(TARGET_ARCH), i386)
+PROGS+=$(QEMU_SYSTEM)
+endif
+endif
 endif
 
 ifdef CONFIG_STATIC
@@ -41,9 +47,6 @@ else
 # is the simplest way to make it self virtualizable!
 LDFLAGS+=-Wl,-shared
 endif
-ifeq ($(TARGET_ARCH), i386)
-PROGS+=$(QEMU_SYSTEM)
-endif
 endif
 
 ifeq ($(ARCH),ppc)
@@ -171,7 +174,7 @@ sdl.o: sdl.c
        $(CC) $(CFLAGS) $(DEFINES) $(SDL_CFLAGS) -c -o $@ $<
 
 depend: $(SRCS)
-       $(CC) -MM $(CFLAGS) $^ 1>.depend
+       $(CC) -MM $(CFLAGS) $(DEFINES) $^ 1>.depend
 
 # libqemu