From nobody Tue Feb 10 17:31:02 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 (208.118.235.17 [208.118.235.17]) by mx.zohomail.com with SMTPS id 1506067610383271.4503434023907; Fri, 22 Sep 2017 01:06:50 -0700 (PDT) Received: from localhost ([::1]:57214 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1dvIym-00072h-0K for importer@patchew.org; Fri, 22 Sep 2017 04:06:32 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:37776) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1dvIgU-0008CG-6t for qemu-devel@nongnu.org; Fri, 22 Sep 2017 03:47:39 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1dvIgT-000116-7Q for qemu-devel@nongnu.org; Fri, 22 Sep 2017 03:47:38 -0400 Received: from mx1.redhat.com ([209.132.183.28]:58222) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1dvIgT-00010q-1h for qemu-devel@nongnu.org; Fri, 22 Sep 2017 03:47:37 -0400 Received: from smtp.corp.redhat.com (int-mx06.intmail.prod.int.phx2.redhat.com [10.5.11.16]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id 15101883C2; Fri, 22 Sep 2017 07:47:36 +0000 (UTC) Received: from lemon.redhat.com (ovpn-12-122.pek2.redhat.com [10.72.12.122]) by smtp.corp.redhat.com (Postfix) with ESMTP id E06235C542; Fri, 22 Sep 2017 07:47:34 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mx1.redhat.com 15101883C2 Authentication-Results: ext-mx02.extmail.prod.ext.phx2.redhat.com; dmarc=none (p=none dis=none) header.from=redhat.com Authentication-Results: ext-mx02.extmail.prod.ext.phx2.redhat.com; spf=fail smtp.mailfrom=famz@redhat.com From: Fam Zheng To: qemu-devel@nongnu.org Date: Fri, 22 Sep 2017 15:46:40 +0800 Message-Id: <20170922074659.30097-18-famz@redhat.com> In-Reply-To: <20170922074659.30097-1-famz@redhat.com> References: <20170922074659.30097-1-famz@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.16 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.26]); Fri, 22 Sep 2017 07:47:36 +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 17/36] buildsys: Move libcacard 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-8-famz@redhat.com> Reviewed-by: Gerd Hoffmann Reviewed-by: Philippe Mathieu-Daud=C3=A9 Signed-off-by: Fam Zheng --- configure | 4 ++-- hw/usb/Makefile.objs | 6 ++++-- 2 files changed, 6 insertions(+), 4 deletions(-) diff --git a/configure b/configure index fd544e7b55..c5d5f02c08 100755 --- a/configure +++ b/configure @@ -4206,8 +4206,6 @@ if test "$smartcard" !=3D "no"; then if $pkg_config libcacard; then libcacard_cflags=3D$($pkg_config --cflags libcacard) libcacard_libs=3D$($pkg_config --libs libcacard) - QEMU_CFLAGS=3D"$QEMU_CFLAGS $libcacard_cflags" - libs_softmmu=3D"$libs_softmmu $libcacard_libs" smartcard=3D"yes" else if test "$smartcard" =3D "yes"; then @@ -5785,6 +5783,8 @@ fi =20 if test "$smartcard" =3D "yes" ; then echo "CONFIG_SMARTCARD=3Dy" >> $config_host_mak + echo "SMARTCARD_CFLAGS=3D$libcacard_cflags" >> $config_host_mak + echo "SMARTCARD_LIBS=3D$libcacard_libs" >> $config_host_mak fi =20 if test "$libusb" =3D "yes" ; then diff --git a/hw/usb/Makefile.objs b/hw/usb/Makefile.objs index 757e365562..9aceb6cc3d 100644 --- a/hw/usb/Makefile.objs +++ b/hw/usb/Makefile.objs @@ -26,8 +26,10 @@ common-obj-$(CONFIG_USB_BLUETOOTH) +=3D dev-bluetooth= .o =20 ifeq ($(CONFIG_USB_SMARTCARD),y) common-obj-y +=3D dev-smartcard-reader.o -common-obj-$(CONFIG_SMARTCARD) +=3D ccid-card-passthru.o -common-obj-$(CONFIG_SMARTCARD) +=3D ccid-card-emulated.o +common-obj-$(CONFIG_SMARTCARD) +=3D smartcard.mo +smartcard.mo-objs :=3D ccid-card-passthru.o ccid-card-emulated.o +smartcard.mo-cflags :=3D $(SMARTCARD_CFLAGS) +smartcard.mo-libs :=3D $(SMARTCARD_LIBS) endif =20 ifeq ($(CONFIG_POSIX),y) --=20 2.13.5