Patchwork Makefile: add fsdev/*.{o,d} to clean

login
register
mail settings
Submitter Hidetoshi Seto
Date July 1, 2010, 3:32 a.m.
Message ID <4C2C0C5D.8030905@jp.fujitsu.com>
Download mbox | patch
Permalink /patch/57466/
State New
Headers show

Comments

Hidetoshi Seto - July 1, 2010, 3:32 a.m.
There were fsdev/qemu-fsdev.{o,d} not removed at "make clean".

Signed-off-by: Hidetoshi Seto <seto.hidetoshi@jp.fujitsu.com>
---
 Makefile |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)
Blue Swirl - July 1, 2010, 7:48 p.m.
2010/7/1 Hidetoshi Seto <seto.hidetoshi@jp.fujitsu.com>:
> There were fsdev/qemu-fsdev.{o,d} not removed at "make clean".
>
> Signed-off-by: Hidetoshi Seto <seto.hidetoshi@jp.fujitsu.com>
> ---
>  Makefile |    2 +-
>  1 files changed, 1 insertions(+), 1 deletions(-)
>
> diff --git a/Makefile b/Makefile
> index 560eac6..ce5f0e6 100644
> --- a/Makefile
> +++ b/Makefile
> @@ -159,7 +159,7 @@ clean:
>  # avoid old build problems by removing potentially incorrect old files
>        rm -f config.mak op-i386.h opc-i386.h gen-op-i386.h op-arm.h opc-arm.h gen-op-arm.h
>        rm -f *.o *.d *.a $(TOOLS) TAGS cscope.* *.pod *~ */*~
> -       rm -f slirp/*.o slirp/*.d audio/*.o audio/*.d block/*.o block/*.d net/*.o net/*.d
> +       rm -f {slirp,audio,block,net,fsdev}/*.{o,d}

Not every shell out there support {}:
dash -c 'echo {a,b}*.c'
{a,b}*.c

bash -c 'echo {a,b}*.c'
acl.c aes.c aio.c alpha-dis.c arch_init.c arm-dis.c arm-semi.c async.c
balloon.c block-migration.c block.c blockdev.c bt-host.c bt-vhci.c
buffered_file.c
Hidetoshi Seto - July 2, 2010, 6:27 a.m.
(2010/07/02 4:48), Blue Swirl wrote:
> 2010/7/1 Hidetoshi Seto <seto.hidetoshi@jp.fujitsu.com>:
>> There were fsdev/qemu-fsdev.{o,d} not removed at "make clean".
>>
>> Signed-off-by: Hidetoshi Seto <seto.hidetoshi@jp.fujitsu.com>
>> ---
>>  Makefile |    2 +-
>>  1 files changed, 1 insertions(+), 1 deletions(-)
>>
>> diff --git a/Makefile b/Makefile
>> index 560eac6..ce5f0e6 100644
>> --- a/Makefile
>> +++ b/Makefile
>> @@ -159,7 +159,7 @@ clean:
>>  # avoid old build problems by removing potentially incorrect old files
>>        rm -f config.mak op-i386.h opc-i386.h gen-op-i386.h op-arm.h opc-arm.h gen-op-arm.h
>>        rm -f *.o *.d *.a $(TOOLS) TAGS cscope.* *.pod *~ */*~
>> -       rm -f slirp/*.o slirp/*.d audio/*.o audio/*.d block/*.o block/*.d net/*.o net/*.d
>> +       rm -f {slirp,audio,block,net,fsdev}/*.{o,d}
> 
> Not every shell out there support {}:
> dash -c 'echo {a,b}*.c'
> {a,b}*.c
> 
> bash -c 'echo {a,b}*.c'
> acl.c aes.c aio.c alpha-dis.c arch_init.c arm-dis.c arm-semi.c async.c
> balloon.c block-migration.c block.c blockdev.c bt-host.c bt-vhci.c
> buffered_file.c

You are right, but I found that Makefile already has:

  169 distclean: clean
(snip)
  174         rm -f qemu-{doc,tech}.{info,aux,cp,dvi,fn,info,ky,log,pdf,pg,toc,tp,vr}

So then is it better to rewrite this line not to use {} ...?


Thanks,
S.Seto
Blue Swirl - July 3, 2010, 7:16 a.m.
On Fri, Jul 2, 2010 at 6:27 AM, Hidetoshi Seto
<seto.hidetoshi@jp.fujitsu.com> wrote:
> (2010/07/02 4:48), Blue Swirl wrote:
>> 2010/7/1 Hidetoshi Seto <seto.hidetoshi@jp.fujitsu.com>:
>>> There were fsdev/qemu-fsdev.{o,d} not removed at "make clean".
>>>
>>> Signed-off-by: Hidetoshi Seto <seto.hidetoshi@jp.fujitsu.com>
>>> ---
>>>  Makefile |    2 +-
>>>  1 files changed, 1 insertions(+), 1 deletions(-)
>>>
>>> diff --git a/Makefile b/Makefile
>>> index 560eac6..ce5f0e6 100644
>>> --- a/Makefile
>>> +++ b/Makefile
>>> @@ -159,7 +159,7 @@ clean:
>>>  # avoid old build problems by removing potentially incorrect old files
>>>        rm -f config.mak op-i386.h opc-i386.h gen-op-i386.h op-arm.h opc-arm.h gen-op-arm.h
>>>        rm -f *.o *.d *.a $(TOOLS) TAGS cscope.* *.pod *~ */*~
>>> -       rm -f slirp/*.o slirp/*.d audio/*.o audio/*.d block/*.o block/*.d net/*.o net/*.d
>>> +       rm -f {slirp,audio,block,net,fsdev}/*.{o,d}
>>
>> Not every shell out there support {}:
>> dash -c 'echo {a,b}*.c'
>> {a,b}*.c
>>
>> bash -c 'echo {a,b}*.c'
>> acl.c aes.c aio.c alpha-dis.c arch_init.c arm-dis.c arm-semi.c async.c
>> balloon.c block-migration.c block.c blockdev.c bt-host.c bt-vhci.c
>> buffered_file.c
>
> You are right, but I found that Makefile already has:
>
>  169 distclean: clean
> (snip)
>  174         rm -f qemu-{doc,tech}.{info,aux,cp,dvi,fn,info,ky,log,pdf,pg,toc,tp,vr}
>
> So then is it better to rewrite this line not to use {} ...?

Yes, a patch for that would be nice.

Patch

diff --git a/Makefile b/Makefile
index 560eac6..ce5f0e6 100644
--- a/Makefile
+++ b/Makefile
@@ -159,7 +159,7 @@  clean:
 # avoid old build problems by removing potentially incorrect old files
 	rm -f config.mak op-i386.h opc-i386.h gen-op-i386.h op-arm.h opc-arm.h gen-op-arm.h
 	rm -f *.o *.d *.a $(TOOLS) TAGS cscope.* *.pod *~ */*~
-	rm -f slirp/*.o slirp/*.d audio/*.o audio/*.d block/*.o block/*.d net/*.o net/*.d
+	rm -f {slirp,audio,block,net,fsdev}/*.{o,d}
 	rm -f qemu-img-cmds.h
 	$(MAKE) -C tests clean
 	for d in $(ALL_SUBDIRS) libhw32 libhw64 libuser libdis libdis-user; do \