From nobody Sat Oct 25 11:03:33 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 1520846922763188.59444649285751; Mon, 12 Mar 2018 02:28:42 -0700 (PDT) Received: from localhost ([::1]:57333 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1evJl4-0001Wp-2K for importer@patchew.org; Mon, 12 Mar 2018 05:28:42 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:49988) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1evJXC-0007Cb-0Z for qemu-devel@nongnu.org; Mon, 12 Mar 2018 05:14:24 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1evJX7-0004g9-MB for qemu-devel@nongnu.org; Mon, 12 Mar 2018 05:14:21 -0400 Received: from mx3-rdu2.redhat.com ([66.187.233.73]:43406 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 1evJX7-0004fH-HP for qemu-devel@nongnu.org; Mon, 12 Mar 2018 05:14:17 -0400 Received: from smtp.corp.redhat.com (int-mx05.intmail.prod.int.rdu2.redhat.com [10.11.54.5]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id 315794023155 for ; Mon, 12 Mar 2018 09:14:17 +0000 (UTC) Received: from sirius.home.kraxel.org (ovpn-116-39.ams2.redhat.com [10.36.116.39]) by smtp.corp.redhat.com (Postfix) with ESMTP id 932C61C4E7; Mon, 12 Mar 2018 09:14:11 +0000 (UTC) Received: by sirius.home.kraxel.org (Postfix, from userid 1000) id 15E24980C6; Mon, 12 Mar 2018 10:14:06 +0100 (CET) From: Gerd Hoffmann To: qemu-devel@nongnu.org Date: Mon, 12 Mar 2018 10:13:57 +0100 Message-Id: <20180312091405.19610-7-kraxel@redhat.com> In-Reply-To: <20180312091405.19610-1-kraxel@redhat.com> References: <20180312091405.19610-1-kraxel@redhat.com> X-Scanned-By: MIMEDefang 2.79 on 10.11.54.5 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.11.55.6]); Mon, 12 Mar 2018 09:14:17 +0000 (UTC) X-Greylist: inspected by milter-greylist-4.5.16 (mx1.redhat.com [10.11.55.6]); Mon, 12 Mar 2018 09:14:17 +0000 (UTC) for IP:'10.11.54.5' DOMAIN:'int-mx05.intmail.prod.int.rdu2.redhat.com' HELO:'smtp.corp.redhat.com' FROM:'kraxel@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] [PULL 06/14] ui/opengl: Makefile cleanup 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: Kevin Wolf , Markus Armbruster , "Dr. David Alan Gilbert" , Gerd Hoffmann , Stefan Hajnoczi 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" With gtk.mo bits moved away we don't need the ifeq any more. Also add missing opengl libs for some objects. Signed-off-by: Gerd Hoffmann Message-id: 20180306090951.22932-4-kraxel@redhat.com --- ui/Makefile.objs | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/ui/Makefile.objs b/ui/Makefile.objs index b560ee12c3..cc784346cb 100644 --- a/ui/Makefile.objs +++ b/ui/Makefile.objs @@ -51,14 +51,14 @@ curses.mo-objs :=3D curses.o curses.mo-cflags :=3D $(CURSES_CFLAGS) curses.mo-libs :=3D $(CURSES_LIBS) =20 -ifeq ($(CONFIG_OPENGL),y) -common-obj-y +=3D shader.o -common-obj-y +=3D console-gl.o -common-obj-y +=3D egl-helpers.o -common-obj-y +=3D egl-context.o +common-obj-$(CONFIG_OPENGL) +=3D shader.o +common-obj-$(CONFIG_OPENGL) +=3D console-gl.o +common-obj-$(CONFIG_OPENGL) +=3D egl-helpers.o +common-obj-$(CONFIG_OPENGL) +=3D egl-context.o common-obj-$(CONFIG_OPENGL_DMABUF) +=3D egl-headless.o -endif =20 shader.o-libs +=3D $(OPENGL_LIBS) console-gl.o-libs +=3D $(OPENGL_LIBS) egl-helpers.o-libs +=3D $(OPENGL_LIBS) +egl-context.o-libs +=3D $(OPENGL_LIBS) +egl-headless.o-libs +=3D $(OPENGL_LIBS) --=20 2.9.3