Patchwork cocoa: Revert dependency on VNC

login
register
mail settings
Submitter Andreas Färber
Date June 2, 2011, 6:59 p.m.
Message ID <1307041168-8380-1-git-send-email-andreas.faerber@web.de>
Download mbox | patch
Permalink /patch/98463/
State New
Headers show

Comments

Andreas Färber - June 2, 2011, 6:59 p.m.
In 821601ea5b02a68ada479731a4d3d07a9876632a (Make VNC support optional)
cocoa.o was moved from ui-obj-$(CONFIG_COCOA) to vnc-obj-$(CONFIG_COCOA),
adding a dependency on $(CONFIG_VNC). That must've been unintentional.

Cc: Jes Sorensen <Jes.Sorensen@redhat.com>
Cc: Anthony Liguori <aliguori@us.ibm.com>
Signed-off-by: Andreas Färber <andreas.faerber@web.de>
---
 Makefile.objs |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)
Andreas Färber - June 9, 2011, 6:31 p.m.
Am 02.06.2011 um 20:59 schrieb Andreas Färber:

> In 821601ea5b02a68ada479731a4d3d07a9876632a (Make VNC support  
> optional)
> cocoa.o was moved from ui-obj-$(CONFIG_COCOA) to vnc-obj-$ 
> (CONFIG_COCOA),
> adding a dependency on $(CONFIG_VNC). That must've been unintentional.
>
> Cc: Jes Sorensen <Jes.Sorensen@redhat.com>
> Cc: Anthony Liguori <aliguori@us.ibm.com>
> Signed-off-by: Andreas Färber <andreas.faerber@web.de>

Applied to the cocoa branch.

Andreas

> ---
> Makefile.objs |    2 +-
> 1 files changed, 1 insertions(+), 1 deletions(-)
>
> diff --git a/Makefile.objs b/Makefile.objs
> index 90838f6..2e6419f 100644
> --- a/Makefile.objs
> +++ b/Makefile.objs
> @@ -126,6 +126,7 @@ common-obj-y += $(addprefix audio/, $(audio-obj- 
> y))
>
> ui-obj-y += keymaps.o
> ui-obj-$(CONFIG_SDL) += sdl.o sdl_zoom.o x_keymap.o
> +ui-obj-$(CONFIG_COCOA) += cocoa.o
> ui-obj-$(CONFIG_CURSES) += curses.o
> vnc-obj-y += vnc.o d3des.o
> vnc-obj-y += vnc-enc-zlib.o vnc-enc-hextile.o
> @@ -133,7 +134,6 @@ vnc-obj-y += vnc-enc-tight.o vnc-palette.o
> vnc-obj-y += vnc-enc-zrle.o
> vnc-obj-$(CONFIG_VNC_TLS) += vnc-tls.o vnc-auth-vencrypt.o
> vnc-obj-$(CONFIG_VNC_SASL) += vnc-auth-sasl.o
> -vnc-obj-$(CONFIG_COCOA) += cocoa.o
> ifdef CONFIG_VNC_THREAD
> vnc-obj-y += vnc-jobs-async.o
> else
> -- 
> 1.7.5.3
>
>

Patch

diff --git a/Makefile.objs b/Makefile.objs
index 90838f6..2e6419f 100644
--- a/Makefile.objs
+++ b/Makefile.objs
@@ -126,6 +126,7 @@  common-obj-y += $(addprefix audio/, $(audio-obj-y))
 
 ui-obj-y += keymaps.o
 ui-obj-$(CONFIG_SDL) += sdl.o sdl_zoom.o x_keymap.o
+ui-obj-$(CONFIG_COCOA) += cocoa.o
 ui-obj-$(CONFIG_CURSES) += curses.o
 vnc-obj-y += vnc.o d3des.o
 vnc-obj-y += vnc-enc-zlib.o vnc-enc-hextile.o
@@ -133,7 +134,6 @@  vnc-obj-y += vnc-enc-tight.o vnc-palette.o
 vnc-obj-y += vnc-enc-zrle.o
 vnc-obj-$(CONFIG_VNC_TLS) += vnc-tls.o vnc-auth-vencrypt.o
 vnc-obj-$(CONFIG_VNC_SASL) += vnc-auth-sasl.o
-vnc-obj-$(CONFIG_COCOA) += cocoa.o
 ifdef CONFIG_VNC_THREAD
 vnc-obj-y += vnc-jobs-async.o
 else