From patchwork Thu Jun 2 18:59:28 2011 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?q?Andreas_F=C3=A4rber?= X-Patchwork-Id: 98463 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from lists.gnu.org (lists.gnu.org [140.186.70.17]) (using TLSv1 with cipher AES256-SHA (256/256 bits)) (Client did not present a certificate) by ozlabs.org (Postfix) with ESMTPS id 2C818B6FB0 for ; Fri, 3 Jun 2011 05:14:10 +1000 (EST) Received: from localhost ([::1]:44168 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1QSDLK-0003R6-WF for incoming@patchwork.ozlabs.org; Thu, 02 Jun 2011 15:14:07 -0400 Received: from eggs.gnu.org ([140.186.70.92]:57529) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1QSD8X-0001Ks-MX for qemu-devel@nongnu.org; Thu, 02 Jun 2011 15:00:54 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1QSD8V-0001BZ-TC for qemu-devel@nongnu.org; Thu, 02 Jun 2011 15:00:53 -0400 Received: from fmmailgate03.web.de ([217.72.192.234]:44593) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1QSD8V-0001BS-EC for qemu-devel@nongnu.org; Thu, 02 Jun 2011 15:00:51 -0400 Received: from smtp02.web.de ( [172.20.0.184]) by fmmailgate03.web.de (Postfix) with ESMTP id 127F11908F3ED; Thu, 2 Jun 2011 20:59:30 +0200 (CEST) Received: from [87.173.124.133] (helo=af.local) by smtp02.web.de with asmtp (WEB.DE 4.110 #2) id 1QSD7B-0004Rq-00; Thu, 02 Jun 2011 20:59:29 +0200 From: =?UTF-8?q?Andreas=20F=C3=A4rber?= To: qemu-devel@nongnu.org Date: Thu, 2 Jun 2011 20:59:28 +0200 Message-Id: <1307041168-8380-1-git-send-email-andreas.faerber@web.de> X-Mailer: git-send-email 1.7.5.3 In-Reply-To: <1300278816-29513-8-git-send-email-Jes.Sorensen@redhat.com> References: <1300278816-29513-8-git-send-email-Jes.Sorensen@redhat.com> MIME-Version: 1.0 X-Sender: Andreas.Faerber@web.de X-Provags-ID: V01U2FsdGVkX1/vIL5jWOupBDIMcsgxjvfVA688o4QMGiMFD7/6 MTEZ67TvUZdpaN3I6nGm3gOp4MFe7ynV+wRjw8HcBh9Zd8uu8t lkkFSD7+nvrwN1r0majA== X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.4-2.6 X-Received-From: 217.72.192.234 Cc: Jes Sorensen , =?UTF-8?q?Andreas=20F=C3=A4rber?= , Anthony Liguori Subject: [Qemu-devel] [PATCH] cocoa: Revert dependency on VNC X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Sender: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org 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