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

buildsys: Move usb redir cflags/libs to per object

Browse Source 
Signed-off-by: Fam Zheng <famz@redhat.com>
Message-Id: <20170907082918.7299-10-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:18 +08:00
parent b878b652df
commit cc7923fc07
2 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
configure vendored
View File

@ -4235,8 +4235,6 @@ if test "$usb_redir" != "no" ; then
usb_redir="yes" usb_redir="yes"
usb_redir_cflags=$($pkg_config --cflags libusbredirparser-0.5) usb_redir_cflags=$($pkg_config --cflags libusbredirparser-0.5)
usb_redir_libs=$($pkg_config --libs libusbredirparser-0.5) usb_redir_libs=$($pkg_config --libs libusbredirparser-0.5)
QEMU_CFLAGS="$QEMU_CFLAGS $usb_redir_cflags"
libs_softmmu="$libs_softmmu $usb_redir_libs"
else else
if test "$usb_redir" = "yes"; then if test "$usb_redir" = "yes"; then
feature_not_found "usb-redir" "Install usbredir devel" feature_not_found "usb-redir" "Install usbredir devel"
@ -5793,6 +5791,8 @@ fi
if test "$usb_redir" = "yes" ; then if test "$usb_redir" = "yes" ; then
echo "CONFIG_USB_REDIR=y" >> $config_host_mak echo "CONFIG_USB_REDIR=y" >> $config_host_mak
echo "USB_REDIR_CFLAGS=$usb_redir_cflags" >> $config_host_mak
echo "USB_REDIR_LIBS=$usb_redir_libs" >> $config_host_mak
fi fi
if test "$opengl" = "yes" ; then if test "$opengl" = "yes" ; then

2
hw/usb/Makefile.objs
View File

@ -38,6 +38,8 @@ endif
# usb redirection # usb redirection
common-obj-$(CONFIG_USB_REDIR) += redirect.o quirks.o common-obj-$(CONFIG_USB_REDIR) += redirect.o quirks.o
redirect.o-cflags = $(USB_REDIR_CFLAGS)
redirect.o-libs = $(USB_REDIR_LIBS)
# usb pass-through # usb pass-through
ifeq ($(CONFIG_LIBUSB)$(CONFIG_USB),yy) ifeq ($(CONFIG_LIBUSB)$(CONFIG_USB),yy)