From mboxrd@z Thu Jan  1 00:00:00 1970
Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43)
	id 1NMMwM-0006Ws-VB
	for qemu-devel@nongnu.org; Sun, 20 Dec 2009 09:39:23 -0500
Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43)
	id 1NMMwH-0006W4-MJ
	for qemu-devel@nongnu.org; Sun, 20 Dec 2009 09:39:21 -0500
Received: from [199.232.76.173] (port=59343 helo=monty-python.gnu.org)
	by lists.gnu.org with esmtp (Exim 4.43) id 1NMMwH-0006W1-G5
	for qemu-devel@nongnu.org; Sun, 20 Dec 2009 09:39:17 -0500
Received: from moutng.kundenserver.de ([212.227.126.187]:55614)
	by monty-python.gnu.org with esmtp (Exim 4.60)
	(envelope-from <stefan@weilnetz.de>) id 1NMMwG-000435-VN
	for qemu-devel@nongnu.org; Sun, 20 Dec 2009 09:39:17 -0500
From: Stefan Weil <weil@mail.berlios.de>
Date: Sun, 20 Dec 2009 15:39:03 +0100
Message-Id: <1261319943-9224-1-git-send-email-weil@mail.berlios.de>
In-Reply-To: <m3r5rl376u.fsf@neno.neno>
References: <m3r5rl376u.fsf@neno.neno>
Subject: [Qemu-devel] [PATCH] Makefile: Update unmodified config-devices.mak
	automatically
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: quintela@trasno.org, QEMU Developers <qemu-devel@nongnu.org>

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>
---
 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:
-- 
1.6.5