OSDN Git Service
(root)
/
qmiga
/
qemu.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
7b62bf5
)
buildsys: Move libusb cflags/libs to per object
author
Fam Zheng
<famz@redhat.com>
Thu, 7 Sep 2017 08:29:17 +0000
(16:29 +0800)
committer
Fam Zheng
<famz@redhat.com>
Fri, 22 Sep 2017 02:20:34 +0000
(10:20 +0800)
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>
configure
patch
|
blob
|
history
hw/usb/Makefile.objs
patch
|
blob
|
history
diff --git
a/configure
b/configure
index
c5d5f02
..
a620465
100755
(executable)
--- 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)
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"
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
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
fi
if test "$usb_redir" = "yes" ; then
diff --git
a/hw/usb/Makefile.objs
b/hw/usb/Makefile.objs
index
9aceb6c
..
05afbd3
100644
(file)
--- a/
hw/usb/Makefile.objs
+++ b/
hw/usb/Makefile.objs
@@
-46,6
+46,11
@@
else
common-obj-y += host-stub.o
endif
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
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
endif