From patchwork Thu Aug 27 19:17: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: 32282 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 84465B7093 for ; Fri, 28 Aug 2009 05:28:50 +1000 (EST) Received: from localhost ([127.0.0.1]:47916 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1MgkeN-0008RW-GT for incoming@patchwork.ozlabs.org; Thu, 27 Aug 2009 15:28:47 -0400 Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43) id 1MgkWX-0005Ne-VI for qemu-devel@nongnu.org; Thu, 27 Aug 2009 15:20:42 -0400 Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43) id 1MgkWS-0005K9-DR for qemu-devel@nongnu.org; Thu, 27 Aug 2009 15:20:40 -0400 Received: from [199.232.76.173] (port=54404 helo=monty-python.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1MgkWS-0005K6-61 for qemu-devel@nongnu.org; Thu, 27 Aug 2009 15:20:36 -0400 Received: from mx1.redhat.com ([209.132.183.28]:60271) by monty-python.gnu.org with esmtp (Exim 4.60) (envelope-from ) id 1MgkWR-00061M-Nq for qemu-devel@nongnu.org; Thu, 27 Aug 2009 15:20:36 -0400 Received: from int-mx02.intmail.prod.int.phx2.redhat.com (int-mx02.intmail.prod.int.phx2.redhat.com [10.5.11.12]) by mx1.redhat.com (8.13.8/8.13.8) with ESMTP id n7RJKZ6t002612 for ; Thu, 27 Aug 2009 15:20:35 -0400 Received: from localhost.localdomain (vpn2-8-219.ams2.redhat.com [10.36.8.219]) by int-mx02.intmail.prod.int.phx2.redhat.com (8.13.8/8.13.8) with ESMTP id n7RJKR03028641; Thu, 27 Aug 2009 15:20:34 -0400 From: Juan Quintela To: qemu-devel@nongnu.org Date: Thu, 27 Aug 2009 21:17:40 +0200 Message-Id: <725aae859ed74d565e537c654e70a2796700926d.1251399960.git.quintela@redhat.com> In-Reply-To: References: In-Reply-To: References: X-Scanned-By: MIMEDefang 2.67 on 10.5.11.12 X-detected-operating-system: by monty-python.gnu.org: Genre and OS details not recognized. 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 | 6 +++++- configure | 17 ----------------- 2 files changed, 5 insertions(+), 18 deletions(-) diff --git a/Makefile.target b/Makefile.target index ae88fc9..2f75e6d 100644 --- a/Makefile.target +++ b/Makefile.target @@ -26,7 +26,11 @@ LIBS+=-lm kvm.o kvm-all.o: QEMU_CFLAGS+=$(KVM_CFLAGS) -all: $(PROGS) +%.c %.h: config-target.h +config-target.h: config-target.h-timestamp +config-target.h-timestamp: config-target.mak + +all: config-target.h $(PROGS) # Dummy command so that make thinks it has done something @true diff --git a/configure b/configure index 061156e..93bc4d0 100755 --- a/configure +++ b/configure @@ -1775,7 +1775,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 @@ -1810,10 +1809,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 @@ -2161,18 +2156,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