[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
Re: [Qemu-devel] [PATCH for-4.1] Makefile: Fix "make install" when "make
From: |
Mark Cave-Ayland |
Subject: |
Re: [Qemu-devel] [PATCH for-4.1] Makefile: Fix "make install" when "make all" needs work |
Date: |
Fri, 12 Jul 2019 20:43:53 +0100 |
User-agent: |
Mozilla/5.0 (X11; Linux x86_64; rv:60.0) Gecko/20100101 Thunderbird/60.7.2 |
On 12/07/2019 06:59, Markus Armbruster wrote:
> Until recently, target install used to recurse into target directories
> in its recipe: it ran make install in a for-loop. Since target
> install depends on target all, this trivially ensured we run the
> sub-make install only after completing target all.
>
> Commit 1338a4b "Makefile: Reuse all's recursion machinery for clean
> and install" moved the target recursion to dependencies. That's good
> (the commit message explains why), but I forgot to add dependencies to
> ensure make runs the sub-make install only after completing target
> all. Do that now.
>
> Fixes: 1338a4b72659ce08eacb9de0205fe16202a22d9c
> Reported-by: Mark Cave-Ayland <address@hidden>
> Reported-by: Guenter Roeck <address@hidden>
> Tested-by: Guenter Roeck <address@hidden>
> Signed-off-by: Markus Armbruster <address@hidden>
> ---
> Makefile | 1 +
> 1 file changed, 1 insertion(+)
>
> diff --git a/Makefile b/Makefile
> index 1fcbaed62c..09b77e8a7b 100644
> --- a/Makefile
> +++ b/Makefile
> @@ -522,6 +522,7 @@ $(ROM_DIRS_RULES):
> recurse-all: $(addsuffix /all, $(TARGET_DIRS) $(ROM_DIRS))
> recurse-clean: $(addsuffix /clean, $(TARGET_DIRS) $(ROM_DIRS))
> recurse-install: $(addsuffix /install, $(TARGET_DIRS))
> +$(addsuffix /install, $(TARGET_DIRS)): all
>
> $(BUILD_DIR)/version.o: $(SRC_PATH)/version.rc config-host.h
> $(call quiet-command,$(WINDRES) -I$(BUILD_DIR) -o $@
> $<,"RC","version.o")
>
I've just tried this on my faster workstation and it now works fine with all of
-j2,
-j4 and -j8.
Tested-by: Mark Cave-Ayland <address@hidden>
ATB,
Mark.