Patchwork Makefile: Remove generated hw/usb files in 'clean' target

login
register
mail settings
Submitter Stefan Weil
Date July 29, 2012, 1:48 p.m.
Message ID <1343569729-11218-1-git-send-email-sw@weilnetz.de>
Download mbox | patch
Permalink /patch/173924/
State Superseded
Headers show

Comments

Stefan Weil - July 29, 2012, 1:48 p.m.
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(-)
Stefan Hajnoczi - July 30, 2012, 4:42 p.m.
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
Peter Maydell - July 30, 2012, 4:46 p.m.
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
Stefan Hajnoczi - July 31, 2012, 10:33 a.m.
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

Patch

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