Re: [Qemu-devel] [PATCH 3/4] Makefile: Rename targets for make recursion

[Philippe Mathieu-Daudé]

On 7/3/19 1:24 PM, Markus Armbruster wrote:
> Peter pointed out that this makes an incremental build without -k fail
> once.  By "once", I mean it works fine when you retry.  Squashing in the
> appended patch to avoid this inconvenience.
> 
> 
> diff --git a/Makefile b/Makefile
> index e68982bd99..34bbcfc590 100644
> --- a/Makefile
> +++ b/Makefile
> @@ -500,6 +500,12 @@ capstone/all: .git-submodule-status
>  slirp/all: .git-submodule-status
>       $(call quiet-command,$(MAKE) -C $(SRC_PATH)/slirp 
> BUILD_DIR="$(BUILD_DIR)/slirp" CC="$(CC)" AR="$(AR)" LD="$(LD)" 
> RANLIB="$(RANLIB)" CFLAGS="$(QEMU_CFLAGS) $(CFLAGS)" LDFLAGS="$(LDFLAGS)")
>  
> +# Compatibility gunk to keep make working across the rename of targets
> +# for recursion, to be removed some time after 4.1.
> +subdir-dtc: dtc/all
> +subdir-capstone: capstone/all
> +subdir-slirp: slirp/all
> +
>  $(SUBDIR_RULES): libqemuutil.a $(common-obj-y) \
>       $(qom-obj-y) $(crypto-user-obj-$(CONFIG_USER_ONLY))
>  

Both tags stand:
Reviewed-by: Philippe Mathieu-Daudé <address@hidden>
Tested-by: Philippe Mathieu-Daudé <address@hidden>
(on top of previous patch)