From patchwork Thu Apr 30 15:46:34 2009 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Anthony Liguori X-Patchwork-Id: 21095 Received: from vger.kernel.org (vger.kernel.org [209.132.176.167]) by demeter.kernel.org (8.14.2/8.14.2) with ESMTP id n3UFmdV9007056 for ; Thu, 30 Apr 2009 15:48:39 GMT Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S932894AbZD3Pqi (ORCPT ); Thu, 30 Apr 2009 11:46:38 -0400 Received: (majordomo@vger.kernel.org) by vger.kernel.org id S932896AbZD3Pqh (ORCPT ); Thu, 30 Apr 2009 11:46:37 -0400 Received: from e2.ny.us.ibm.com ([32.97.182.142]:33051 "EHLO e2.ny.us.ibm.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S932888AbZD3Pqg (ORCPT ); Thu, 30 Apr 2009 11:46:36 -0400 Received: from d01relay02.pok.ibm.com (d01relay02.pok.ibm.com [9.56.227.234]) by e2.ny.us.ibm.com (8.13.1/8.13.1) with ESMTP id n3UFgtQc028483 for ; Thu, 30 Apr 2009 11:42:55 -0400 Received: from d01av04.pok.ibm.com (d01av04.pok.ibm.com [9.56.224.64]) by d01relay02.pok.ibm.com (8.13.8/8.13.8/NCO v9.2) with ESMTP id n3UFkast089248 for ; Thu, 30 Apr 2009 11:46:36 -0400 Received: from d01av04.pok.ibm.com (loopback [127.0.0.1]) by d01av04.pok.ibm.com (8.12.11.20060308/8.13.3) with ESMTP id n3UFkZ4V027767 for ; Thu, 30 Apr 2009 11:46:35 -0400 Received: from localhost.localdomain (sig-9-76-212-241.mts.ibm.com [9.76.212.241]) by d01av04.pok.ibm.com (8.12.11.20060308/8.12.11) with ESMTP id n3UFkYEN027691; Thu, 30 Apr 2009 11:46:34 -0400 From: Anthony Liguori To: kvm@vger.kernel.org Cc: Anthony Liguori , Avi Kivity Subject: [PATCH] Fix build when objdir != srcdir (v3) Date: Thu, 30 Apr 2009 10:46:34 -0500 Message-Id: <1241106394-20046-1-git-send-email-aliguori@us.ibm.com> X-Mailer: git-send-email 1.6.0.6 Sender: kvm-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: kvm@vger.kernel.org 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. v1 => v2 Fix build when objdir == srcdir v2 => v3 git add to actual get the change Signed-off-by: Anthony Liguori --- configure | 10 ++++++++-- kvm/libkvm/Makefile | 11 ++++++++++- 2 files changed, 18 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..8de7eaf 100644 --- a/kvm/libkvm/Makefile +++ b/kvm/libkvm/Makefile @@ -1,5 +1,12 @@ include ../../config-host.mak -include config-$(ARCH).mak +ifneq ($(VPATH),) +srcdir=$(VPATH)/kvm/libkvm +else +srcdir=. +endif + +include $(srcdir)/config-$(ARCH).mak + # libkvm is not -Wredundant-decls friendly yet CFLAGS += -Wno-redundant-decls @@ -18,6 +25,8 @@ LDFLAGS += $(CFLAGS) CXXFLAGS = $(autodepend-flags) +VPATH:=$(VPATH)/kvm/libkvm + autodepend-flags = -MMD -MF $(dir $*).$(notdir $*).d