diff options
| author | jcorgan | 2009-07-09 02:55:51 +0000 |
|---|---|---|
| committer | jcorgan | 2009-07-09 02:55:51 +0000 |
| commit | c276a4ffee9314d2528166547abfd2c09d29713f (patch) | |
| tree | 03b06ac67874342ba671a4a0405e006de1ece9ba /usrp/firmware/include | |
| parent | eefb51c0c0fac68d16544e492aebd883528607e1 (diff) | |
| download | gnuradio-c276a4ffee9314d2528166547abfd2c09d29713f.tar.gz gnuradio-c276a4ffee9314d2528166547abfd2c09d29713f.tar.bz2 gnuradio-c276a4ffee9314d2528166547abfd2c09d29713f.zip | |
Merged r11377:11390 from jcorgan/usrp-headers in to trunk.
* Public USRP(1) header files are now in their own source directory
and install into $(includedir)/usrp. This was done to avoid name
clashes in the top-level include directory.
Only users who are developing directly to libusrp in C++ are
affected; the GNU Radio C++ and Python APIs are unchanged.
The simple change required by this update is to change:
#include <usrp_*.h>
to #include
<usrp/usrp_*.h>
...in your source code.
* Removed usrp-inband code from tree (put into limbo directory.)
This code has become unmaintained and has started to suffer
from bitrot. A checkpoint tag has been made for anyone still
needing to use it:
http://gnuradio.org/svn/gnuradio/tags/checkpoints/trunk-20090708-pre-usrp-reorg
The plan during the 3.2->3.3 development cycle is to replace the
functions done by the in-band code with extensions to the existing
gr-usrp blocks using the new message passing architecture.
The USRP hardware FPGA code that provided the inband interface
has not been removed; however, it too has become unmaintained and
will likely be rewritten/replaced during the 3.3 timeframe.
The trunk passes distcheck.
git-svn-id: http://gnuradio.org/svn/gnuradio/trunk@11394 221aa14e-8319-0410-a670-987f0aec2ac5
Diffstat (limited to 'usrp/firmware/include')
| -rw-r--r-- | usrp/firmware/include/Makefile.am | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/usrp/firmware/include/Makefile.am b/usrp/firmware/include/Makefile.am index 97ca60bf2..e17726c07 100644 --- a/usrp/firmware/include/Makefile.am +++ b/usrp/firmware/include/Makefile.am @@ -19,7 +19,9 @@ # Boston, MA 02110-1301, USA. # -include_HEADERS = \ +usrpincludedir = $(includedir)/usrp + +usrpinclude_HEADERS = \ usrp_i2c_addr.h \ usrp_spi_defs.h \ fpga_regs_common.h \ |