Re: [Qemu-devel] [PATCH 1/2] Makefile: don't silence mak file test with V=1

[Fam Zheng <famz@redhat.com>]

On Fri, 02/27 19:40, Paolo Bonzini wrote:
> 
> 
> On 19/02/2015 08:48, Michael S. Tsirkin wrote:
> > 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>
> > ---
> >  Makefile | 4 ++--
> >  1 file changed, 2 insertions(+), 2 deletions(-)
> > 
> > diff --git a/Makefile b/Makefile
> > index 6817c6f..84ca8be 100644
> > --- a/Makefile
> > +++ b/Makefile
> > @@ -110,7 +110,7 @@ endif
> >  
> >  %/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, 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, "  TEST $@");
> >  
> >  defconfig:
> >  	rm -f config-all-devices.mak $(SUBDIR_DEVICES_MAK)
> > 
> 
> Squashing this to make the non-verbose messages clearer, ok?
> 
> diff --git a/Makefile b/Makefile
> index 5604209..d92d4cd 100644
> --- a/Makefile
> +++ b/Makefile
> @@ -109,7 +109,7 @@ endif
>  -include $(SUBDIR_DEVICES_MAK_DEP)
>  
>  %/config-devices.mak: default-configs/%.mak
> -	$(call quiet-command,$(SHELL) $(SRC_PATH)/scripts/make_device_config.sh $@ $<, "  GEN   $@")
> +	$(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 $@; \
> @@ -126,7 +126,7 @@ endif
>  	 else \
>  	  mv $@.tmp $@; \
>  	  cp -p $@ $@.old; \
> -	 fi, "  TEST $@");
> +	 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 7242707..7958086 100644
> --- 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`

Looks good to me.

Fam