From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([208.118.235.92]:51773) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1TkfGH-0003Ty-G8 for qemu-devel@nongnu.org; Mon, 17 Dec 2012 13:17:58 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1TkfGE-0004oW-UD for qemu-devel@nongnu.org; Mon, 17 Dec 2012 13:17:57 -0500 Received: from mail-wi0-f171.google.com ([209.85.212.171]:62964) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1TkfGE-0004oL-OI for qemu-devel@nongnu.org; Mon, 17 Dec 2012 13:17:54 -0500 Received: by mail-wi0-f171.google.com with SMTP id hn14so2161166wib.10 for ; Mon, 17 Dec 2012 10:17:54 -0800 (PST) Sender: Paolo Bonzini From: Paolo Bonzini Date: Mon, 17 Dec 2012 19:17:05 +0100 Message-Id: <1355768254-12933-4-git-send-email-pbonzini@redhat.com> In-Reply-To: <1355768254-12933-1-git-send-email-pbonzini@redhat.com> References: <1355768254-12933-1-git-send-email-pbonzini@redhat.com> Subject: [Qemu-devel] [PATCH 03/32] build: adjust setting of QEMU_INCLUDES List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@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 ecdb33a..e9ad1b1 100755 --- a/configure +++ b/configure @@ -278,7 +278,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" @@ -3343,7 +3343,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$(