Re: [Qemu-devel] [PATCH 67/67] make: simplify source include path

[Michael S. Tsirkin]

On Thu, May 03, 2018 at 03:22:39PM -0500, Eric Blake wrote:
> On 05/03/2018 02:51 PM, Michael S. Tsirkin wrote:
> > 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 <address@hidden>
> > ---
> >   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"
> 
> I think this is a nice cleanup.
> 
> >   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"
> 
> Should you also be cleaning up this line?

True - I missed this part.

There will likely be more fallout from removing this part, so I will
note this in the commit log and work on patches on top.

> >   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
> > 
> 
> -- 
> Eric Blake, Principal Software Engineer
> Red Hat, Inc.           +1-919-301-3266
> Virtualization:  qemu.org | libvirt.org