[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PULL 35/38] buildsys: Move libusb cflags/libs to per objec
From: |
Fam Zheng |
Subject: |
[Qemu-devel] [PULL 35/38] buildsys: Move libusb cflags/libs to per object |
Date: |
Fri, 8 Sep 2017 17:55:03 +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 e430df0582..18368670b1 100755
--- a/configure
+++ b/configure
@@ -4256,8 +4256,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"
@@ -5834,6 +5832,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 795ff25a5e..9ce9eadb47 100644
--- a/hw/usb/Makefile.objs
+++ b/hw/usb/Makefile.objs
@@ -42,6 +42,11 @@ common-obj-$(CONFIG_USB_REDIR) += redirect.o quirks.o
# usb pass-through
common-obj-y += $(patsubst %,host-%.o,$(HOST_USB))
+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 25/38] docker: Drop 'set -e' from run script, (continued)
- [Qemu-devel] [PULL 25/38] docker: Drop 'set -e' from run script, Fam Zheng, 2017/09/08
- [Qemu-devel] [PULL 26/38] vl: Don't include vde header, Fam Zheng, 2017/09/08
- [Qemu-devel] [PULL 27/38] buildsys: Move vde libs to per object, Fam Zheng, 2017/09/08
- [Qemu-devel] [PULL 28/38] buildsys: Move gtk/vte cflags/libs to per object, Fam Zheng, 2017/09/08
- [Qemu-devel] [PULL 29/38] buildsys: Move sdl cflags/libs to per object, Fam Zheng, 2017/09/08
- [Qemu-devel] [PULL 32/38] buildsys: Move curese cflags/libs to per object, Fam Zheng, 2017/09/08
- [Qemu-devel] [PULL 30/38] buildsys: Move vnc cflags/libs to per object, Fam Zheng, 2017/09/08
- [Qemu-devel] [PULL 31/38] buildsys: Move audio libs to per object, Fam Zheng, 2017/09/08
- [Qemu-devel] [PULL 33/38] buildsys: Move opengl cflags to per object, Fam Zheng, 2017/09/08
- [Qemu-devel] [PULL 34/38] buildsys: Move libcacard cflags/libs to per object, Fam Zheng, 2017/09/08
- [Qemu-devel] [PULL 35/38] buildsys: Move libusb cflags/libs to per object,
Fam Zheng <=
- [Qemu-devel] [PULL 37/38] buildsys: Move brlapi libs to per object, Fam Zheng, 2017/09/08
- [Qemu-devel] [PULL 36/38] buildsys: Move usb redir cflags/libs to per object, Fam Zheng, 2017/09/08
- [Qemu-devel] [PULL 38/38] buildsys: Move rdma libs to per object, Fam Zheng, 2017/09/08
- Re: [Qemu-devel] [PULL 00/38] Test and build system patches, no-reply, 2017/09/08
- Re: [Qemu-devel] [PULL 00/38] Test and build system patches, Peter Maydell, 2017/09/08