From patchwork Mon Feb 25 15:20:43 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: =?utf-8?q?Daniel_P=2E_Berrang=C3=A9?= X-Patchwork-Id: 222957 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from lists.gnu.org (lists.gnu.org [208.118.235.17]) (using TLSv1 with cipher AES256-SHA (256/256 bits)) (Client did not present a certificate) by ozlabs.org (Postfix) with ESMTPS id 2577B2C0293 for ; Tue, 26 Feb 2013 03:16:11 +1100 (EST) Received: from localhost ([::1]:60846 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1U9zsM-0000O4-Kf for incoming@patchwork.ozlabs.org; Mon, 25 Feb 2013 10:21:58 -0500 Received: from eggs.gnu.org ([208.118.235.92]:41606) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1U9zre-00081t-1t for qemu-devel@nongnu.org; Mon, 25 Feb 2013 10:21:18 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1U9zrW-0007Qj-KH for qemu-devel@nongnu.org; Mon, 25 Feb 2013 10:21:13 -0500 Received: from mx1.redhat.com ([209.132.183.28]:54328) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1U9zrW-0007QJ-CF for qemu-devel@nongnu.org; Mon, 25 Feb 2013 10:21:06 -0500 Received: from int-mx09.intmail.prod.int.phx2.redhat.com (int-mx09.intmail.prod.int.phx2.redhat.com [10.5.11.22]) by mx1.redhat.com (8.14.4/8.14.4) with ESMTP id r1PFL5JY000965 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=OK) for ; Mon, 25 Feb 2013 10:21:05 -0500 Received: from t500wlan.home.berrange.com.com (vpn1-4-92.ams2.redhat.com [10.36.4.92]) by int-mx09.intmail.prod.int.phx2.redhat.com (8.14.4/8.14.4) with ESMTP id r1PFKrXV032143; Mon, 25 Feb 2013 10:21:05 -0500 From: "Daniel P. Berrange" To: qemu-devel@nongnu.org Date: Mon, 25 Feb 2013 15:20:43 +0000 Message-Id: <1361805646-6425-11-git-send-email-berrange@redhat.com> In-Reply-To: <1361805646-6425-1-git-send-email-berrange@redhat.com> References: <1361805646-6425-1-git-send-email-berrange@redhat.com> X-Scanned-By: MIMEDefang 2.68 on 10.5.11.22 X-detected-operating-system: by eggs.gnu.org: GNU/Linux 3.x X-Received-From: 209.132.183.28 Subject: [Qemu-devel] [PATCH ui/gtk 10/13] Ensure x_keymap.o is built when GTK is enabled 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 From: "Daniel P. Berrange" The x_keymap.o file is required by both GTK and SDL builds, so it must be explicitly listed as a GTK dep to ensure the linker works when SDL is disabled Signed-off-by: Daniel P. Berrange --- ui/Makefile.objs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ui/Makefile.objs b/ui/Makefile.objs index 85c50cd..6ddc0de 100644 --- a/ui/Makefile.objs +++ b/ui/Makefile.objs @@ -13,7 +13,7 @@ common-obj-$(CONFIG_SDL) += sdl.o sdl_zoom.o x_keymap.o common-obj-$(CONFIG_COCOA) += cocoa.o common-obj-$(CONFIG_CURSES) += curses.o common-obj-$(CONFIG_VNC) += $(vnc-obj-y) -common-obj-$(CONFIG_GTK) += gtk.o +common-obj-$(CONFIG_GTK) += gtk.o x_keymap.o $(obj)/sdl.o $(obj)/sdl_zoom.o: QEMU_CFLAGS += $(SDL_CFLAGS)