gwj / at91sam9263 · Commits

Commit 3035f7ff83c9f072c0b9dc7a95789dba613b8750

Authored by bellard
1 parent 4afa6482

use new directory layout 


git-svn-id: svn://svn.savannah.nongnu.org/qemu/trunk@674 c046a42c-6fe2-441c-8c8c-71466251a162
Inline Side-by-side
Showing 1 changed file with 7 additions and 3 deletions
Makefile.target
  View file @3035f7f
@@ -2,10 +2,14 @@ include config.mak @@ -2,10 +2,14 @@ include config.mak
2 2
3 TARGET_PATH=$(SRC_PATH)/target-$(TARGET_ARCH) 3 TARGET_PATH=$(SRC_PATH)/target-$(TARGET_ARCH)
4 VPATH=$(SRC_PATH):$(TARGET_PATH):$(SRC_PATH)/hw 4 VPATH=$(SRC_PATH):$(TARGET_PATH):$(SRC_PATH)/hw
  5 +DEFINES=-I. -I$(TARGET_PATH) -I$(SRC_PATH)
  6 +ifdef CONFIG_USER_ONLY
  7 +VPATH+=:$(SRC_PATH)/linux-user
  8 +DEFINES+=-I$(SRC_PATH)/linux-user -I$(SRC_PATH)/linux-user/$(TARGET_ARCH)
  9 +endif
5 CFLAGS=-Wall -O2 -g 10 CFLAGS=-Wall -O2 -g
6 LDFLAGS=-g 11 LDFLAGS=-g
7 LIBS= 12 LIBS=
8 -DEFINES=-I. -I$(TARGET_PATH) -I$(SRC_PATH)  
9 HELPER_CFLAGS=$(CFLAGS) 13 HELPER_CFLAGS=$(CFLAGS)
10 DYNGEN=../dyngen 14 DYNGEN=../dyngen
11 # user emulator name 15 # user emulator name
@@ -149,7 +153,7 @@ LDFLAGS+=-p @@ -149,7 +153,7 @@ LDFLAGS+=-p
149 main.o: CFLAGS+=-p 153 main.o: CFLAGS+=-p
150 endif 154 endif
151 155
152 -OBJS= elfload.o main.o syscall.o mmap.o signal.o path.o osdep.o 156 +OBJS= elfload.o main.o syscall.o mmap.o signal.o path.o osdep.o thunk.o
153 ifeq ($(TARGET_ARCH), i386) 157 ifeq ($(TARGET_ARCH), i386)
154 OBJS+= vm86.o 158 OBJS+= vm86.o
155 endif 159 endif
@@ -162,7 +166,7 @@ SRCS:= $(OBJS:.o=.c) @@ -162,7 +166,7 @@ SRCS:= $(OBJS:.o=.c)
162 OBJS+= libqemu.a 166 OBJS+= libqemu.a
163 167
164 # cpu emulator library 168 # cpu emulator library
165 -LIBOBJS=thunk.o exec.o translate-all.o cpu-exec.o gdbstub.o \ 169 +LIBOBJS=exec.o translate-all.o cpu-exec.o gdbstub.o \
166 translate.o op.o 170 translate.o op.o
167 171
168 ifeq ($(TARGET_ARCH), i386) 172 ifeq ($(TARGET_ARCH), i386)