From patchwork Thu Dec 6 13:06:41 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Paolo Bonzini X-Patchwork-Id: 204274 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 1A2042C01C2 for ; Fri, 7 Dec 2012 02:11:51 +1100 (EST) Received: from localhost ([::1]:52059 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Tgd77-0002hP-50 for incoming@patchwork.ozlabs.org; Thu, 06 Dec 2012 10:11:49 -0500 Received: from eggs.gnu.org ([208.118.235.92]:38723) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1TgbB5-0003ay-4v for qemu-devel@nongnu.org; Thu, 06 Dec 2012 08:07:53 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1TgbAr-0004xQ-W5 for qemu-devel@nongnu.org; Thu, 06 Dec 2012 08:07:44 -0500 Received: from mail-ie0-f175.google.com ([209.85.223.175]:46680) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1TgbAr-0004xF-SM for qemu-devel@nongnu.org; Thu, 06 Dec 2012 08:07:33 -0500 Received: by mail-ie0-f175.google.com with SMTP id qd14so10392813ieb.20 for ; Thu, 06 Dec 2012 05:07:33 -0800 (PST) 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=aHJGajE6jFqin9JG6QX8cIdkvRFqrfQDPR5SBWGL3HA=; b=L4fCU7lKD5iLWnhuFGF7PtYWBGAs5JVkakrrjS2/k2JDCiOAgIGQe6RjTVyHsIQbiP of2MHW4Rh/DwpsFydriS9uXlHLgz16ze7utkdZ5Hj3j04isYq27DGfvBy5xZyIvmIPBV kpGNjtd8qp7H9BZ5gJbWBZiSqphOaDpJTWSh9b4Oc54XgmVGZav2QoQb64NcVT1SAnsX b1w6KmLNu4KSCzt8ZP1r0pPKBtO0DHECCOXDaved3yH+WUeygzB9CZEGUzumaoOmceBR ToT9S5BgXCAxnw+BJPRsNjF3v8iXGC5/ZGAg4F49Y1cS/3oJoTsIvsI+eHJ/4ASGtNlG 0sLw== Received: by 10.50.195.168 with SMTP id if8mr1208884igc.71.1354799253070; Thu, 06 Dec 2012 05:07:33 -0800 (PST) Received: from yakj.usersys.redhat.com (93-34-219-150.ip51.fastwebnet.it. [93.34.219.150]) by mx.google.com with ESMTPS id wm10sm15431723igc.2.2012.12.06.05.07.30 (version=TLSv1/SSLv3 cipher=OTHER); Thu, 06 Dec 2012 05:07:32 -0800 (PST) From: Paolo Bonzini To: qemu-devel@nongnu.org Date: Thu, 6 Dec 2012 14:06:41 +0100 Message-Id: <1354799230-30904-4-git-send-email-pbonzini@redhat.com> X-Mailer: git-send-email 1.8.0.1 In-Reply-To: <1354799230-30904-1-git-send-email-pbonzini@redhat.com> References: <1354799230-30904-1-git-send-email-pbonzini@redhat.com> X-detected-operating-system: by eggs.gnu.org: GNU/Linux 3.x [fuzzy] X-Received-From: 209.85.223.175 Cc: aliguori@us.ibm.com, afaerber@suse.de 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 7e38112..9ebd3cd 100644 --- a/Makefile +++ b/Makefile @@ -145,8 +145,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 994f731..caaa426 100755 --- a/configure +++ b/configure @@ -269,7 +269,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" @@ -3336,7 +3336,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 d0b04e4..77d2360 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$(