diff options
author | Johnathan Corgan | 2009-10-13 13:32:39 -0700 |
---|---|---|
committer | Johnathan Corgan | 2009-10-13 13:32:39 -0700 |
commit | c39a8c449b6a766ca5496c0f3e255b15c40c690d (patch) | |
tree | c64e754fcc11979755d12f30d99e24c9c69e7d27 /gr-usrp | |
parent | 6b0bbd512a12a1ec0309f0f8d38797c824ec1326 (diff) | |
parent | 6b626de1518b3897f8707acd7b920f19cc15da94 (diff) | |
download | gnuradio-c39a8c449b6a766ca5496c0f3e255b15c40c690d.tar.gz gnuradio-c39a8c449b6a766ca5496c0f3e255b15c40c690d.tar.bz2 gnuradio-c39a8c449b6a766ca5496c0f3e255b15c40c690d.zip |
Merge branch 'libusb-1.0' of git://github.com/ttsou/gnuradio-ttsou
This merge fixes libusb build machinery to work for Cygwin, Darwin, Ubuntu,
and F11.
* 'libusb-1.0' of git://github.com/ttsou/gnuradio-ttsou:
usrp: Applied patch from Michael Dickens for Darwin libusb
usrp: Applied patch from Don Ward for Cygwin libusb
fix to restart libusbok checking for non-PKGCONFIG
usrp: Disabled libusb-1.0 debug output by default
merged updated libusb checks with older version
usrp: Enable debug output
usrp: Reorg of libusb error reporting
usrp: Added error checking on hash transfers
augmented search for libusb
Diffstat (limited to 'gr-usrp')
-rw-r--r-- | gr-usrp/src/Makefile.am | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/gr-usrp/src/Makefile.am b/gr-usrp/src/Makefile.am index 0835e2b9b..3d1cc1754 100644 --- a/gr-usrp/src/Makefile.am +++ b/gr-usrp/src/Makefile.am @@ -37,6 +37,7 @@ AM_CPPFLAGS = \ $(STD_DEFINES_AND_INCLUDES) \ $(PYTHON_CPPFLAGS) \ $(USRP_INCLUDES) \ + $(USB_INCLUDES) \ $(WITH_INCLUDES) lib_LTLIBRARIES = \ |