From nobody Wed Oct 29 22:55:36 2025 Delivered-To: importer@patchew.org Received-SPF: pass (zoho.com: domain of gnu.org designates 208.118.235.17 as permitted sender) client-ip=208.118.235.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Authentication-Results: mx.zohomail.com; spf=pass (zoho.com: domain of gnu.org designates 208.118.235.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=fail(p=none dis=none) header.from=redhat.com Return-Path: Received: from lists.gnu.org (lists.gnu.org [208.118.235.17]) by mx.zohomail.com with SMTPS id 1526560854216279.56679512069024; Thu, 17 May 2018 05:40:54 -0700 (PDT) Received: from localhost ([::1]:53983 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1fJIDF-0004m0-72 for importer@patchew.org; Thu, 17 May 2018 08:40:53 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:33852) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1fJICG-0004KX-1c for qemu-devel@nongnu.org; Thu, 17 May 2018 08:39:53 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1fJICC-00040R-St for qemu-devel@nongnu.org; Thu, 17 May 2018 08:39:52 -0400 Received: from mx3-rdu2.redhat.com ([66.187.233.73]:51622 helo=mx1.redhat.com) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1fJICC-000402-OG for qemu-devel@nongnu.org; Thu, 17 May 2018 08:39:48 -0400 Received: from smtp.corp.redhat.com (int-mx03.intmail.prod.int.rdu2.redhat.com [10.11.54.3]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id D770A87ABE for ; Thu, 17 May 2018 12:39:47 +0000 (UTC) Received: from 640k.localdomain.com (ovpn-112-60.ams2.redhat.com [10.36.112.60]) by smtp.corp.redhat.com (Postfix) with ESMTP id 2306F10E51BF; Thu, 17 May 2018 12:39:44 +0000 (UTC) From: Paolo Bonzini To: qemu-devel@nongnu.org Date: Thu, 17 May 2018 14:39:42 +0200 Message-Id: <1526560782-18732-1-git-send-email-pbonzini@redhat.com> X-Scanned-By: MIMEDefang 2.78 on 10.11.54.3 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.11.55.1]); Thu, 17 May 2018 12:39:47 +0000 (UTC) X-Greylist: inspected by milter-greylist-4.5.16 (mx1.redhat.com [10.11.55.1]); Thu, 17 May 2018 12:39:47 +0000 (UTC) for IP:'10.11.54.3' DOMAIN:'int-mx03.intmail.prod.int.rdu2.redhat.com' HELO:'smtp.corp.redhat.com' FROM:'pbonzini@redhat.com' RCPT:'' X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] [fuzzy] X-Received-From: 66.187.233.73 Subject: [Qemu-devel] [PATCH] ui: add x_keymap.o to modules X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: kraxel@redhat.com Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail: RSF_0 Z_629925259 SPT_0 Content-Transfer-Encoding: quoted-printable MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" x_keymap.o is common to the SDL and GTK+ modules, and it causes the QEMU binary to link to the X11 libraries. Add it separately to the modules to keep the main QEMU binary smaller. Signed-off-by: Paolo Bonzini --- ui/Makefile.objs | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) diff --git a/ui/Makefile.objs b/ui/Makefile.objs index cc78434..00f6976 100644 --- a/ui/Makefile.objs +++ b/ui/Makefile.objs @@ -15,10 +15,6 @@ common-obj-$(CONFIG_COCOA) +=3D cocoa.o common-obj-$(CONFIG_VNC) +=3D $(vnc-obj-y) common-obj-$(call lnot,$(CONFIG_VNC)) +=3D vnc-stubs.o =20 -common-obj-$(CONFIG_X11) +=3D x_keymap.o -x_keymap.o-cflags :=3D $(X11_CFLAGS) -x_keymap.o-libs :=3D $(X11_LIBS) - # ui-sdl module common-obj-$(CONFIG_SDL) +=3D sdl.mo ifeq ($(CONFIG_SDLABI),1.2) @@ -46,6 +42,13 @@ gtk.mo-objs +=3D gtk-gl-area.o endif endif =20 +ifeq ($(CONFIG_X11),y) +sdl.mo-objs +=3D x_keymap.o +gtk.mo-objs +=3D x_keymap.o +x_keymap.o-cflags :=3D $(X11_CFLAGS) +x_keymap.o-libs :=3D $(X11_LIBS) +endif + common-obj-$(CONFIG_CURSES) +=3D curses.mo curses.mo-objs :=3D curses.o curses.mo-cflags :=3D $(CURSES_CFLAGS) --=20 1.8.3.1