* [Qemu-devel] [PATCH] allow make {dist,}clean work w/out configure
@ 2012-09-16 0:30 Mike Frysinger
2012-09-16 9:52 ` [Qemu-devel] [PATCH] allow make {dist, }clean " Paolo Bonzini
0 siblings, 1 reply; 7+ messages in thread
From: Mike Frysinger @ 2012-09-16 0:30 UTC (permalink / raw)
To: qemu-devel
There's no reason to require configure to run before running a clean
target, so check MAKECMDGOALS before.
Signed-off-by: Mike Frysinger <vapier@gentoo.org>
---
Makefile | 4 ++++
1 file changed, 4 insertions(+)
diff --git a/Makefile b/Makefile
index 1cd5bc8..e75740c 100644
--- a/Makefile
+++ b/Makefile
@@ -14,9 +14,11 @@ config-host.mak: $(SRC_PATH)/configure
@sed -n "/.*Configured with/s/[^:]*: //p" $@ | sh
else
config-host.mak:
+ifeq ($(findstring clean,$(MAKECMDGOALS)),)
@echo "Please call configure before running make!"
@exit 1
endif
+endif
GENERATED_HEADERS = config-host.h trace.h qemu-options.def
ifeq ($(TRACE_BACKEND),dtrace)
@@ -398,7 +400,9 @@ qemu-doc.dvi qemu-doc.html qemu-doc.info qemu-doc.pdf: \
# Add a dependency on the generated files, so that they are always
# rebuilt before other object files
+ifeq ($(findstring clean,$(MAKECMDGOALS)),)
Makefile: $(GENERATED_HEADERS)
+endif
# Include automatically generated dependency files
# Dependencies in Makefile.objs files come from our recursive subdir rules
--
1.7.9.7
^ permalink raw reply related [flat|nested] 7+ messages in thread* Re: [Qemu-devel] [PATCH] allow make {dist, }clean work w/out configure
2012-09-16 0:30 [Qemu-devel] [PATCH] allow make {dist,}clean work w/out configure Mike Frysinger
@ 2012-09-16 9:52 ` Paolo Bonzini
2012-09-16 20:03 ` Mike Frysinger
2012-09-16 20:07 ` [Qemu-devel] [PATCH v2] " Mike Frysinger
0 siblings, 2 replies; 7+ messages in thread
From: Paolo Bonzini @ 2012-09-16 9:52 UTC (permalink / raw)
To: Mike Frysinger; +Cc: qemu-devel
Il 16/09/2012 02:30, Mike Frysinger ha scritto:
> There's no reason to require configure to run before running a clean
> target, so check MAKECMDGOALS before.
>
> Signed-off-by: Mike Frysinger <vapier@gentoo.org>
> ---
> Makefile | 4 ++++
> 1 file changed, 4 insertions(+)
>
> diff --git a/Makefile b/Makefile
> index 1cd5bc8..e75740c 100644
> --- a/Makefile
> +++ b/Makefile
> @@ -14,9 +14,11 @@ config-host.mak: $(SRC_PATH)/configure
> @sed -n "/.*Configured with/s/[^:]*: //p" $@ | sh
> else
> config-host.mak:
> +ifeq ($(findstring clean,$(MAKECMDGOALS)),)
Please use instead:
ifneq ($(filter-out %clean,$(MAKECMDGOALS)),)
so that "make clean all" still gives error.
Paolo
> @echo "Please call configure before running make!"
> @exit 1
> endif
> +endif
>
> GENERATED_HEADERS = config-host.h trace.h qemu-options.def
> ifeq ($(TRACE_BACKEND),dtrace)
> @@ -398,7 +400,9 @@ qemu-doc.dvi qemu-doc.html qemu-doc.info qemu-doc.pdf: \
>
> # Add a dependency on the generated files, so that they are always
> # rebuilt before other object files
> +ifeq ($(findstring clean,$(MAKECMDGOALS)),)
> Makefile: $(GENERATED_HEADERS)
> +endif
>
> # Include automatically generated dependency files
> # Dependencies in Makefile.objs files come from our recursive subdir rules
>
^ permalink raw reply [flat|nested] 7+ messages in thread* Re: [Qemu-devel] [PATCH] allow make {dist, }clean work w/out configure
2012-09-16 9:52 ` [Qemu-devel] [PATCH] allow make {dist, }clean " Paolo Bonzini
@ 2012-09-16 20:03 ` Mike Frysinger
2012-09-17 7:55 ` Paolo Bonzini
2012-09-16 20:07 ` [Qemu-devel] [PATCH v2] " Mike Frysinger
1 sibling, 1 reply; 7+ messages in thread
From: Mike Frysinger @ 2012-09-16 20:03 UTC (permalink / raw)
To: Paolo Bonzini; +Cc: qemu-devel
[-- Attachment #1: Type: Text/Plain, Size: 747 bytes --]
On Sunday 16 September 2012 05:52:47 Paolo Bonzini wrote:
> Il 16/09/2012 02:30, Mike Frysinger ha scritto:
> > There's no reason to require configure to run before running a clean
> > target, so check MAKECMDGOALS before.
> >
> > --- a/Makefile
> > +++ b/Makefile
> > @@ -14,9 +14,11 @@ config-host.mak: $(SRC_PATH)/configure
> > @sed -n "/.*Configured with/s/[^:]*: //p" $@ | sh
> > else
> > config-host.mak:
> > +ifeq ($(findstring clean,$(MAKECMDGOALS)),)
>
> Please use instead:
>
> ifneq ($(filter-out %clean,$(MAKECMDGOALS)),)
>
> so that "make clean all" still gives error.
that breaks `make` though. or rather, `make` no longer errors out. need to
make it a little more complicated to handle this.
-mike
[-- Attachment #2: This is a digitally signed message part. --]
[-- Type: application/pgp-signature, Size: 836 bytes --]
^ permalink raw reply [flat|nested] 7+ messages in thread* Re: [Qemu-devel] [PATCH] allow make {dist, }clean work w/out configure
2012-09-16 20:03 ` Mike Frysinger
@ 2012-09-17 7:55 ` Paolo Bonzini
0 siblings, 0 replies; 7+ messages in thread
From: Paolo Bonzini @ 2012-09-17 7:55 UTC (permalink / raw)
To: Mike Frysinger; +Cc: qemu-devel
Il 16/09/2012 22:03, Mike Frysinger ha scritto:
>>> > > +ifeq ($(findstring clean,$(MAKECMDGOALS)),)
>> >
>> > Please use instead:
>> >
>> > ifneq ($(filter-out %clean,$(MAKECMDGOALS)),)
>> >
>> > so that "make clean all" still gives error.
> that breaks `make` though. or rather, `make` no longer errors out. need to
> make it a little more complicated to handle this.
Perhaps
MAKECMDGOALS ?= all
does it?
Paolo
^ permalink raw reply [flat|nested] 7+ messages in thread
* [Qemu-devel] [PATCH v2] allow make {dist, }clean work w/out configure
2012-09-16 9:52 ` [Qemu-devel] [PATCH] allow make {dist, }clean " Paolo Bonzini
2012-09-16 20:03 ` Mike Frysinger
@ 2012-09-16 20:07 ` Mike Frysinger
2012-09-17 8:46 ` Paolo Bonzini
2012-10-19 19:32 ` Aurelien Jarno
1 sibling, 2 replies; 7+ messages in thread
From: Mike Frysinger @ 2012-09-16 20:07 UTC (permalink / raw)
To: qemu-devel
There's no reason to require configure to run before running a clean
target, so check MAKECMDGOALS before.
Signed-off-by: Mike Frysinger <vapier@gentoo.org>
---
v2
- handle edge cases
Makefile | 4 ++++
1 file changed, 4 insertions(+)
diff --git a/Makefile b/Makefile
index 1cd5bc8..0a37369 100644
--- a/Makefile
+++ b/Makefile
@@ -14,9 +14,11 @@ config-host.mak: $(SRC_PATH)/configure
@sed -n "/.*Configured with/s/[^:]*: //p" $@ | sh
else
config-host.mak:
+ifneq ($(filter-out %clean,$(MAKECMDGOALS)),$(if $(MAKECMDGOALS),,fail))
@echo "Please call configure before running make!"
@exit 1
endif
+endif
GENERATED_HEADERS = config-host.h trace.h qemu-options.def
ifeq ($(TRACE_BACKEND),dtrace)
@@ -398,7 +400,9 @@ qemu-doc.dvi qemu-doc.html qemu-doc.info qemu-doc.pdf: \
# Add a dependency on the generated files, so that they are always
# rebuilt before other object files
+ifneq ($(filter-out %clean,$(MAKECMDGOALS)),$(if $(MAKECMDGOALS),,fail))
Makefile: $(GENERATED_HEADERS)
+endif
# Include automatically generated dependency files
# Dependencies in Makefile.objs files come from our recursive subdir rules
--
1.7.9.7
^ permalink raw reply related [flat|nested] 7+ messages in thread* Re: [Qemu-devel] [PATCH v2] allow make {dist, }clean work w/out configure
2012-09-16 20:07 ` [Qemu-devel] [PATCH v2] " Mike Frysinger
@ 2012-09-17 8:46 ` Paolo Bonzini
2012-10-19 19:32 ` Aurelien Jarno
1 sibling, 0 replies; 7+ messages in thread
From: Paolo Bonzini @ 2012-09-17 8:46 UTC (permalink / raw)
To: Mike Frysinger; +Cc: qemu-devel
Il 16/09/2012 22:07, Mike Frysinger ha scritto:
> There's no reason to require configure to run before running a clean
> target, so check MAKECMDGOALS before.
>
> Signed-off-by: Mike Frysinger <vapier@gentoo.org>
> ---
> v2
> - handle edge cases
>
> Makefile | 4 ++++
> 1 file changed, 4 insertions(+)
>
> diff --git a/Makefile b/Makefile
> index 1cd5bc8..0a37369 100644
> --- a/Makefile
> +++ b/Makefile
> @@ -14,9 +14,11 @@ config-host.mak: $(SRC_PATH)/configure
> @sed -n "/.*Configured with/s/[^:]*: //p" $@ | sh
> else
> config-host.mak:
> +ifneq ($(filter-out %clean,$(MAKECMDGOALS)),$(if $(MAKECMDGOALS),,fail))
> @echo "Please call configure before running make!"
> @exit 1
> endif
> +endif
>
> GENERATED_HEADERS = config-host.h trace.h qemu-options.def
> ifeq ($(TRACE_BACKEND),dtrace)
> @@ -398,7 +400,9 @@ qemu-doc.dvi qemu-doc.html qemu-doc.info qemu-doc.pdf: \
>
> # Add a dependency on the generated files, so that they are always
> # rebuilt before other object files
> +ifneq ($(filter-out %clean,$(MAKECMDGOALS)),$(if $(MAKECMDGOALS),,fail))
> Makefile: $(GENERATED_HEADERS)
> +endif
>
> # Include automatically generated dependency files
> # Dependencies in Makefile.objs files come from our recursive subdir rules
>
Looks good, thanks!
Paolo
^ permalink raw reply [flat|nested] 7+ messages in thread* Re: [Qemu-devel] [PATCH v2] allow make {dist, }clean work w/out configure
2012-09-16 20:07 ` [Qemu-devel] [PATCH v2] " Mike Frysinger
2012-09-17 8:46 ` Paolo Bonzini
@ 2012-10-19 19:32 ` Aurelien Jarno
1 sibling, 0 replies; 7+ messages in thread
From: Aurelien Jarno @ 2012-10-19 19:32 UTC (permalink / raw)
To: Mike Frysinger; +Cc: qemu-devel
On Sun, Sep 16, 2012 at 04:07:13PM -0400, Mike Frysinger wrote:
> There's no reason to require configure to run before running a clean
> target, so check MAKECMDGOALS before.
>
> Signed-off-by: Mike Frysinger <vapier@gentoo.org>
> ---
> v2
> - handle edge cases
>
> Makefile | 4 ++++
> 1 file changed, 4 insertions(+)
>
> diff --git a/Makefile b/Makefile
> index 1cd5bc8..0a37369 100644
> --- a/Makefile
> +++ b/Makefile
> @@ -14,9 +14,11 @@ config-host.mak: $(SRC_PATH)/configure
> @sed -n "/.*Configured with/s/[^:]*: //p" $@ | sh
> else
> config-host.mak:
> +ifneq ($(filter-out %clean,$(MAKECMDGOALS)),$(if $(MAKECMDGOALS),,fail))
> @echo "Please call configure before running make!"
> @exit 1
> endif
> +endif
>
> GENERATED_HEADERS = config-host.h trace.h qemu-options.def
> ifeq ($(TRACE_BACKEND),dtrace)
> @@ -398,7 +400,9 @@ qemu-doc.dvi qemu-doc.html qemu-doc.info qemu-doc.pdf: \
>
> # Add a dependency on the generated files, so that they are always
> # rebuilt before other object files
> +ifneq ($(filter-out %clean,$(MAKECMDGOALS)),$(if $(MAKECMDGOALS),,fail))
> Makefile: $(GENERATED_HEADERS)
> +endif
>
> # Include automatically generated dependency files
> # Dependencies in Makefile.objs files come from our recursive subdir rules
Thanks, applied.
--
Aurelien Jarno GPG: 1024D/F1BCDB73
aurelien@aurel32.net http://www.aurel32.net
^ permalink raw reply [flat|nested] 7+ messages in thread
end of thread, other threads:[~2012-10-19 19:32 UTC | newest]
Thread overview: 7+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2012-09-16 0:30 [Qemu-devel] [PATCH] allow make {dist,}clean work w/out configure Mike Frysinger
2012-09-16 9:52 ` [Qemu-devel] [PATCH] allow make {dist, }clean " Paolo Bonzini
2012-09-16 20:03 ` Mike Frysinger
2012-09-17 7:55 ` Paolo Bonzini
2012-09-16 20:07 ` [Qemu-devel] [PATCH v2] " Mike Frysinger
2012-09-17 8:46 ` Paolo Bonzini
2012-10-19 19:32 ` Aurelien Jarno
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).