From patchwork Thu Jun 2 18:59:28 2011 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Subject: cocoa: Revert dependency on VNC Date: Thu, 02 Jun 2011 08:59:28 -0000 From: =?utf-8?q?Andreas_F=C3=A4rber?= X-Patchwork-Id: 98463 Message-Id: <1307041168-8380-1-git-send-email-andreas.faerber@web.de> To: qemu-devel@nongnu.org Cc: Jes Sorensen , =?UTF-8?q?Andreas=20F=C3=A4rber?= , Anthony Liguori 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 Cc: Anthony Liguori Signed-off-by: Andreas Färber --- 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