From patchwork Wed Oct 24 12:58:33 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Paolo Bonzini X-Patchwork-Id: 193765 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from lists.gnu.org (lists.gnu.org [208.118.235.17]) (using TLSv1 with cipher AES256-SHA (256/256 bits)) (Client did not present a certificate) by ozlabs.org (Postfix) with ESMTPS id DC8C22C0097 for ; Thu, 25 Oct 2012 00:00:16 +1100 (EST) Received: from localhost ([::1]:54213 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1TR0Z9-0001sr-7g for incoming@patchwork.ozlabs.org; Wed, 24 Oct 2012 09:00:11 -0400 Received: from eggs.gnu.org ([208.118.235.92]:36454) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1TR0Yt-0001bi-CG for qemu-devel@nongnu.org; Wed, 24 Oct 2012 08:59:59 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1TR0Yp-0002uj-88 for qemu-devel@nongnu.org; Wed, 24 Oct 2012 08:59:55 -0400 Received: from mail-pa0-f45.google.com ([209.85.220.45]:63124) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1TR0Yp-0002u0-1d for qemu-devel@nongnu.org; Wed, 24 Oct 2012 08:59:51 -0400 Received: by mail-pa0-f45.google.com with SMTP id fb10so330625pad.4 for ; Wed, 24 Oct 2012 05:59:50 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=sender:from:to:cc:subject:date:message-id:x-mailer:in-reply-to :references; bh=tOO2zvO4jdtSLGOGs2TsvQfIacF9S5KBRT2gwUhbTeA=; b=OWtOGqM0gVzRABG2bfiE9D7XjO97mopWOU6YfghWJ7OZaqDCUqx+aF4/ydplbWf3yU Q05sVzHkNuc3iFGKB04CPGQ8Nva21K/GXwN2AfHNoyaYtdIj0/Er+5/+BmvPzV03X08c 27nFFnbtkYdc7BoJq/GzMZyIpk5aq/HT05aQ5SowG3jaxQRvTABgruxA5mOcadWRvPpX eOsVP1QIKr3EJGe4t2Y2f7dGUXvf8tWlqLmGRtzvQuQzG8YllDrtSLQ0Nzk2Rw6C5vhy HK1/myZdzv5tfECEh4VIvhvjBRCyn+cQ7+X0PEO1nqdhqtehW4dhRSw5vPWSOPWD2Jeq 4omQ== Received: by 10.68.137.228 with SMTP id ql4mr49934649pbb.125.1351083590555; Wed, 24 Oct 2012 05:59:50 -0700 (PDT) Received: from yakj.usersys.redhat.com (93-34-169-1.ip50.fastwebnet.it. [93.34.169.1]) by mx.google.com with ESMTPS id n7sm9466138pav.26.2012.10.24.05.59.47 (version=TLSv1/SSLv3 cipher=OTHER); Wed, 24 Oct 2012 05:59:49 -0700 (PDT) From: Paolo Bonzini To: qemu-devel@nongnu.org Date: Wed, 24 Oct 2012 14:58:33 +0200 Message-Id: <1351083542-15272-4-git-send-email-pbonzini@redhat.com> X-Mailer: git-send-email 1.7.12.1 In-Reply-To: <1351083542-15272-1-git-send-email-pbonzini@redhat.com> References: <1351083542-15272-1-git-send-email-pbonzini@redhat.com> X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 209.85.220.45 Cc: peter.maydell@linaro.org, aliguori@us.ibm.com Subject: [Qemu-devel] [PATCH 03/32] build: adjust setting of QEMU_INCLUDES X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Sender: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Make it correct for nested directories, and move the static part from Makefile to configure. Signed-off-by: Paolo Bonzini --- Makefile | 2 -- configure | 3 +-- rules.mak | 3 +++ 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/Makefile b/Makefile index 21b4ded..00126b9 100644 --- a/Makefile +++ b/Makefile @@ -123,8 +123,6 @@ audio/audio.o audio/fmodaudio.o: QEMU_CFLAGS += $(FMOD_CFLAGS) QEMU_CFLAGS+=$(CURL_CFLAGS) -QEMU_CFLAGS += -I$(SRC_PATH)/include - ui/cocoa.o: ui/cocoa.m ui/sdl.o audio/sdlaudio.o ui/sdl_zoom.o hw/baum.o: QEMU_CFLAGS += $(SDL_CFLAGS) diff --git a/configure b/configure index fa5657f..e4285e5 100755 --- a/configure +++ b/configure @@ -268,7 +268,7 @@ QEMU_CFLAGS="-fno-strict-aliasing $QEMU_CFLAGS" QEMU_CFLAGS="-Wall -Wundef -Wwrite-strings -Wmissing-prototypes $QEMU_CFLAGS" QEMU_CFLAGS="-Wstrict-prototypes -Wredundant-decls $QEMU_CFLAGS" QEMU_CFLAGS="-D_GNU_SOURCE -D_FILE_OFFSET_BITS=64 -D_LARGEFILE_SOURCE $QEMU_CFLAGS" -QEMU_INCLUDES="-I. -I\$(SRC_PATH) -I\$(SRC_PATH)/fpu" +QEMU_INCLUDES="-I. -I\$(SRC_PATH) -I\$(SRC_PATH)/include -I\$(SRC_PATH)/fpu" if test "$debug_info" = "yes"; then CFLAGS="-g $CFLAGS" LDFLAGS="-g $LDFLAGS" @@ -3261,7 +3261,6 @@ fi if test "$slirp" = "yes" ; then echo "CONFIG_SLIRP=y" >> $config_host_mak echo "CONFIG_SMBD_COMMAND=\"$smbd\"" >> $config_host_mak - QEMU_INCLUDES="-I\$(SRC_PATH)/slirp $QEMU_INCLUDES" fi if test "$vde" = "yes" ; then echo "CONFIG_VDE=y" >> $config_host_mak diff --git a/rules.mak b/rules.mak index 1b173aa..e77c76a 100644 --- a/rules.mak +++ b/rules.mak @@ -14,6 +14,9 @@ MAKEFLAGS += -rR # Flags for dependency generation QEMU_DGFLAGS += -MMD -MP -MT $@ -MF $(*D)/$(*F).d +# Same as -I$(SRC_PATH) -I., but for the nested source/object directories +QEMU_CFLAGS += -I$(