From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:37948) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1etqyn-000103-Mt for qemu-devel@nongnu.org; Thu, 08 Mar 2018 03:32:50 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1etqym-0008M5-Lq for qemu-devel@nongnu.org; Thu, 08 Mar 2018 03:32:49 -0500 Received: from mx3-rdu2.redhat.com ([66.187.233.73]:49392 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 1etqym-0008LK-GS for qemu-devel@nongnu.org; Thu, 08 Mar 2018 03:32:48 -0500 Received: from smtp.corp.redhat.com (int-mx04.intmail.prod.int.rdu2.redhat.com [10.11.54.4]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id CC1854040070 for ; Thu, 8 Mar 2018 08:32:36 +0000 (UTC) From: Gerd Hoffmann Date: Thu, 8 Mar 2018 09:32:27 +0100 Message-Id: <20180308083231.20180-5-kraxel@redhat.com> In-Reply-To: <20180308083231.20180-1-kraxel@redhat.com> References: <20180308083231.20180-1-kraxel@redhat.com> Subject: [Qemu-devel] [PULL 4/8] ui/gtk: group gtk.mo declarations in Makefile List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org Cc: Gerd Hoffmann Signed-off-by: Gerd Hoffmann Message-id: 20180306090951.22932-3-kraxel@redhat.com --- ui/Makefile.objs | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-) diff --git a/ui/Makefile.objs b/ui/Makefile.objs index d1203bb80a..b560ee12c3 100644 --- a/ui/Makefile.objs +++ b/ui/Makefile.objs @@ -38,6 +38,13 @@ common-obj-$(CONFIG_GTK) += gtk.mo gtk.mo-objs := gtk.o gtk.mo-cflags := $(GTK_CFLAGS) $(VTE_CFLAGS) gtk.mo-libs := $(GTK_LIBS) $(VTE_LIBS) +ifeq ($(CONFIG_OPENGL),y) +gtk.mo-objs += gtk-egl.o +gtk.mo-libs += $(OPENGL_LIBS) +ifeq ($(CONFIG_GTK_GL),y) +gtk.mo-objs += gtk-gl-area.o +endif +endif common-obj-$(CONFIG_CURSES) += curses.mo curses.mo-objs := curses.o @@ -50,11 +57,6 @@ common-obj-y += console-gl.o common-obj-y += egl-helpers.o common-obj-y += egl-context.o common-obj-$(CONFIG_OPENGL_DMABUF) += egl-headless.o -ifeq ($(CONFIG_GTK_GL),y) -gtk.mo-objs += gtk-gl-area.o -endif -gtk.mo-objs += gtk-egl.o -gtk.mo-libs += $(OPENGL_LIBS) endif shader.o-libs += $(OPENGL_LIBS) -- 2.9.3