Commit 3035f7ff authored by bellard's avatar bellard
Browse files

use new directory layout


git-svn-id: svn://svn.savannah.nongnu.org/qemu/trunk@674 c046a42c-6fe2-441c-8c8c-71466251a162
parent 4afa6482
...@@ -2,10 +2,14 @@ include config.mak ...@@ -2,10 +2,14 @@ include config.mak
TARGET_PATH=$(SRC_PATH)/target-$(TARGET_ARCH) TARGET_PATH=$(SRC_PATH)/target-$(TARGET_ARCH)
VPATH=$(SRC_PATH):$(TARGET_PATH):$(SRC_PATH)/hw VPATH=$(SRC_PATH):$(TARGET_PATH):$(SRC_PATH)/hw
DEFINES=-I. -I$(TARGET_PATH) -I$(SRC_PATH)
ifdef CONFIG_USER_ONLY
VPATH+=:$(SRC_PATH)/linux-user
DEFINES+=-I$(SRC_PATH)/linux-user -I$(SRC_PATH)/linux-user/$(TARGET_ARCH)
endif
CFLAGS=-Wall -O2 -g CFLAGS=-Wall -O2 -g
LDFLAGS=-g LDFLAGS=-g
LIBS= LIBS=
DEFINES=-I. -I$(TARGET_PATH) -I$(SRC_PATH)
HELPER_CFLAGS=$(CFLAGS) HELPER_CFLAGS=$(CFLAGS)
DYNGEN=../dyngen DYNGEN=../dyngen
# user emulator name # user emulator name
...@@ -149,7 +153,7 @@ LDFLAGS+=-p ...@@ -149,7 +153,7 @@ LDFLAGS+=-p
main.o: CFLAGS+=-p main.o: CFLAGS+=-p
endif endif
OBJS= elfload.o main.o syscall.o mmap.o signal.o path.o osdep.o OBJS= elfload.o main.o syscall.o mmap.o signal.o path.o osdep.o thunk.o
ifeq ($(TARGET_ARCH), i386) ifeq ($(TARGET_ARCH), i386)
OBJS+= vm86.o OBJS+= vm86.o
endif endif
...@@ -162,7 +166,7 @@ SRCS:= $(OBJS:.o=.c) ...@@ -162,7 +166,7 @@ SRCS:= $(OBJS:.o=.c)
OBJS+= libqemu.a OBJS+= libqemu.a
# cpu emulator library # cpu emulator library
LIBOBJS=thunk.o exec.o translate-all.o cpu-exec.o gdbstub.o \ LIBOBJS=exec.o translate-all.o cpu-exec.o gdbstub.o \
translate.o op.o translate.o op.o
ifeq ($(TARGET_ARCH), i386) ifeq ($(TARGET_ARCH), i386)
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment