Makefile: don't silence mak file test with V=1

V=1 should show what's going on, it's not nice
to silence things unconditionally.

Signed-off-by: Michael S. Tsirkin <mst@redhat.com>
Message-Id: <1424332114-13440-1-git-send-email-mst@redhat.com>
Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>

diff --git a/Makefile b/Makefile
index b0d8c07cec9e36a8aebb86d3607b43463369db39..d92d4cd573f253685f9aaa469dc88d160f968abc 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -109,8 +109,8 @@ endif
 -include $(SUBDIR_DEVICES_MAK_DEP)
 
 %/config-devices.mak: default-configs/%.mak
-       $(call quiet-command,$(SHELL) $(SRC_PATH)/scripts/make_device_config.sh $@ $<, "  GEN   $@")
-       @if test -f $@; then \
+       $(call quiet-command,$(SHELL) $(SRC_PATH)/scripts/make_device_config.sh $@.tmp $<, "  GEN   $@.tmp")
+       $(call quiet-command, if test -f $@; then \
          if cmp -s $@.old $@; then \
            mv $@.tmp $@; \
            cp -p $@ $@.old; \
@@ -126,7 +126,7 @@ endif
         else \
          mv $@.tmp $@; \
          cp -p $@ $@.old; \
-        fi
+        fi, "  GEN  $@");
 
 defconfig:
        rm -f config-all-devices.mak $(SUBDIR_DEVICES_MAK)

diff --git a/scripts/make_device_config.sh b/scripts/make_device_config.sh
index 7242707819458032839155ce77a439b4d0b54c73..7958086132d8dad6ded9a96cc11c39b9509dcba0 100644 (file)
--- a/scripts/make_device_config.sh
+++ b/scripts/make_device_config.sh
@@ -2,7 +2,7 @@
 # Construct a target device config file from a default, pulling in any
 # files from include directives.
 
-dest=$1.tmp
+dest=$1
 dep=`dirname $1`-`basename $1`.d
 src=$2
 src_dir=`dirname $src`