mirrors/qemu
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

buildsys: Move libusb cflags/libs to per object

Browse Source 
Signed-off-by: Fam Zheng <famz@redhat.com>
Message-Id: <20170907082918.7299-9-famz@redhat.com>
Reviewed-by: Gerd Hoffmann <kraxel@redhat.com>
Reviewed-by: Philippe Mathieu-Daudé <f4bug@amsat.org>
Signed-off-by: Fam Zheng <famz@redhat.com>
This commit is contained in:
Fam Zheng 2017-09-07 16:29:17 +08:00
parent 7b62bf5a70
commit b878b652df
2 changed files with 7 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
configure vendored
View File

@ -4221,8 +4221,6 @@ if test "$libusb" != "no" ; then
libusb="yes" libusb="yes"
libusb_cflags=$($pkg_config --cflags libusb-1.0) libusb_cflags=$($pkg_config --cflags libusb-1.0)
libusb_libs=$($pkg_config --libs libusb-1.0) libusb_libs=$($pkg_config --libs libusb-1.0)
QEMU_CFLAGS="$QEMU_CFLAGS $libusb_cflags"
libs_softmmu="$libs_softmmu $libusb_libs"
else else
if test "$libusb" = "yes"; then if test "$libusb" = "yes"; then
feature_not_found "libusb" "Install libusb devel >= 1.0.13" feature_not_found "libusb" "Install libusb devel >= 1.0.13"
@ -5789,6 +5787,8 @@ fi
if test "$libusb" = "yes" ; then if test "$libusb" = "yes" ; then
echo "CONFIG_USB_LIBUSB=y" >> $config_host_mak 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 fi
if test "$usb_redir" = "yes" ; then if test "$usb_redir" = "yes" ; then

5
hw/usb/Makefile.objs
View File

@ -46,6 +46,11 @@ else
common-obj-y += host-stub.o common-obj-y += host-stub.o
endif endif
host-libusb.o-cflags := $(LIBUSB_CFLAGS)
host-libusb.o-libs := $(LIBUSB_LIBS)
ifeq ($(CONFIG_USB_LIBUSB),y) ifeq ($(CONFIG_USB_LIBUSB),y)
common-obj-$(CONFIG_XEN) += xen-usb.o common-obj-$(CONFIG_XEN) += xen-usb.o
xen-usb.o-cflags := $(LIBUSB_CFLAGS)
xen-usb.o-libs := $(LIBUSB_LIBS)
endif endif