[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
Re: [Qemu-trivial] [PATCH v3] Makefile: Do not generate files if "config
From: |
Paolo Bonzini |
Subject: |
Re: [Qemu-trivial] [PATCH v3] Makefile: Do not generate files if "configure" has not been run yet |
Date: |
Thu, 8 Jun 2017 15:23:32 +0200 |
User-agent: |
Mozilla/5.0 (X11; Linux x86_64; rv:52.0) Gecko/20100101 Thunderbird/52.1.0 |
On 08/06/2017 14:59, Thomas Huth wrote:
> When doing a "make -j10" in the vanilla QEMU source tree (without
> running "configure" first), the Makefile currently generates two
> files already, qemu-version.h and qemu-options.def. This should not
> happen, so let's only build the generated files if config-host.mak
> is available (i.e. "configure" has been run already).
>
> Signed-off-by: Thomas Huth <address@hidden>
> ---
> v3:
> - Check for config-host.mak at the place where we add the dependencies
> for $(GENERATED_FILES) instead of adding single dependencies all over
> the place
>
> Makefile | 2 ++
> 1 file changed, 2 insertions(+)
>
> diff --git a/Makefile b/Makefile
> index c830d7a..32d4441 100644
> --- a/Makefile
> +++ b/Makefile
> @@ -791,9 +791,11 @@ endif # CONFIG_WIN
>
> # Add a dependency on the generated files, so that they are always
> # rebuilt before other object files
> +ifneq ($(wildcard config-host.mak),)
> ifneq ($(filter-out $(UNCHECKED_GOALS),$(MAKECMDGOALS)),$(if
> $(MAKECMDGOALS),,fail))
> Makefile: $(GENERATED_FILES)
> endif
> +endif
>
> .SECONDARY: $(TRACE_HEADERS) $(TRACE_HEADERS:%=%-timestamp) \
> $(TRACE_SOURCES) $(TRACE_SOURCES:%=%-timestamp) \
>
Thanks, queued.
Paolo