* [Qemu-devel] [PATCH v3] Makefile: Do not generate files if "configure" has not been run yet
@ 2017-06-08 12:59 Thomas Huth
2017-06-08 13:23 ` Paolo Bonzini
0 siblings, 1 reply; 2+ messages in thread
From: Thomas Huth @ 2017-06-08 12:59 UTC (permalink / raw)
To: qemu-devel
Cc: Fam Zheng, Paolo Bonzini, qemu-trivial, Peter Maydell, Eric Blake
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 <thuth@redhat.com>
---
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) \
--
1.8.3.1
^ permalink raw reply related [flat|nested] 2+ messages in thread
* Re: [Qemu-devel] [PATCH v3] Makefile: Do not generate files if "configure" has not been run yet
2017-06-08 12:59 [Qemu-devel] [PATCH v3] Makefile: Do not generate files if "configure" has not been run yet Thomas Huth
@ 2017-06-08 13:23 ` Paolo Bonzini
0 siblings, 0 replies; 2+ messages in thread
From: Paolo Bonzini @ 2017-06-08 13:23 UTC (permalink / raw)
To: Thomas Huth, qemu-devel
Cc: Fam Zheng, qemu-trivial, Peter Maydell, Eric Blake
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 <thuth@redhat.com>
> ---
> 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
^ permalink raw reply [flat|nested] 2+ messages in thread
end of thread, other threads:[~2017-06-08 13:23 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2017-06-08 12:59 [Qemu-devel] [PATCH v3] Makefile: Do not generate files if "configure" has not been run yet Thomas Huth
2017-06-08 13:23 ` Paolo Bonzini
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).