[Qemu-devel] [PATCH] ui/Makefile.objs: delete unnecessary cocoa.o dependency

[Qemu-devel] [PATCH] ui/Makefile.objs: delete unnecessary cocoa.o dependency

[Peter Maydell]

Delete an unnecessary dependency for cocoa.o; we already have
a general rule that tells Make that we can build a .o file
from a .m source using an ObjC compiler, so this specific
rule is unnecessary. Further, it is using the dubious construct
"$(SRC_PATH)/$(obj)" to get at the source directory, which will
break when $(obj) is redefined as part of the preparation for
per-object library support.

Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
---
This needs to go in before Fam's patchset for modules
can be applied, either via a cocoa maintainer queue or via
-trivial or just as a first patch on the front of Fam's
patches if they would otherwise be being held up by this.

 ui/Makefile.objs | 2 --
 1 file changed, 2 deletions(-)

diff --git a/ui/Makefile.objs b/ui/Makefile.objs
index 6ddc0de..f33be47 100644
--- a/ui/Makefile.objs
+++ b/ui/Makefile.objs
@@ -17,6 +17,4 @@ common-obj-$(CONFIG_GTK) += gtk.o x_keymap.o
 
 $(obj)/sdl.o $(obj)/sdl_zoom.o: QEMU_CFLAGS += $(SDL_CFLAGS) 
 
-$(obj)/cocoa.o: $(SRC_PATH)/$(obj)/cocoa.m
-
 $(obj)/gtk.o: QEMU_CFLAGS += $(GTK_CFLAGS) $(VTE_CFLAGS)
-- 
1.7.11.4

Re: [Qemu-devel] [PATCH] ui/Makefile.objs: delete unnecessary cocoa.o dependency

[Fam Zheng]

On Wed, 09/11 17:49, Peter Maydell wrote:
> Delete an unnecessary dependency for cocoa.o; we already have
> a general rule that tells Make that we can build a .o file
> from a .m source using an ObjC compiler, so this specific
> rule is unnecessary. Further, it is using the dubious construct
> "$(SRC_PATH)/$(obj)" to get at the source directory, which will
> break when $(obj) is redefined as part of the preparation for
> per-object library support.
> 
> Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
> ---
> This needs to go in before Fam's patchset for modules
> can be applied, either via a cocoa maintainer queue or via
> -trivial or just as a first patch on the front of Fam's
> patches if they would otherwise be being held up by this.
> 

Sure, I'll apply to my tree and rebase if it's merged.

Thanks,

Fam

>  ui/Makefile.objs | 2 --
>  1 file changed, 2 deletions(-)
> 
> diff --git a/ui/Makefile.objs b/ui/Makefile.objs
> index 6ddc0de..f33be47 100644
> --- a/ui/Makefile.objs
> +++ b/ui/Makefile.objs
> @@ -17,6 +17,4 @@ common-obj-$(CONFIG_GTK) += gtk.o x_keymap.o
>  
>  $(obj)/sdl.o $(obj)/sdl_zoom.o: QEMU_CFLAGS += $(SDL_CFLAGS) 
>  
> -$(obj)/cocoa.o: $(SRC_PATH)/$(obj)/cocoa.m
> -
>  $(obj)/gtk.o: QEMU_CFLAGS += $(GTK_CFLAGS) $(VTE_CFLAGS)
> -- 
> 1.7.11.4
> 

Re: [Qemu-devel] [PATCH] ui/Makefile.objs: delete unnecessary cocoa.o dependency

[Andreas Färber]

Am 12.09.2013 03:23, schrieb Fam Zheng:
> On Wed, 09/11 17:49, Peter Maydell wrote:
>> Delete an unnecessary dependency for cocoa.o; we already have
>> a general rule that tells Make that we can build a .o file
>> from a .m source using an ObjC compiler, so this specific
>> rule is unnecessary. Further, it is using the dubious construct
>> "$(SRC_PATH)/$(obj)" to get at the source directory, which will
>> break when $(obj) is redefined as part of the preparation for
>> per-object library support.
>>
>> Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
>> ---
>> This needs to go in before Fam's patchset for modules
>> can be applied, either via a cocoa maintainer queue or via
>> -trivial or just as a first patch on the front of Fam's
>> patches if they would otherwise be being held up by this.
>>
> 
> Sure, I'll apply to my tree and rebase if it's merged.

If it works, fine with me:

Reviewed-by: Andreas Färber <andreas.faerber@web.de>

I don't think I have any other Cocoa patches queued - or did I miss a
more acceptable version of the command-key workaround?

Regards,
Andreas

> 
> Thanks,
> 
> Fam
> 
>>  ui/Makefile.objs | 2 --
>>  1 file changed, 2 deletions(-)
>>
>> diff --git a/ui/Makefile.objs b/ui/Makefile.objs
>> index 6ddc0de..f33be47 100644
>> --- a/ui/Makefile.objs
>> +++ b/ui/Makefile.objs
>> @@ -17,6 +17,4 @@ common-obj-$(CONFIG_GTK) += gtk.o x_keymap.o
>>  
>>  $(obj)/sdl.o $(obj)/sdl_zoom.o: QEMU_CFLAGS += $(SDL_CFLAGS) 
>>  
>> -$(obj)/cocoa.o: $(SRC_PATH)/$(obj)/cocoa.m
>> -
>>  $(obj)/gtk.o: QEMU_CFLAGS += $(GTK_CFLAGS) $(VTE_CFLAGS)
>> -- 
>> 1.7.11.4
>>

Re: [Qemu-devel] [PATCH] ui/Makefile.objs: delete unnecessary cocoa.o dependency

[Peter Maydell]

On 12 September 2013 15:14, Andreas Färber <andreas.faerber@web.de> wrote:
> I don't think I have any other Cocoa patches queued - or did I miss a
> more acceptable version of the command-key workaround?

http://lists.nongnu.org/archive/html/qemu-devel/2013-08/msg02300.html
is the latest on that front: it is no longer trying to
add new command line options, at least. It was on my
todo list to look at and test but I never got round
to it :-(

-- PMM