[PATCH] Fix build when objdir != srcdir

Anthony Liguori
2009-04-29T20:47:54Z

This requires adding the necessary bits to configure to create the directories
and symlinks for libkvm. It also requires sticking KVM_CFLAGS in
config-host.mak to ensure that it gets the right set of includes for the
kernel headers.

Signed-off-by: Anthony Liguori <aliguori@us.ibm.com>
---
configure | 10 ++++++++--
kvm/libkvm/Makefile | 4 +++-
2 files changed, 11 insertions(+), 3 deletions(-)

diff --git a/configure b/configure
index fc0fb9b..c41e269 100755
--- a/configure
+++ b/configure
@@ -518,7 +518,7 @@ if test "$werror" = "yes" ; then
CFLAGS="$CFLAGS -Werror"
fi

-CFLAGS="$CFLAGS -I$(readlink -f "kvm/libkvm")"
+CFLAGS="$CFLAGS -I$(readlink -f "$source_path/kvm/libkvm")"

if test "$solaris" = "no" ; then
if ld --version 2>/dev/null | grep "GNU ld" >/dev/null 2>/dev/null ; then
@@ -1785,6 +1785,11 @@ bsd)
;;
esac

+# this is a temp hack needed for libkvm
+if test "$kvm" = "yes" ; then
+ echo "KVM_CFLAGS=$kvm_cflags" >> $config_mak
+fi
+
tools=
if test `expr "$target_list" : ".*softmmu.*"` != 0 ; then
tools="qemu-img\$(EXESUF) $tools"
@@ -2162,10 +2167,11 @@ done # for target in $targets

# build tree in object directory if source path is different from current one
if test "$source_path_used" = "yes" ; then
- DIRS="tests tests/cris slirp audio"
+ DIRS="tests tests/cris slirp audio kvm/libkvm"
FILES="Makefile tests/Makefile"
FILES="$FILES tests/cris/Makefile tests/cris/.gdbinit"
FILES="$FILES tests/test-mmap.c"
+ FILES="$FILES kvm/libkvm/Makefile"
for dir in $DIRS ; do
mkdir -p $dir
done
diff --git a/kvm/libkvm/Makefile b/kvm/libkvm/Makefile
index 727ce48..2f2cfa2 100644
--- a/kvm/libkvm/Makefile
+++ b/kvm/libkvm/Makefile
@@ -1,5 +1,5 @@
include ../../config-host.mak
-include config-$(ARCH).mak
+include $(VPATH)/kvm/libkvm/config-$(ARCH).mak

# libkvm is not -Wredundant-decls friendly yet
CFLAGS += -Wno-redundant-decls
@@ -18,6 +18,8 @@ LDFLAGS += $(CFLAGS)

CXXFLAGS = $(autodepend-flags)

+VPATH:=$(VPATH)/kvm/libkvm
+
autodepend-flags = -MMD -MF $(dir $*).$(notdir $*).d

--
1.6.0.6