[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PULL 18/36] buildsys: Move libusb cflags/libs to per objec
From: |
Fam Zheng |
Subject: |
[Qemu-devel] [PULL 18/36] buildsys: Move libusb cflags/libs to per object |
Date: |
Fri, 22 Sep 2017 15:46:41 +0800 |
Signed-off-by: Fam Zheng <address@hidden>
Message-Id: <address@hidden>
Reviewed-by: Gerd Hoffmann <address@hidden>
Reviewed-by: Philippe Mathieu-Daudé <address@hidden>
Signed-off-by: Fam Zheng <address@hidden>
---
configure | 4 ++--
hw/usb/Makefile.objs | 5 +++++
2 files changed, 7 insertions(+), 2 deletions(-)
diff --git a/configure b/configure
index c5d5f02c08..a6204651d5 100755
--- a/configure
+++ b/configure
@@ -4221,8 +4221,6 @@ if test "$libusb" != "no" ; then
libusb="yes"
libusb_cflags=$($pkg_config --cflags libusb-1.0)
libusb_libs=$($pkg_config --libs libusb-1.0)
- QEMU_CFLAGS="$QEMU_CFLAGS $libusb_cflags"
- libs_softmmu="$libs_softmmu $libusb_libs"
else
if test "$libusb" = "yes"; then
feature_not_found "libusb" "Install libusb devel >= 1.0.13"
@@ -5789,6 +5787,8 @@ fi
if test "$libusb" = "yes" ; then
echo "CONFIG_USB_LIBUSB=y" >> $config_host_mak
+ echo "LIBUSB_CFLAGS=$libusb_cflags" >> $config_host_mak
+ echo "LIBUSB_LIBS=$libusb_libs" >> $config_host_mak
fi
if test "$usb_redir" = "yes" ; then
diff --git a/hw/usb/Makefile.objs b/hw/usb/Makefile.objs
index 9aceb6cc3d..05afbd36fa 100644
--- a/hw/usb/Makefile.objs
+++ b/hw/usb/Makefile.objs
@@ -46,6 +46,11 @@ else
common-obj-y += host-stub.o
endif
+host-libusb.o-cflags := $(LIBUSB_CFLAGS)
+host-libusb.o-libs := $(LIBUSB_LIBS)
+
ifeq ($(CONFIG_USB_LIBUSB),y)
common-obj-$(CONFIG_XEN) += xen-usb.o
+xen-usb.o-cflags := $(LIBUSB_CFLAGS)
+xen-usb.o-libs := $(LIBUSB_LIBS)
endif
--
2.13.5
- [Qemu-devel] [PULL 08/36] docker: Fix return code of build_qemu(), (continued)
- [Qemu-devel] [PULL 08/36] docker: Fix return code of build_qemu(), Fam Zheng, 2017/09/22
- [Qemu-devel] [PULL 09/36] docker: Add test_fail and prep_fail, Fam Zheng, 2017/09/22
- [Qemu-devel] [PULL 10/36] docker: Use unconfined security profile, Fam Zheng, 2017/09/22
- [Qemu-devel] [PULL 11/36] docker: Add nettle-devel to fedora image, Fam Zheng, 2017/09/22
- [Qemu-devel] [PULL 12/36] docker: Add test-block, Fam Zheng, 2017/09/22
- [Qemu-devel] [PULL 13/36] vl: Don't include vde header, Fam Zheng, 2017/09/22
- [Qemu-devel] [PULL 15/36] buildsys: Move sdl cflags/libs to per object, Fam Zheng, 2017/09/22
- [Qemu-devel] [PULL 14/36] buildsys: Move vde libs to per object, Fam Zheng, 2017/09/22
- [Qemu-devel] [PULL 16/36] buildsys: Move audio libs to per object, Fam Zheng, 2017/09/22
- [Qemu-devel] [PULL 17/36] buildsys: Move libcacard cflags/libs to per object, Fam Zheng, 2017/09/22
- [Qemu-devel] [PULL 18/36] buildsys: Move libusb cflags/libs to per object,
Fam Zheng <=
- [Qemu-devel] [PULL 19/36] buildsys: Move usb redir cflags/libs to per object, Fam Zheng, 2017/09/22
- [Qemu-devel] [PULL 20/36] buildsys: Move brlapi libs to per object, Fam Zheng, 2017/09/22
- [Qemu-devel] [PULL 21/36] buildsys: Move rdma libs to per object, Fam Zheng, 2017/09/22
- [Qemu-devel] [PULL 22/36] MAINTAINERS: Fix subsystem name for "Build and test automation", Fam Zheng, 2017/09/22
- [Qemu-devel] [PULL 23/36] gitignore: Ignore vm test images, Fam Zheng, 2017/09/22
- [Qemu-devel] [PULL 24/36] qemu.py: Add "wait()" method, Fam Zheng, 2017/09/22
- [Qemu-devel] [PULL 26/36] tests: Add a test key pair, Fam Zheng, 2017/09/22
- [Qemu-devel] [PULL 25/36] scripts: Add archive-source.sh, Fam Zheng, 2017/09/22
- [Qemu-devel] [PULL 27/36] tests: Add vm test lib, Fam Zheng, 2017/09/22
- [Qemu-devel] [PULL 28/36] tests: Add ubuntu.i386 image, Fam Zheng, 2017/09/22