5 files changed, 1 insertion(+), 8 deletions(-)
user/Makefile | 1 +
user/config-i386.mak | 1 -
user/config-powerpc.mak | 1 -
user/config-x86_64.mak | 1 -
user/configure | 5 -----
This patch fixes user directory to now include synced headers. It also removes
the kerneldir option, as it is no longer needed.
Signed-off-by: Jerone Young <[EMAIL PROTECTED]>
diff --git a/user/Makefile b/user/Makefile
--- a/user/Makefile
+++ b/user/Makefile
@@ -28,6 +28,7 @@ CFLAGS += $(call cc-option, -fno-stack-p
CFLAGS += $(call cc-option, -fno-stack-protector, "")
CFLAGS += $(call cc-option, -fno-stack-protector-all, "")
CFLAGS += -I ../libkvm
+CFLAGS += $(INCLUDES_DIR)
LDFLAGS += $(CFLAGS) -L ../libkvm
diff --git a/user/config-i386.mak b/user/config-i386.mak
--- a/user/config-i386.mak
+++ b/user/config-i386.mak
@@ -4,7 +4,6 @@ ldarch = elf32-i386
ldarch = elf32-i386
CFLAGS += -m32
CFLAGS += -D__i386__
-CFLAGS += -I $(KERNELDIR)/include
tests=
diff --git a/user/config-powerpc.mak b/user/config-powerpc.mak
--- a/user/config-powerpc.mak
+++ b/user/config-powerpc.mak
@@ -30,7 +30,6 @@ all: kvmctl $(tests) $(simpletests)
CFLAGS += -m32
CFLAGS += -D__powerpc__
-CFLAGS += -I $(KERNELDIR)/include
CFLAGS += -Wa,-mregnames
$(simpletests): %.bin: %.o
diff --git a/user/config-x86_64.mak b/user/config-x86_64.mak
--- a/user/config-x86_64.mak
+++ b/user/config-x86_64.mak
@@ -4,7 +4,6 @@ ldarch = elf64-x86-64
ldarch = elf64-x86-64
CFLAGS += -m64
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 \
diff --git a/user/configure b/user/configure
--- a/user/configure
+++ b/user/configure
@@ -18,7 +18,6 @@ usage() {
--cc=CC c compiler to use ($cc)
--ld=LD ld linker to use ($ld)
--prefix=PREFIX where to install things ($prefix)
- --kerneldir=DIR kernel build directory for kvm.h ($kerneldir)
EOF
exit 1
}
@@ -33,9 +32,6 @@ while [[ "$1" = -* ]]; do
case "$opt" in
--prefix)
prefix="$arg"
- ;;
- --kerneldir)
- kerneldir="$arg"
;;
--arch)
arch="$arg"
@@ -60,7 +56,6 @@ done
cat <<EOF > config.mak
PREFIX=$prefix
-KERNELDIR=$(readlink -f $kerneldir)
ARCH=$arch
CC=$cross_prefix$cc
LD=$cross_prefix$ld
-------------------------------------------------------------------------
This SF.net email is sponsored by the 2008 JavaOne(SM) Conference
Don't miss this year's exciting event. There's still time to save $100.
Use priority code J8TL2D2.
http://ad.doubleclick.net/clk;198757673;13503038;p?http://java.sun.com/javaone
_______________________________________________
kvm-devel mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/kvm-devel
