[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PATCH 03/32] build: adjust setting of QEMU_INCLUDES
From: |
Paolo Bonzini |
Subject: |
[Qemu-devel] [PATCH 03/32] build: adjust setting of QEMU_INCLUDES |
Date: |
Mon, 17 Dec 2012 19:17:05 +0100 |
Make it correct for nested directories, and move the static part
from Makefile to configure.
Signed-off-by: Paolo Bonzini <address@hidden>
---
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$(<D) -I$(@D)
+
%.o: %.c
$(call quiet-command,$(CC) $(QEMU_INCLUDES) $(QEMU_CFLAGS)
$(QEMU_DGFLAGS) $(CFLAGS) -c -o $@ $<," CC $(TARGET_DIR)$@")
--
1.8.0.2
- [Qemu-devel] [PULL 00/45] Include reorganization + PCI patch queue, Paolo Bonzini, 2012/12/17
- [Qemu-devel] [PATCH 01/32] libcacard: simplify rules for recursive build, Paolo Bonzini, 2012/12/17
- [Qemu-devel] [PATCH 03/32] build: adjust setting of QEMU_INCLUDES,
Paolo Bonzini <=
- [Qemu-devel] [PATCH 02/32] vscclient: use per-target variables, Paolo Bonzini, 2012/12/17
- [Qemu-devel] [PATCH 04/32] build: add $(TARGET_DIR) to "GEN config-target.h" lines, Paolo Bonzini, 2012/12/17
- [Qemu-devel] [PATCH 05/32] build: move rules from Makefile to */Makefile.objs, Paolo Bonzini, 2012/12/17
- [Qemu-devel] [PATCH 06/32] build: create ldscripts/, Paolo Bonzini, 2012/12/17
- [Qemu-devel] [PATCH 08/32] build: kill libuser, Paolo Bonzini, 2012/12/17
- [Qemu-devel] [PATCH 07/32] build: kill libdis, move disassemblers to disas/, Paolo Bonzini, 2012/12/17
- [Qemu-devel] [PATCH 09/32] janitor: do not rely on indirect inclusions of or from qemu-char.h, Paolo Bonzini, 2012/12/17
- [Qemu-devel] [PATCH 12/32] net: do not include net.h everywhere, Paolo Bonzini, 2012/12/17
- [Qemu-devel] [PATCH 13/32] net: move net.c to net/, Paolo Bonzini, 2012/12/17
- [Qemu-devel] [PATCH 10/32] janitor: do not include qemu-char everywhere, Paolo Bonzini, 2012/12/17