[v3] Makefile: Do not generate files if "configure" has not been run yet

[Qemu-devel] [PATCH v3] Makefile: Do not generate files if "configure" has not been run yet

Thomas Huth posted 1 patch 8 years, 4 months ago

Diff against v1 v2
Download mbox

Patches applied successfully (tree, apply log)
git fetch https://github.com/patchew-project/qemu tags/patchew/1496926799-13040-1-git-send-email-thuth@redhat.com

Test FreeBSD passed

Test checkpatch passed

Test docker passed

Test s390x passed

Makefile | 2 ++
1 file changed, 2 insertions(+)

Expand all Fold all

[Qemu-devel] [PATCH v3] Makefile: Do not generate files if "configure" has not been run yet

Posted by Thomas Huth 8 years, 4 months ago

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

Re: [Qemu-devel] [PATCH v3] Makefile: Do not generate files if "configure" has not been run yet

Posted by Paolo Bonzini 8 years, 4 months ago


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