From nobody Sat Oct 25 08:55:16 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 1520240037535696.9789382996731; Mon, 5 Mar 2018 00:53:57 -0800 (PST) Received: from localhost ([::1]:47899 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1eslsa-0007wi-QW for importer@patchew.org; Mon, 05 Mar 2018 03:53:56 -0500 Received: from eggs.gnu.org ([2001:4830:134:3::10]:37783) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1eslnm-0003qn-Hd for qemu-devel@nongnu.org; Mon, 05 Mar 2018 03:48:59 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1eslnj-0003aA-92 for qemu-devel@nongnu.org; Mon, 05 Mar 2018 03:48:58 -0500 Received: from mx3-rdu2.redhat.com ([66.187.233.73]:55940 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 1eslnj-0003Z0-2d for qemu-devel@nongnu.org; Mon, 05 Mar 2018 03:48:55 -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 A4D6340FB648 for ; Mon, 5 Mar 2018 08:48:50 +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 4F5BE202699C; Mon, 5 Mar 2018 08:48:50 +0000 (UTC) Received: by sirius.home.kraxel.org (Postfix, from userid 1000) id D7CDF99B; Mon, 5 Mar 2018 09:48:44 +0100 (CET) From: Gerd Hoffmann To: qemu-devel@nongnu.org Date: Mon, 5 Mar 2018 09:48:41 +0100 Message-Id: <20180305084844.18222-11-kraxel@redhat.com> In-Reply-To: <20180305084844.18222-1-kraxel@redhat.com> References: <20180305084844.18222-1-kraxel@redhat.com> X-Scanned-By: MIMEDefang 2.78 on 10.11.54.4 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.11.55.7]); Mon, 05 Mar 2018 08:48:50 +0000 (UTC) X-Greylist: inspected by milter-greylist-4.5.16 (mx1.redhat.com [10.11.55.7]); Mon, 05 Mar 2018 08:48:50 +0000 (UTC) for IP:'10.11.54.4' DOMAIN:'int-mx04.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 10/13] ui/gtk: build as module 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: Gerd Hoffmann 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" Also drop gtk and vte libs from libs_softmmu, so the libs are not pulled in unless the gtk module actually gets loaded. Signed-off-by: Gerd Hoffmann Message-id: 20180301100547.18962-11-kraxel@redhat.com --- configure | 5 ++--- ui/Makefile.objs | 17 +++++++++-------- 2 files changed, 11 insertions(+), 11 deletions(-) diff --git a/configure b/configure index fbfbb64029..ad36320a4c 100755 --- a/configure +++ b/configure @@ -2558,7 +2558,6 @@ if test "$gtk" !=3D "no"; then gtk_cflags=3D"$gtk_cflags $x11_cflags" gtk_libs=3D"$gtk_libs $x11_libs" fi - libs_softmmu=3D"$gtk_libs $libs_softmmu" gtk=3D"yes" elif test "$gtk" =3D "yes"; then feature_not_found "gtk" "Install gtk3-devel" @@ -2808,7 +2807,6 @@ if test "$vte" !=3D "no"; then vte_cflags=3D$($pkg_config --cflags $vtepackage) vte_libs=3D$($pkg_config --libs $vtepackage) vteversion=3D$($pkg_config --modversion $vtepackage) - libs_softmmu=3D"$vte_libs $libs_softmmu" vte=3D"yes" elif test "$vte" =3D "yes"; then if test "$gtkabi" =3D "3.0"; then @@ -6149,7 +6147,7 @@ if test "$glib_subprocess" =3D "yes" ; then echo "CONFIG_HAS_GLIB_SUBPROCESS_TESTS=3Dy" >> $config_host_mak fi if test "$gtk" =3D "yes" ; then - echo "CONFIG_GTK=3Dy" >> $config_host_mak + echo "CONFIG_GTK=3Dm" >> $config_host_mak echo "CONFIG_GTKABI=3D$gtkabi" >> $config_host_mak echo "GTK_CFLAGS=3D$gtk_cflags" >> $config_host_mak echo "GTK_LIBS=3D$gtk_libs" >> $config_host_mak @@ -6200,6 +6198,7 @@ fi if test "$vte" =3D "yes" ; then echo "CONFIG_VTE=3Dy" >> $config_host_mak echo "VTE_CFLAGS=3D$vte_cflags" >> $config_host_mak + echo "VTE_LIBS=3D$vte_libs" >> $config_host_mak fi if test "$virglrenderer" =3D "yes" ; then echo "CONFIG_VIRGL=3Dy" >> $config_host_mak diff --git a/ui/Makefile.objs b/ui/Makefile.objs index 9b725b07aa..49223b0573 100644 --- a/ui/Makefile.objs +++ b/ui/Makefile.objs @@ -16,7 +16,6 @@ common-obj-$(CONFIG_COCOA) +=3D cocoa.o common-obj-$(CONFIG_CURSES) +=3D curses.o common-obj-$(CONFIG_VNC) +=3D $(vnc-obj-y) common-obj-$(call lnot,$(CONFIG_VNC)) +=3D vnc-stubs.o -common-obj-$(CONFIG_GTK) +=3D gtk.o =20 common-obj-$(CONFIG_X11) +=3D x_keymap.o x_keymap.o-cflags :=3D $(X11_CFLAGS) @@ -34,6 +33,12 @@ endif sdl.mo-cflags :=3D $(SDL_CFLAGS) sdl.mo-libs :=3D $(SDL_LIBS) =20 +# ui-gtk module +common-obj-$(CONFIG_GTK) +=3D gtk.mo +gtk.mo-objs :=3D gtk.o +gtk.mo-cflags :=3D $(GTK_CFLAGS) $(VTE_CFLAGS) +gtk.mo-libs :=3D $(GTK_LIBS) $(VTE_LIBS) + ifeq ($(CONFIG_OPENGL),y) common-obj-y +=3D shader.o common-obj-y +=3D console-gl.o @@ -41,17 +46,13 @@ common-obj-y +=3D egl-helpers.o common-obj-y +=3D egl-context.o common-obj-$(CONFIG_OPENGL_DMABUF) +=3D egl-headless.o ifeq ($(CONFIG_GTK_GL),y) -common-obj-$(CONFIG_GTK) +=3D gtk-gl-area.o +gtk.mo-objs +=3D gtk-gl-area.o else -common-obj-$(CONFIG_GTK) +=3D gtk-egl.o +gtk.mo-objs +=3D gtk-egl.o +gtk.mo-libs +=3D $(OPENGL_LIBS) endif endif =20 -gtk.o-cflags :=3D $(GTK_CFLAGS) $(VTE_CFLAGS) -gtk-egl.o-cflags :=3D $(GTK_CFLAGS) $(VTE_CFLAGS) -gtk-gl-area.o-cflags :=3D $(GTK_CFLAGS) $(VTE_CFLAGS) - -gtk-egl.o-libs +=3D $(OPENGL_LIBS) shader.o-libs +=3D $(OPENGL_LIBS) console-gl.o-libs +=3D $(OPENGL_LIBS) egl-helpers.o-libs +=3D $(OPENGL_LIBS) --=20 2.9.3