Commit 16e9b7de41bc4163fe53140f387c020ea55d0a06
1 parent
34865134
filename fixes
git-svn-id: svn://svn.savannah.nongnu.org/qemu/trunk@403 c046a42c-6fe2-441c-8c8c-71466251a162
Showing
1 changed file
with
8 additions
and
5 deletions
Makefile.target
| @@ -17,8 +17,14 @@ else | @@ -17,8 +17,14 @@ else | ||
| 17 | QEMU_SYSTEM=qemu | 17 | QEMU_SYSTEM=qemu |
| 18 | endif | 18 | endif |
| 19 | 19 | ||
| 20 | -ifndef CONFIG_SOFTMMU | 20 | +ifdef CONFIG_USER_ONLY |
| 21 | PROGS=$(QEMU_USER) | 21 | PROGS=$(QEMU_USER) |
| 22 | +else | ||
| 23 | +ifeq ($(ARCH),i386) | ||
| 24 | +ifeq ($(TARGET_ARCH), i386) | ||
| 25 | +PROGS+=$(QEMU_SYSTEM) | ||
| 26 | +endif | ||
| 27 | +endif | ||
| 22 | endif | 28 | endif |
| 23 | 29 | ||
| 24 | ifdef CONFIG_STATIC | 30 | ifdef CONFIG_STATIC |
| @@ -41,9 +47,6 @@ else | @@ -41,9 +47,6 @@ else | ||
| 41 | # is the simplest way to make it self virtualizable! | 47 | # is the simplest way to make it self virtualizable! |
| 42 | LDFLAGS+=-Wl,-shared | 48 | LDFLAGS+=-Wl,-shared |
| 43 | endif | 49 | endif |
| 44 | -ifeq ($(TARGET_ARCH), i386) | ||
| 45 | -PROGS+=$(QEMU_SYSTEM) | ||
| 46 | -endif | ||
| 47 | endif | 50 | endif |
| 48 | 51 | ||
| 49 | ifeq ($(ARCH),ppc) | 52 | ifeq ($(ARCH),ppc) |
| @@ -171,7 +174,7 @@ sdl.o: sdl.c | @@ -171,7 +174,7 @@ sdl.o: sdl.c | ||
| 171 | $(CC) $(CFLAGS) $(DEFINES) $(SDL_CFLAGS) -c -o $@ $< | 174 | $(CC) $(CFLAGS) $(DEFINES) $(SDL_CFLAGS) -c -o $@ $< |
| 172 | 175 | ||
| 173 | depend: $(SRCS) | 176 | depend: $(SRCS) |
| 174 | - $(CC) -MM $(CFLAGS) $^ 1>.depend | 177 | + $(CC) -MM $(CFLAGS) $(DEFINES) $^ 1>.depend |
| 175 | 178 | ||
| 176 | # libqemu | 179 | # libqemu |
| 177 | 180 |