* [Qemu-trivial] [PATCH] Makefile: Remove generated hw/usb files in 'clean' target
@ 2012-07-29 13:48 Stefan Weil
2012-07-30 16:42 ` [Qemu-trivial] [Qemu-devel] " Stefan Hajnoczi
0 siblings, 1 reply; 4+ messages in thread
From: Stefan Weil @ 2012-07-29 13:48 UTC (permalink / raw)
To: qemu-trivial; +Cc: Stefan Weil, qemu-devel
Commit f1ae32a1ecda8aaff7a355c9030c0d8c363f3a70 moved the
usb directory to hw, so the files which should be removed
are now hw/usb/*.{d,o}.
The new code removes these files and also any other generated
*.o and *.d files in directories below hw.
Signed-off-by: Stefan Weil <sw@weilnetz.de>
---
Makefile | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/Makefile b/Makefile
index e4c754d..30f9e91 100644
--- a/Makefile
+++ b/Makefile
@@ -215,7 +215,7 @@ clean:
rm -Rf .libs
rm -f slirp/*.o slirp/*.d audio/*.o audio/*.d block/*.o block/*.d net/*.o net/*.d fsdev/*.o fsdev/*.d ui/*.o ui/*.d qapi/*.o qapi/*.d qga/*.o qga/*.d
rm -f qom/*.o qom/*.d
- rm -f usb/*.o usb/*.d hw/*.o hw/*.d
+ rm -f hw/*/*.o hw/*/*.d hw/*.o hw/*.d
rm -f qemu-img-cmds.h
rm -f trace/*.o trace/*.d
rm -f trace-dtrace.dtrace trace-dtrace.dtrace-timestamp
--
1.7.10
^ permalink raw reply related [flat|nested] 4+ messages in thread
* Re: [Qemu-trivial] [Qemu-devel] [PATCH] Makefile: Remove generated hw/usb files in 'clean' target
2012-07-29 13:48 [Qemu-trivial] [PATCH] Makefile: Remove generated hw/usb files in 'clean' target Stefan Weil
@ 2012-07-30 16:42 ` Stefan Hajnoczi
2012-07-30 16:46 ` Peter Maydell
0 siblings, 1 reply; 4+ messages in thread
From: Stefan Hajnoczi @ 2012-07-30 16:42 UTC (permalink / raw)
To: Stefan Weil; +Cc: qemu-trivial, qemu-devel
On Sun, Jul 29, 2012 at 03:48:49PM +0200, Stefan Weil wrote:
> Commit f1ae32a1ecda8aaff7a355c9030c0d8c363f3a70 moved the
> usb directory to hw, so the files which should be removed
> are now hw/usb/*.{d,o}.
>
> The new code removes these files and also any other generated
> *.o and *.d files in directories below hw.
>
> Signed-off-by: Stefan Weil <sw@weilnetz.de>
> ---
> Makefile | 2 +-
> 1 file changed, 1 insertion(+), 1 deletion(-)
>
> diff --git a/Makefile b/Makefile
> index e4c754d..30f9e91 100644
> --- a/Makefile
> +++ b/Makefile
> @@ -215,7 +215,7 @@ clean:
> rm -Rf .libs
> rm -f slirp/*.o slirp/*.d audio/*.o audio/*.d block/*.o block/*.d net/*.o net/*.d fsdev/*.o fsdev/*.d ui/*.o ui/*.d qapi/*.o qapi/*.d qga/*.o qga/*.d
> rm -f qom/*.o qom/*.d
> - rm -f usb/*.o usb/*.d hw/*.o hw/*.d
> + rm -f hw/*/*.o hw/*/*.d hw/*.o hw/*.d
> rm -f qemu-img-cmds.h
> rm -f trace/*.o trace/*.d
> rm -f trace-dtrace.dtrace trace-dtrace.dtrace-timestamp
> --
> 1.7.10
Thanks. Jan Kiszka already submitted an equivalent patch which I have
merged. He used hw/usb/*.o hw/usb/*.d instead of hw/*/....
Stefan
^ permalink raw reply [flat|nested] 4+ messages in thread
* Re: [Qemu-trivial] [Qemu-devel] [PATCH] Makefile: Remove generated hw/usb files in 'clean' target
2012-07-30 16:42 ` [Qemu-trivial] [Qemu-devel] " Stefan Hajnoczi
@ 2012-07-30 16:46 ` Peter Maydell
2012-07-31 10:33 ` Stefan Hajnoczi
0 siblings, 1 reply; 4+ messages in thread
From: Peter Maydell @ 2012-07-30 16:46 UTC (permalink / raw)
To: Stefan Hajnoczi; +Cc: qemu-trivial, Stefan Weil, qemu-devel
On 30 July 2012 17:42, Stefan Hajnoczi <stefanha@gmail.com> wrote:
> On Sun, Jul 29, 2012 at 03:48:49PM +0200, Stefan Weil wrote:
>> Commit f1ae32a1ecda8aaff7a355c9030c0d8c363f3a70 moved the
>> usb directory to hw, so the files which should be removed
>> are now hw/usb/*.{d,o}.
>>
>> The new code removes these files and also any other generated
>> *.o and *.d files in directories below hw.
>>
>> Signed-off-by: Stefan Weil <sw@weilnetz.de>
>> ---
>> Makefile | 2 +-
>> 1 file changed, 1 insertion(+), 1 deletion(-)
>>
>> diff --git a/Makefile b/Makefile
>> index e4c754d..30f9e91 100644
>> --- a/Makefile
>> +++ b/Makefile
>> @@ -215,7 +215,7 @@ clean:
>> rm -Rf .libs
>> rm -f slirp/*.o slirp/*.d audio/*.o audio/*.d block/*.o block/*.d net/*.o net/*.d fsdev/*.o fsdev/*.d ui/*.o ui/*.d qapi/*.o qapi/*.d qga/*.o qga/*.d
>> rm -f qom/*.o qom/*.d
>> - rm -f usb/*.o usb/*.d hw/*.o hw/*.d
>> + rm -f hw/*/*.o hw/*/*.d hw/*.o hw/*.d
>> rm -f qemu-img-cmds.h
>> rm -f trace/*.o trace/*.d
>> rm -f trace-dtrace.dtrace trace-dtrace.dtrace-timestamp
>> --
>> 1.7.10
>
> Thanks. Jan Kiszka already submitted an equivalent patch which I have
> merged. He used hw/usb/*.o hw/usb/*.d instead of hw/*/....
We should probably just use
rm -f $(shell find . -name '*.[od]')
for consistency with Makefile.target and future proofing anyway...
-- PMM
^ permalink raw reply [flat|nested] 4+ messages in thread
* Re: [Qemu-trivial] [Qemu-devel] [PATCH] Makefile: Remove generated hw/usb files in 'clean' target
2012-07-30 16:46 ` Peter Maydell
@ 2012-07-31 10:33 ` Stefan Hajnoczi
0 siblings, 0 replies; 4+ messages in thread
From: Stefan Hajnoczi @ 2012-07-31 10:33 UTC (permalink / raw)
To: Peter Maydell; +Cc: qemu-trivial, Stefan Weil, qemu-devel
On Mon, Jul 30, 2012 at 5:46 PM, Peter Maydell <peter.maydell@linaro.org> wrote:
> On 30 July 2012 17:42, Stefan Hajnoczi <stefanha@gmail.com> wrote:
>> On Sun, Jul 29, 2012 at 03:48:49PM +0200, Stefan Weil wrote:
>>> Commit f1ae32a1ecda8aaff7a355c9030c0d8c363f3a70 moved the
>>> usb directory to hw, so the files which should be removed
>>> are now hw/usb/*.{d,o}.
>>>
>>> The new code removes these files and also any other generated
>>> *.o and *.d files in directories below hw.
>>>
>>> Signed-off-by: Stefan Weil <sw@weilnetz.de>
>>> ---
>>> Makefile | 2 +-
>>> 1 file changed, 1 insertion(+), 1 deletion(-)
>>>
>>> diff --git a/Makefile b/Makefile
>>> index e4c754d..30f9e91 100644
>>> --- a/Makefile
>>> +++ b/Makefile
>>> @@ -215,7 +215,7 @@ clean:
>>> rm -Rf .libs
>>> rm -f slirp/*.o slirp/*.d audio/*.o audio/*.d block/*.o block/*.d net/*.o net/*.d fsdev/*.o fsdev/*.d ui/*.o ui/*.d qapi/*.o qapi/*.d qga/*.o qga/*.d
>>> rm -f qom/*.o qom/*.d
>>> - rm -f usb/*.o usb/*.d hw/*.o hw/*.d
>>> + rm -f hw/*/*.o hw/*/*.d hw/*.o hw/*.d
>>> rm -f qemu-img-cmds.h
>>> rm -f trace/*.o trace/*.d
>>> rm -f trace-dtrace.dtrace trace-dtrace.dtrace-timestamp
>>> --
>>> 1.7.10
>>
>> Thanks. Jan Kiszka already submitted an equivalent patch which I have
>> merged. He used hw/usb/*.o hw/usb/*.d instead of hw/*/....
>
> We should probably just use
> rm -f $(shell find . -name '*.[od]')
>
> for consistency with Makefile.target and future proofing anyway...
Cool, want to submit a patch? :)
Stefan
^ permalink raw reply [flat|nested] 4+ messages in thread
end of thread, other threads:[~2012-07-31 10:33 UTC | newest]
Thread overview: 4+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2012-07-29 13:48 [Qemu-trivial] [PATCH] Makefile: Remove generated hw/usb files in 'clean' target Stefan Weil
2012-07-30 16:42 ` [Qemu-trivial] [Qemu-devel] " Stefan Hajnoczi
2012-07-30 16:46 ` Peter Maydell
2012-07-31 10:33 ` Stefan Hajnoczi
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).