From nobody Tue Feb 10 01:30:56 2026 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 Return-Path: Received: from lists.gnu.org (lists.gnu.org [208.118.235.17]) by mx.zohomail.com with SMTPS id 1504937228693400.2584691656948; Fri, 8 Sep 2017 23:07:08 -0700 (PDT) Received: from localhost ([::1]:48335 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1dqYv5-0007NN-Cb for importer@patchew.org; Sat, 09 Sep 2017 02:07:07 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:33975) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1dqYbm-0006XO-AH for qemu-devel@nongnu.org; Sat, 09 Sep 2017 01:47:11 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1dqYbl-0006e2-HH for qemu-devel@nongnu.org; Sat, 09 Sep 2017 01:47:10 -0400 Received: from mx1.redhat.com ([209.132.183.28]:57270) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1dqYbl-0006dc-Bh for qemu-devel@nongnu.org; Sat, 09 Sep 2017 01:47:09 -0400 Received: from smtp.corp.redhat.com (int-mx02.intmail.prod.int.phx2.redhat.com [10.5.11.12]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id 5FBD983F3D; Sat, 9 Sep 2017 05:47:08 +0000 (UTC) Received: from lemon.redhat.com (ovpn-12-40.pek2.redhat.com [10.72.12.40]) by smtp.corp.redhat.com (Postfix) with ESMTP id 1FFC360F8C; Sat, 9 Sep 2017 05:47:06 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mx1.redhat.com 5FBD983F3D Authentication-Results: ext-mx03.extmail.prod.ext.phx2.redhat.com; dmarc=none (p=none dis=none) header.from=redhat.com Authentication-Results: ext-mx03.extmail.prod.ext.phx2.redhat.com; spf=fail smtp.mailfrom=famz@redhat.com From: Fam Zheng To: qemu-devel@nongnu.org Date: Sat, 9 Sep 2017 13:46:04 +0800 Message-Id: <20170909054613.19148-29-famz@redhat.com> In-Reply-To: <20170909054613.19148-1-famz@redhat.com> References: <20170909054613.19148-1-famz@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.12 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.27]); Sat, 09 Sep 2017 05:47:08 +0000 (UTC) Content-Transfer-Encoding: quoted-printable X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] [fuzzy] X-Received-From: 209.132.183.28 Subject: [Qemu-devel] [PULL v2 28/37] buildsys: Move gtk/vte cflags/libs to per object 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: Peter Maydell Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail: RSF_0 Z_629925259 SPT_0 Content-Type: text/plain; charset="utf-8" Signed-off-by: Fam Zheng Message-Id: <20170907082918.7299-2-famz@redhat.com> Reviewed-by: Gerd Hoffmann Reviewed-by: Philippe Mathieu-Daud=C3=A9 Signed-off-by: Fam Zheng --- configure | 3 +-- ui/Makefile.objs | 4 ++++ 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/configure b/configure index 25c6ad6b20..8dca32900a 100755 --- a/configure +++ b/configure @@ -2427,7 +2427,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" @@ -2677,7 +2676,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 @@ -5738,6 +5736,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 3369451285..146a8ce062 100644 --- a/ui/Makefile.objs +++ b/ui/Makefile.objs @@ -45,6 +45,10 @@ 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) =20 +gtk.o-libs :=3D $(GTK_LIBS) $(VTE_LIBS) +gtk-egl.o-libs :=3D $(GTK_LIBS) $(VTE_LIBS) +gtk-gl-area.o-libs :=3D $(GTK_LIBS) $(VTE_LIBS) + gtk-egl.o-libs +=3D $(OPENGL_LIBS) shader.o-libs +=3D $(OPENGL_LIBS) console-gl.o-libs +=3D $(OPENGL_LIBS) --=20 2.13.5