From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([208.118.235.92]:46055) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1UPbLu-00045W-J7 for qemu-devel@nongnu.org; Tue, 09 Apr 2013 12:25:00 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1UPbLt-00023A-D6 for qemu-devel@nongnu.org; Tue, 09 Apr 2013 12:24:58 -0400 Received: from mail-qc0-x235.google.com ([2607:f8b0:400d:c01::235]:44344) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1UPbLt-00022w-8Z for qemu-devel@nongnu.org; Tue, 09 Apr 2013 12:24:57 -0400 Received: by mail-qc0-f181.google.com with SMTP id a22so1560061qcs.12 for ; Tue, 09 Apr 2013 09:24:56 -0700 (PDT) Sender: Paolo Bonzini Message-ID: <516440D2.60605@redhat.com> Date: Tue, 09 Apr 2013 18:24:50 +0200 From: Paolo Bonzini MIME-Version: 1.0 References: <1364910582-3359-1-git-send-email-pbonzini@redhat.com> In-Reply-To: <1364910582-3359-1-git-send-email-pbonzini@redhat.com> Content-Type: text/plain; charset=ISO-8859-1 Content-Transfer-Encoding: 7bit Subject: Re: [Qemu-devel] [PATCH] configure: QEMU_INCLUDES are the same for all subtargets List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: qemu-devel@nongnu.org Il 02/04/2013 15:49, Paolo Bonzini ha scritto: > No need to put them in config-target.mak. > > Signed-off-by: Paolo Bonzini > --- > configure | 36 +++++++++++++++++------------------- > 1 file changed, 17 insertions(+), 19 deletions(-) > > diff --git a/configure b/configure > index fbea75e..04c2618 100755 > --- a/configure > +++ b/configure > @@ -3860,6 +3860,23 @@ if test "$trace_default" = "yes"; then > echo "CONFIG_TRACE_DEFAULT=y" >> $config_host_mak > fi > > +if test "$tcg_interpreter" = "yes"; then > + QEMU_INCLUDES="-I\$(SRC_PATH)/tcg/tci $QEMU_INCLUDES" > +elif test "$ARCH" = "sparc64" ; then > + QEMU_INCLUDES="-I\$(SRC_PATH)/tcg/sparc $QEMU_INCLUDES" > +elif test "$ARCH" = "s390x" ; then > + QEMU_INCLUDES="-I\$(SRC_PATH)/tcg/s390 $QEMU_INCLUDES" > +elif test "$ARCH" = "x86_64" ; then > + QEMU_INCLUDES="-I\$(SRC_PATH)/tcg/i386 $QEMU_INCLUDES" > +else > + QEMU_INCLUDES="-I\$(SRC_PATH)/tcg/\$(ARCH) $QEMU_INCLUDES" > +fi > +QEMU_INCLUDES="-I\$(SRC_PATH)/tcg $QEMU_INCLUDES" > + > +if test "$linux" = "yes" ; then > + QEMU_INCLUDES="-I\$(SRC_PATH)/linux-headers $QEMU_INCLUDES" > +fi > + > echo "TOOLS=$tools" >> $config_host_mak > echo "ROMS=$roms" >> $config_host_mak > echo "MAKE=$make" >> $config_host_mak > @@ -4236,26 +4253,8 @@ fi > # generate QEMU_CFLAGS/LDFLAGS for targets > > cflags="" > -includes="" > ldflags="" > > -if test "$tcg_interpreter" = "yes"; then > - includes="-I\$(SRC_PATH)/tcg/tci $includes" > -elif test "$ARCH" = "sparc64" ; then > - includes="-I\$(SRC_PATH)/tcg/sparc $includes" > -elif test "$ARCH" = "s390x" ; then > - includes="-I\$(SRC_PATH)/tcg/s390 $includes" > -elif test "$ARCH" = "x86_64" ; then > - includes="-I\$(SRC_PATH)/tcg/i386 $includes" > -else > - includes="-I\$(SRC_PATH)/tcg/\$(ARCH) $includes" > -fi > -includes="-I\$(SRC_PATH)/tcg $includes" > - > -if test "$linux" = "yes" ; then > - includes="-I\$(SRC_PATH)/linux-headers $includes" > -fi > - > for i in $ARCH $TARGET_BASE_ARCH ; do > case "$i" in > alpha) > @@ -4391,7 +4390,6 @@ fi > > echo "LDFLAGS+=$ldflags" >> $config_target_mak > echo "QEMU_CFLAGS+=$cflags" >> $config_target_mak > -echo "QEMU_INCLUDES+=$includes" >> $config_target_mak > > done # for target in $targets > > Ping. Paolo