From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:57942) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1fEKGf-0003My-Ue for qemu-devel@nongnu.org; Thu, 03 May 2018 15:51:55 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1fEKGe-0003VS-Sq for qemu-devel@nongnu.org; Thu, 03 May 2018 15:51:53 -0400 Received: from mx3-rdu2.redhat.com ([66.187.233.73]:42182 helo=mx1.redhat.com) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1fEKGe-0003Ug-P1 for qemu-devel@nongnu.org; Thu, 03 May 2018 15:51:52 -0400 Date: Thu, 3 May 2018 22:51:47 +0300 From: "Michael S. Tsirkin" Message-ID: <1525376963-79623-68-git-send-email-mst@redhat.com> References: <1525376963-79623-1-git-send-email-mst@redhat.com> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <1525376963-79623-1-git-send-email-mst@redhat.com> Subject: [Qemu-devel] [PATCH 67/67] make: simplify source include path List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org Cc: eblake@redhat.com, berrange@redhat.com, kwolf@redhat.com, peter.maydell@linaro.org, Paolo Bonzini , Philippe =?utf-8?Q?Mathieu-Daud=C3=83=C2=A9?= , Yang Zhong , Richard Henderson , Gerd Hoffmann , Fam Zheng Include all files in the source directory through include/ directory. This helps ensure consistent naming and makes it easier to locate any specific header. Signed-off-by: Michael S. Tsirkin --- configure | 3 +-- Makefile.target | 2 +- 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/configure b/configure index 0a19b03..3d5d2b9 100755 --- a/configure +++ b/configure @@ -534,7 +534,7 @@ QEMU_CFLAGS="-fno-strict-aliasing -fno-common -fwrapv $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="-iquote . -iquote \$(SRC_PATH) -iquote \$(SRC_PATH)/accel/tcg -iquote \$(SRC_PATH)/include" +QEMU_INCLUDES="-iquote . -iquote \$(SRC_PATH)/include" if test "$debug_info" = "yes"; then CFLAGS="-g $CFLAGS" LDFLAGS="-g $LDFLAGS" @@ -6631,7 +6631,6 @@ elif test "$ARCH" = "ppc64" ; then else QEMU_INCLUDES="-iquote \$(SRC_PATH)/tcg/\$(ARCH) $QEMU_INCLUDES" fi -QEMU_INCLUDES="-iquote \$(SRC_PATH)/tcg $QEMU_INCLUDES" echo "TOOLS=$tools" >> $config_host_mak echo "ROMS=$roms" >> $config_host_mak diff --git a/Makefile.target b/Makefile.target index d0ec77a..b6605ed 100644 --- a/Makefile.target +++ b/Makefile.target @@ -11,7 +11,7 @@ $(call set-vpath, $(SRC_PATH):$(BUILD_DIR)) ifdef CONFIG_LINUX QEMU_CFLAGS += -I../linux-headers endif -QEMU_CFLAGS += -iquote .. -iquote $(SRC_PATH)/target/$(TARGET_BASE_ARCH) -DNEED_CPU_H +QEMU_CFLAGS += -iquote .. -iquote $(SRC_PATH)/include/target/$(TARGET_BASE_ARCH) -DNEED_CPU_H QEMU_CFLAGS+=-iquote $(SRC_PATH)/include -- MST