From: Avi Kivity <[email protected]>
Signed-off-by: Avi Kivity <[email protected]>
diff --git a/kvm/user/Makefile b/kvm/user/Makefile
index cf7f8ed..d9fbf17 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 c4c639e..d9350fc 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 dd7ef54..ec6086b 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 e789fd4..2f59bb5 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 b50b540..d88f54c 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 \
--
To unsubscribe from this list: send the line "unsubscribe kvm-commits" in
the body of a message to [email protected]
More majordomo info at http://vger.kernel.org/majordomo-info.html
