From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([140.186.70.92]:40978) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1QWIKg-00087I-N1 for qemu-devel@nongnu.org; Mon, 13 Jun 2011 21:22:20 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1QWIKa-0003g7-Na for qemu-devel@nongnu.org; Mon, 13 Jun 2011 21:22:18 -0400 Received: from fmmailgate03.web.de ([217.72.192.234]:59350) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1QWIKa-0003fn-HW for qemu-devel@nongnu.org; Mon, 13 Jun 2011 21:22:12 -0400 From: =?UTF-8?q?Andreas=20F=C3=A4rber?= Date: Tue, 14 Jun 2011 03:22:05 +0200 Message-Id: <1308014527-60251-9-git-send-email-andreas.faerber@web.de> In-Reply-To: <1308014527-60251-8-git-send-email-andreas.faerber@web.de> References: <1308014527-60251-1-git-send-email-andreas.faerber@web.de> <1308014527-60251-2-git-send-email-andreas.faerber@web.de> <1308014527-60251-3-git-send-email-andreas.faerber@web.de> <1308014527-60251-4-git-send-email-andreas.faerber@web.de> <1308014527-60251-5-git-send-email-andreas.faerber@web.de> <1308014527-60251-6-git-send-email-andreas.faerber@web.de> <1308014527-60251-7-git-send-email-andreas.faerber@web.de> <1308014527-60251-8-git-send-email-andreas.faerber@web.de> MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Sender: andreas.faerber@web.de Content-Transfer-Encoding: quoted-printable Subject: [Qemu-devel] [PATCH 08/10] cocoa: Revert dependency on VNC List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , 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=C3=A4rber --- Makefile.objs | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/Makefile.objs b/Makefile.objs index 52d8b23..509ab39 100644 --- a/Makefile.objs +++ b/Makefile.objs @@ -128,6 +128,7 @@ common-obj-y +=3D $(addprefix audio/, $(audio-obj-y)) =20 ui-obj-y +=3D keymaps.o ui-obj-$(CONFIG_SDL) +=3D sdl.o sdl_zoom.o x_keymap.o +ui-obj-$(CONFIG_COCOA) +=3D cocoa.o ui-obj-$(CONFIG_CURSES) +=3D curses.o vnc-obj-y +=3D vnc.o d3des.o vnc-obj-y +=3D vnc-enc-zlib.o vnc-enc-hextile.o @@ -135,7 +136,6 @@ vnc-obj-y +=3D vnc-enc-tight.o vnc-palette.o vnc-obj-y +=3D vnc-enc-zrle.o vnc-obj-$(CONFIG_VNC_TLS) +=3D vnc-tls.o vnc-auth-vencrypt.o vnc-obj-$(CONFIG_VNC_SASL) +=3D vnc-auth-sasl.o -vnc-obj-$(CONFIG_COCOA) +=3D cocoa.o ifdef CONFIG_VNC_THREAD vnc-obj-y +=3D vnc-jobs-async.o else --=20 1.7.5.3