From nobody Fri Dec 19 21:56:33 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 Return-Path: Received: from lists.gnu.org (lists.gnu.org [208.118.235.17]) by mx.zohomail.com with SMTPS id 1504865604636955.27817128074; Fri, 8 Sep 2017 03:13:24 -0700 (PDT) Received: from localhost ([::1]:44318 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1dqGHr-00079b-Kb for importer@patchew.org; Fri, 08 Sep 2017 06:13:23 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:42218) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1dqG1P-00007A-OO for qemu-devel@nongnu.org; Fri, 08 Sep 2017 05:56:28 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1dqG1L-0005Cp-62 for qemu-devel@nongnu.org; Fri, 08 Sep 2017 05:56:23 -0400 Received: from mx1.redhat.com ([209.132.183.28]:37212) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1dqG1K-0005CG-W8 for qemu-devel@nongnu.org; Fri, 08 Sep 2017 05:56:19 -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 EE5C781DF1; Fri, 8 Sep 2017 09:56:17 +0000 (UTC) Received: from lemon.redhat.com (ovpn-12-98.pek2.redhat.com [10.72.12.98]) by smtp.corp.redhat.com (Postfix) with ESMTP id AE822610B0; Fri, 8 Sep 2017 09:56:16 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mx1.redhat.com EE5C781DF1 Authentication-Results: ext-mx01.extmail.prod.ext.phx2.redhat.com; dmarc=none (p=none dis=none) header.from=redhat.com Authentication-Results: ext-mx01.extmail.prod.ext.phx2.redhat.com; spf=fail smtp.mailfrom=famz@redhat.com From: Fam Zheng To: qemu-devel@nongnu.org Date: Fri, 8 Sep 2017 17:55:03 +0800 Message-Id: <20170908095506.13594-36-famz@redhat.com> In-Reply-To: <20170908095506.13594-1-famz@redhat.com> References: <20170908095506.13594-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.25]); Fri, 08 Sep 2017 09:56:18 +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 35/38] buildsys: Move libusb 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-9-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 | 5 +++++ 2 files changed, 7 insertions(+), 2 deletions(-) diff --git a/configure b/configure index e430df0582..18368670b1 100755 --- a/configure +++ b/configure @@ -4256,8 +4256,6 @@ if test "$libusb" !=3D "no" ; then libusb=3D"yes" libusb_cflags=3D$($pkg_config --cflags libusb-1.0) libusb_libs=3D$($pkg_config --libs libusb-1.0) - QEMU_CFLAGS=3D"$QEMU_CFLAGS $libusb_cflags" - libs_softmmu=3D"$libs_softmmu $libusb_libs" else if test "$libusb" =3D "yes"; then feature_not_found "libusb" "Install libusb devel >=3D 1.0.13" @@ -5834,6 +5832,8 @@ fi =20 if test "$libusb" =3D "yes" ; then echo "CONFIG_USB_LIBUSB=3Dy" >> $config_host_mak + echo "LIBUSB_CFLAGS=3D$libusb_cflags" >> $config_host_mak + echo "LIBUSB_LIBS=3D$libusb_libs" >> $config_host_mak fi =20 if test "$usb_redir" =3D "yes" ; then diff --git a/hw/usb/Makefile.objs b/hw/usb/Makefile.objs index 795ff25a5e..9ce9eadb47 100644 --- a/hw/usb/Makefile.objs +++ b/hw/usb/Makefile.objs @@ -42,6 +42,11 @@ common-obj-$(CONFIG_USB_REDIR) +=3D redirect.o quirks.o # usb pass-through common-obj-y +=3D $(patsubst %,host-%.o,$(HOST_USB)) =20 +host-libusb.o-cflags :=3D $(LIBUSB_CFLAGS) +host-libusb.o-libs :=3D $(LIBUSB_LIBS) + ifeq ($(CONFIG_USB_LIBUSB),y) common-obj-$(CONFIG_XEN) +=3D xen-usb.o +xen-usb.o-cflags :=3D $(LIBUSB_CFLAGS) +xen-usb.o-libs :=3D $(LIBUSB_LIBS) endif --=20 2.13.5