From nobody Tue Feb 10 05:45:17 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 150493707665129.96630620539281; Fri, 8 Sep 2017 23:04:36 -0700 (PDT) Received: from localhost ([::1]:48323 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1dqYsd-00057x-Gk for importer@patchew.org; Sat, 09 Sep 2017 02:04:35 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:34067) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1dqYbr-0006d0-Hn for qemu-devel@nongnu.org; Sat, 09 Sep 2017 01:47:16 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1dqYbp-0006gU-BI for qemu-devel@nongnu.org; Sat, 09 Sep 2017 01:47:15 -0400 Received: from mx1.redhat.com ([209.132.183.28]:37008) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1dqYbp-0006g7-2N for qemu-devel@nongnu.org; Sat, 09 Sep 2017 01:47:13 -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 17764821C7; Sat, 9 Sep 2017 05:47:12 +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 C7F4C60F8C; Sat, 9 Sep 2017 05:47:10 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mx1.redhat.com 17764821C7 Authentication-Results: ext-mx04.extmail.prod.ext.phx2.redhat.com; dmarc=none (p=none dis=none) header.from=redhat.com Authentication-Results: ext-mx04.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:06 +0800 Message-Id: <20170909054613.19148-31-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.28]); Sat, 09 Sep 2017 05:47:12 +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 30/37] buildsys: Move vnc 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-4-famz@redhat.com> Reviewed-by: Gerd Hoffmann Reviewed-by: Philippe Mathieu-Daud=C3=A9 Signed-off-by: Fam Zheng --- configure | 14 ++++++++------ ui/Makefile.objs | 21 ++++++++++++--------- 2 files changed, 20 insertions(+), 15 deletions(-) diff --git a/configure b/configure index a9577bb952..ffc93c7cdb 100755 --- a/configure +++ b/configure @@ -2833,8 +2833,8 @@ EOF vnc_sasl_libs=3D"-lsasl2" if compile_prog "$vnc_sasl_cflags" "$vnc_sasl_libs" ; then vnc_sasl=3Dyes - libs_softmmu=3D"$vnc_sasl_libs $libs_softmmu" - QEMU_CFLAGS=3D"$QEMU_CFLAGS $vnc_sasl_cflags" + vnc_libs=3D"$vnc_libs $vnc_sasl_libs" + vnc_cflags=3D"$vnc_cflags $vnc_sasl_cflags" else if test "$vnc_sasl" =3D "yes" ; then feature_not_found "vnc-sasl" "Install Cyrus SASL devel" @@ -2855,8 +2855,8 @@ EOF vnc_jpeg_libs=3D"-ljpeg" if compile_prog "$vnc_jpeg_cflags" "$vnc_jpeg_libs" ; then vnc_jpeg=3Dyes - libs_softmmu=3D"$vnc_jpeg_libs $libs_softmmu" - QEMU_CFLAGS=3D"$QEMU_CFLAGS $vnc_jpeg_cflags" + vnc_libs=3D"$vnc_libs $vnc_jpeg_libs" + vnc_cflags=3D"$vnc_cflags $vnc_jpeg_cflags" else if test "$vnc_jpeg" =3D "yes" ; then feature_not_found "vnc-jpeg" "Install libjpeg-turbo devel" @@ -2887,8 +2887,8 @@ EOF fi if compile_prog "$vnc_png_cflags" "$vnc_png_libs" ; then vnc_png=3Dyes - libs_softmmu=3D"$vnc_png_libs $libs_softmmu" - QEMU_CFLAGS=3D"$QEMU_CFLAGS $vnc_png_cflags" + vnc_libs=3D"$vnc_libs $vnc_png_libs" + vnc_cflags=3D"$vnc_cflags $vnc_png_cflags" else if test "$vnc_png" =3D "yes" ; then feature_not_found "vnc-png" "Install libpng devel" @@ -5552,6 +5552,8 @@ echo "CONFIG_BDRV_RW_WHITELIST=3D$block_drv_rw_whitel= ist" >> $config_host_mak echo "CONFIG_BDRV_RO_WHITELIST=3D$block_drv_ro_whitelist" >> $config_host_= mak if test "$vnc" =3D "yes" ; then echo "CONFIG_VNC=3Dy" >> $config_host_mak + echo "VNC_CFLAGS=3D$vnc_cflags" >> $config_host_mak + echo "VNC_LIBS=3D$vnc_libs" >> $config_host_mak fi if test "$vnc_sasl" =3D "yes" ; then echo "CONFIG_VNC_SASL=3Dy" >> $config_host_mak diff --git a/ui/Makefile.objs b/ui/Makefile.objs index b3e29e21f0..a0b3c15a28 100644 --- a/ui/Makefile.objs +++ b/ui/Makefile.objs @@ -1,11 +1,14 @@ -vnc-obj-y +=3D vnc.o -vnc-obj-y +=3D vnc-enc-zlib.o vnc-enc-hextile.o -vnc-obj-y +=3D vnc-enc-tight.o vnc-palette.o -vnc-obj-y +=3D vnc-enc-zrle.o -vnc-obj-y +=3D vnc-auth-vencrypt.o -vnc-obj-$(CONFIG_VNC_SASL) +=3D vnc-auth-sasl.o -vnc-obj-y +=3D vnc-ws.o -vnc-obj-y +=3D vnc-jobs.o +vnc.mo-objs +=3D vnc.o +vnc.mo-objs +=3D vnc-enc-zlib.o vnc-enc-hextile.o +vnc.mo-objs +=3D vnc-enc-tight.o vnc-palette.o +vnc.mo-objs +=3D vnc-enc-zrle.o +vnc.mo-objs +=3D vnc-auth-vencrypt.o +vnc.mo-objs +=3D $(if $(CONFIG_VNC_SASL), vnc-auth-sasl.o) +vnc.mo-objs +=3D vnc-ws.o +vnc.mo-objs +=3D vnc-jobs.o + +vnc.mo-cflags :=3D $(VNC_CFLAGS) +vnc.mo-libs :=3D $(VNC_LIBS) =20 common-obj-y +=3D keymaps.o console.o cursor.o qemu-pixman.o common-obj-y +=3D input.o input-keymap.o input-legacy.o @@ -14,7 +17,7 @@ common-obj-$(CONFIG_SPICE) +=3D spice-core.o spice-input.= o spice-display.o common-obj-$(CONFIG_SDL) +=3D sdl.mo x_keymap.o common-obj-$(CONFIG_COCOA) +=3D cocoa.o common-obj-$(CONFIG_CURSES) +=3D curses.o -common-obj-$(CONFIG_VNC) +=3D $(vnc-obj-y) +common-obj-$(CONFIG_VNC) +=3D vnc.mo common-obj-$(CONFIG_GTK) +=3D gtk.o x_keymap.o =20 ifeq ($(CONFIG_SDLABI),1.2) --=20 2.13.5