| Message ID | 1496926799-13040-1-git-send-email-thuth@redhat.com |
|---|---|
| State | New |
| Headers | show |
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
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) \
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(+)