diff options
| author |   Avi Kivity <avi@redhat.com> | 2009-06-01 18:04:50 +0300 |
|---|---|---|
| committer | Avi Kivity <avi@redhat.com> | 2009-06-01 18:04:50 +0300 |
| commit | 5c2c76c9ef41aa1149c27df4f96477ce236c10ed (patch) | |
| tree | 70f22846ce94bb6202dbdd43ad49c9716230d8b4 | |
| parent | kvm: Correct kernel headers for PIT2 (diff) | |
| download | qemu-kvm-5c2c76c9ef41aa1149c27df4f96477ce236c10ed.tar.gz qemu-kvm-5c2c76c9ef41aa1149c27df4f96477ce236c10ed.tar.bz2 qemu-kvm-5c2c76c9ef41aa1149c27df4f96477ce236c10ed.zip | |
Adjust kvm/user/ include directories to new include layout
Signed-off-by: Avi Kivity <avi@redhat.com>
| -rw-r--r-- | kvm/user/Makefile | 1 | ||||
| -rw-r--r-- | kvm/user/config-ia64.mak | 2 | ||||
| -rw-r--r-- | kvm/user/config-powerpc.mak | 2 | ||||
| -rw-r--r-- | kvm/user/config-x86-common.mak | 2 | ||||
| -rw-r--r-- | kvm/user/config-x86_64.mak | 1 |
5 files changed, 5 insertions, 3 deletions
diff --git a/kvm/user/Makefile b/kvm/user/Makefile index cf7f8ed74..d9fbf17f4 100644 --- a/kvm/user/Makefile +++ b/kvm/user/Makefile @@ -29,6 +29,7 @@ CFLAGS += -O1 CFLAGS += $(autodepend-flags) -g -fomit-frame-pointer -Wall CFLAGS += $(call cc-option, -fno-stack-protector, "") CFLAGS += $(call cc-option, -fno-stack-protector-all, "") +CFLAGS += -I../include CFLAGS += -I ../libkvm LDFLAGS += $(CFLAGS) -L ../libkvm diff --git a/kvm/user/config-ia64.mak b/kvm/user/config-ia64.mak index c4c639e2f..d9350fcc5 100644 --- a/kvm/user/config-ia64.mak +++ b/kvm/user/config-ia64.mak @@ -1,7 +1,7 @@ bits = 64 CFLAGS += -m64 CFLAGS += -D__ia64__ -CFLAGS += -I $(KERNELDIR)/include +CFLAGS += -I../include/ia64 all: diff --git a/kvm/user/config-powerpc.mak b/kvm/user/config-powerpc.mak index dd7ef5486..ec6086bf4 100644 --- a/kvm/user/config-powerpc.mak +++ b/kvm/user/config-powerpc.mak @@ -1,4 +1,4 @@ -CFLAGS += -I $(KERNELDIR)/include +CFLAGS += -I../include/powerpc CFLAGS += -Wa,-mregnames -I test/lib CFLAGS += -ffreestanding diff --git a/kvm/user/config-x86-common.mak b/kvm/user/config-x86-common.mak index e789fd45e..2f59bb5a4 100644 --- a/kvm/user/config-x86-common.mak +++ b/kvm/user/config-x86-common.mak @@ -1,5 +1,7 @@ #This is a make file with common rules for both x86 & x86-64 +CFLAGS += -I../include/x86 + all: kvmctl kvmtrace test_cases kvmctl_objs= main.o iotable.o ../libkvm/libkvm.a diff --git a/kvm/user/config-x86_64.mak b/kvm/user/config-x86_64.mak index b50b5402f..d88f54c7f 100644 --- a/kvm/user/config-x86_64.mak +++ b/kvm/user/config-x86_64.mak @@ -3,7 +3,6 @@ cstart.o = $(TEST_DIR)/cstart64.o bits = 64 ldarch = elf64-x86-64 CFLAGS += -D__x86_64__ -CFLAGS += -I $(KERNELDIR)/include tests = $(TEST_DIR)/access.flat $(TEST_DIR)/irq.flat $(TEST_DIR)/sieve.flat \ $(TEST_DIR)/simple.flat $(TEST_DIR)/stringio.flat \ |