From mboxrd@z Thu Jan  1 00:00:00 1970
Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43)
	id 1NTHnQ-0005fo-4s
	for qemu-devel@nongnu.org; Fri, 08 Jan 2010 11:34:44 -0500
Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43)
	id 1NTHnL-0005dN-Fw
	for qemu-devel@nongnu.org; Fri, 08 Jan 2010 11:34:43 -0500
Received: from [199.232.76.173] (port=50100 helo=monty-python.gnu.org)
	by lists.gnu.org with esmtp (Exim 4.43) id 1NTHnK-0005cq-Ah
	for qemu-devel@nongnu.org; Fri, 08 Jan 2010 11:34:38 -0500
Received: from mx20.gnu.org ([199.232.41.8]:10134)
	by monty-python.gnu.org with esmtps (TLS-1.0:RSA_AES_256_CBC_SHA1:32)
	(Exim 4.60) (envelope-from <anthony@codemonkey.ws>)
	id 1NTHnJ-0007Z9-Lq
	for qemu-devel@nongnu.org; Fri, 08 Jan 2010 11:34:37 -0500
Received: from mail-yx0-f188.google.com ([209.85.210.188])
	by mx20.gnu.org with esmtp (Exim 4.60)
	(envelope-from <anthony@codemonkey.ws>) id 1NTHnI-0008SQ-K0
	for qemu-devel@nongnu.org; Fri, 08 Jan 2010 11:34:36 -0500
Received: by yxe26 with SMTP id 26so18822841yxe.4
	for <qemu-devel@nongnu.org>; Fri, 08 Jan 2010 08:34:34 -0800 (PST)
Message-ID: <4B475E98.3060900@codemonkey.ws>
Date: Fri, 08 Jan 2010 10:34:32 -0600
From: Anthony Liguori <anthony@codemonkey.ws>
MIME-Version: 1.0
Subject: Re: [Qemu-devel] [PATCH] Makefile: Update unmodified
	config-devices.mak automatically
References: <m3r5rl376u.fsf@neno.neno>
	<1261319943-9224-1-git-send-email-weil@mail.berlios.de>
In-Reply-To: <1261319943-9224-1-git-send-email-weil@mail.berlios.de>
Content-Type: text/plain; charset=ISO-8859-1; format=flowed
Content-Transfer-Encoding: 7bit
List-Id: qemu-devel.nongnu.org
List-Unsubscribe: <http://lists.nongnu.org/mailman/listinfo/qemu-devel>,
	<mailto:qemu-devel-request@nongnu.org?subject=unsubscribe>
List-Archive: <http://lists.gnu.org/pipermail/qemu-devel>
List-Post: <mailto:qemu-devel@nongnu.org>
List-Help: <mailto:qemu-devel-request@nongnu.org?subject=help>
List-Subscribe: <http://lists.nongnu.org/mailman/listinfo/qemu-devel>,
	<mailto:qemu-devel-request@nongnu.org?subject=subscribe>
To: Stefan Weil <weil@mail.berlios.de>
Cc: quintela@trasno.org, QEMU Developers <qemu-devel@nongnu.org>

On 12/20/2009 08:39 AM, Stefan Weil wrote:
> This makes rebuilds after source updates easier
> for most users (who don't edit config-devices.mak).
>
> Signed-off-by: Stefan Weil<weil@mail.berlios.de>\
>    

Applied.  Thanks.

Regards,

Anthony Liguori
> ---
>   Makefile |   20 +++++++++++++++-----
>   1 files changed, 15 insertions(+), 5 deletions(-)
>
> diff --git a/Makefile b/Makefile
> index c1fa08c..684365d 100644
> --- a/Makefile
> +++ b/Makefile
> @@ -43,12 +43,22 @@ config-all-devices.mak: $(SUBDIR_DEVICES_MAK)
>
>   %/config-devices.mak: default-configs/%.mak
>   	$(call quiet-command,cat $<  >  $@.tmp, "  GEN   $@")
> -	@if test -f $@ ; then \
> -	  echo "WARNING: $@ out of date." ;\
> -	  echo "Run \"make defconfig\" to regenerate." ; \
> -	  rm $@.tmp ; \
> +	@if test -f $@; then \
> +	  if cmp -s $@.old $@ || cmp -s $@ $@.tmp; then \
> +	    mv $@.tmp $@; \
> +	    cp -p $@ $@.old; \
> +	  else \
> +	    if test -f $@.old; then \
> +	      echo "WARNING: $@ (user modified) out of date.";\
> +	    else \
> +	      echo "WARNING: $@ out of date.";\
> +	    fi; \
> +	    echo "Run \"make defconfig\" to regenerate."; \
> +	    rm $@.tmp; \
> +	  fi; \
>   	 else \
> -	  mv $@.tmp $@ ; \
> +	  mv $@.tmp $@; \
> +	  cp -p $@ $@.old; \
>   	 fi
>
>   defconfig:
>