Re: [Qemu-devel] [RFC v4 1/7] Makefile: Remove code to smooth transition to config.status

[Philippe Mathieu-Daudé]

Hi Markus,

On 5/23/19 10:15 AM, Markus Armbruster wrote:
> When commit bdf523e6923 made configure generate config.status, it
> added a fallback to Makefile to smooth the transition, with a TODO
> "code can be removed after QEMU 1.7."  It's been more than five years.
> Remove it.
> 
> Signed-off-by: Markus Armbruster <address@hidden>
> ---
>  Makefile | 9 +--------
>  1 file changed, 1 insertion(+), 8 deletions(-)
> 
> diff --git a/Makefile b/Makefile
> index 155f066a20..8ec833a5fb 100644
> --- a/Makefile
> +++ b/Makefile
> @@ -69,14 +69,7 @@ CONFIG_ALL=y
>  
>  config-host.mak: $(SRC_PATH)/configure $(SRC_PATH)/pc-bios 
> $(SRC_PATH)/VERSION
>       @echo $@ is out-of-date, running configure
> -     @# TODO: The next lines include code which supports a smooth
> -     @# transition from old configurations without config.status.
> -     @# This code can be removed after QEMU 1.7.
> -     @if test -x config.status; then \
> -         ./config.status; \
> -        else \
> -         sed -n "/.*Configured with/s/[^:]*: //p" $@ | sh; \
> -     fi
> +     ./config.status

We could prepend a '@' since we already describe what this rule does
("config-host.mak is out-of-date, running configure").

Reviewed-by: Philippe Mathieu-Daudé <address@hidden>
Tested-by: Philippe Mathieu-Daudé <address@hidden>

>  else
>  config-host.mak:
>  ifneq ($(filter-out $(UNCHECKED_GOALS),$(MAKECMDGOALS)),$(if 
> $(MAKECMDGOALS),,fail))
>