From patchwork Fri Aug 28 18:56:40 2009 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Juan Quintela X-Patchwork-Id: 32440 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from lists.gnu.org (lists.gnu.org [199.232.76.165]) (using TLSv1 with cipher DHE-RSA-AES256-SHA (256/256 bits)) (Client did not present a certificate) by bilbo.ozlabs.org (Postfix) with ESMTPS id F2BF1B70B3 for ; Sat, 29 Aug 2009 05:55:26 +1000 (EST) Received: from localhost ([127.0.0.1]:40526 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1Mh7Xe-0007Ks-7d for incoming@patchwork.ozlabs.org; Fri, 28 Aug 2009 15:55:22 -0400 Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43) id 1Mh6fs-000330-Lj for qemu-devel@nongnu.org; Fri, 28 Aug 2009 14:59:48 -0400 Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43) id 1Mh6fl-0002qw-LA for qemu-devel@nongnu.org; Fri, 28 Aug 2009 14:59:47 -0400 Received: from [199.232.76.173] (port=43271 helo=monty-python.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1Mh6fl-0002qS-8Z for qemu-devel@nongnu.org; Fri, 28 Aug 2009 14:59:41 -0400 Received: from mx1.redhat.com ([209.132.183.28]:2643) by monty-python.gnu.org with esmtp (Exim 4.60) (envelope-from ) id 1Mh6fk-0007dL-KY for qemu-devel@nongnu.org; Fri, 28 Aug 2009 14:59:40 -0400 Received: from int-mx01.intmail.prod.int.phx2.redhat.com (int-mx01.intmail.prod.int.phx2.redhat.com [10.5.11.11]) by mx1.redhat.com (8.13.8/8.13.8) with ESMTP id n7SIxdWM002513; Fri, 28 Aug 2009 14:59:39 -0400 Received: from localhost.localdomain (vpn2-8-222.ams2.redhat.com [10.36.8.222]) by int-mx01.intmail.prod.int.phx2.redhat.com (8.13.8/8.13.8) with ESMTP id n7SIxTPi029889; Fri, 28 Aug 2009 14:59:38 -0400 From: Juan Quintela To: qemu-devel@nongnu.org Date: Fri, 28 Aug 2009 20:56:40 +0200 Message-Id: <8ba085407d8b943f14ac193f949ef53ef924e603.1251485646.git.quintela@redhat.com> In-Reply-To: References: In-Reply-To: References: X-Scanned-By: MIMEDefang 2.67 on 10.5.11.11 X-detected-operating-system: by monty-python.gnu.org: Genre and OS details not recognized. Cc: aliguori@us.ibm.com Subject: [Qemu-devel] [PATCH 05/30] Move generation of config-target.h to Makefile from configure X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: qemu-devel.nongnu.org List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Signed-off-by: Juan Quintela --- Makefile.target | 7 ++++++- configure | 17 ----------------- 2 files changed, 6 insertions(+), 18 deletions(-) diff --git a/Makefile.target b/Makefile.target index 67b133f..00dabc1 100644 --- a/Makefile.target +++ b/Makefile.target @@ -26,7 +26,12 @@ LIBS+=-lm kvm.o kvm-all.o: QEMU_CFLAGS+=$(KVM_CFLAGS) -all: $(PROGS) +config-target.h: config-target.h-timestamp +config-target.h-timestamp: config-target.mak + +all: config-target.h + $(MAKE) $(PROGS) + # Dummy command so that make thinks it has done something @true diff --git a/configure b/configure index dfdac33..2ecaf93 100755 --- a/configure +++ b/configure @@ -1950,7 +1950,6 @@ fi for target in $target_list; do target_dir="$target" config_target_mak=$target_dir/config-target.mak -config_target_h=$target_dir/config-target.h target_arch2=`echo $target | cut -d '-' -f 1` target_bigendian="no" case "$target_arch2" in @@ -1985,10 +1984,6 @@ case "$target" in ;; esac -#echo "Creating $config_target_mak, $config_target_h and $target_dir/Makefile" - -test -f $config_target_h && mv $config_target_h ${config_target_h}~ - mkdir -p $target_dir mkdir -p $target_dir/fpu mkdir -p $target_dir/tcg @@ -2337,18 +2332,6 @@ fi echo "LDFLAGS+=$ldflags" >> $config_target_mak echo "QEMU_CFLAGS+=$cflags" >> $config_target_mak -echo "#include \"../config-host.h\"" > $config_target_h - -/bin/sh $source_path/create_config < $config_target_mak >> $config_target_h - -if test -f ${config_target_h}~ ; then - if cmp -s $config_target_h ${config_target_h}~ ; then - mv ${config_target_h}~ $config_target_h - else - rm ${config_target_h}~ - fi -fi - done # for target in $targets # build tree in object directory if source path is different from current one