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

1 files changed, 0 insertions, 114 deletions

diff --git a/usrp/host/lib/inband/Makefile.am b/usrp/host/lib/inband/Makefile.am
deleted file mode 100644
index 650a25ff9..000000000
--- a/usrp/host/lib/inband/Makefile.am
+++ /dev/null
@@ -1,114 +0,0 @@
-#
-# Copyright 2007,2008 Free Software Foundation, Inc.
-# 
-# This file is part of GNU Radio
-# 
-# GNU Radio is free software; you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 3, or (at your option)
-# any later version.
-# 
-# GNU Radio is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
-# 
-# You should have received a copy of the GNU General Public License along
-# with this program; if not, write to the Free Software Foundation, Inc.,
-# 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
-#
-
-include $(top_srcdir)/Makefile.common
-
-AM_CPPFLAGS = 	\
-	$(DEFINES) $(OMNITHREAD_INCLUDES) $(PMT_INCLUDES) $(MBLOCK_INCLUDES) \
-	$(USRP_INCLUDES) $(BOOST_CPPFLAGS) $(CPPUNIT_INCLUDES) \
-	-I$(srcdir)/../../apps-inband $(WITH_INCLUDES)
-
-TESTS = test_inband
-
-EXTRA_DIST =				\
-	usrp_server.mbh			\
-	usrp_interface.mbh 
-
-lib_LTLIBRARIES = 			\
-	libusrp-inband.la		\
-	libusrp-inband-qa.la
-
-# ------------------------------------------------------------------------
-# Build the inband library
-
-BUILT_SOURCES =				\
-	usrp_server_mbh.cc		\
-	usrp_interface_mbh.cc 
-
-usrp_server_mbh.cc : usrp_server.mbh
-	$(COMPILE_MBH) $(srcdir)/usrp_server.mbh usrp_server_mbh.cc
-
-usrp_interface_mbh.cc : usrp_interface.mbh
-	$(COMPILE_MBH) $(srcdir)/usrp_interface.mbh usrp_interface_mbh.cc
-
-libusrp_inband_la_SOURCES =		\
-	$(BUILT_SOURCES)		\
-	$(srcdir)/../../apps-inband/ui_sincos.c	\
-	usrp_inband_usb_packet.cc	\
-	usrp_rx.cc			\
-	usrp_rx_stub.cc			\
-	usrp_server.cc			\
-	usrp_tx.cc			\
-	usrp_tx_stub.cc			\
-	usrp_usb_interface.cc		
-
-libusrp_inband_la_LDFLAGS = $(NO_UNDEFINED) -version-info 0:0:0
-
-libusrp_inband_la_LIBADD =		\
-	$(MBLOCK_LA)			\
-	$(USRP_LA)	  		\
-	-lstdc++
-
-include_HEADERS =			\
-	usrp_inband_usb_packet.h 	\
-	usrp_rx.h			\
-	usrp_rx_stub.h			\
-	usrp_server.h			\
-	usrp_tx.h			\
-	usrp_tx_stub.h			\
-	usrp_usb_interface.h
-
-noinst_HEADERS =      			\
-	qa_inband.h			\
-	qa_inband_packet_prims.h	\
-	qa_inband_usrp_server.h		\
-	symbols_usrp_channel.h		\
-	symbols_usrp_interface_cs.h	\
-	symbols_usrp_low_level_cs.h	\
-	symbols_usrp_rx.h		\
-	symbols_usrp_rx_cs.h		\
-	symbols_usrp_server_cs.h	\
-	symbols_usrp_tx.h		\
-	symbols_usrp_tx_cs.h
-
-# ------------------------------------------------------------------------
-# Build the qa code in its own library
-
-libusrp_inband_qa_la_SOURCES =   	\
-	qa_inband.cc			\
-	qa_inband_packet_prims.cc	\
-	qa_inband_usrp_server.cc
-
-# magic flags
-libusrp_inband_qa_la_LDFLAGS = $(NO_UNDEFINED) -avoid-version
-
-libusrp_inband_qa_la_LIBADD =    	\
-	libusrp-inband.la		\
-	$(PMT_LA)			\
-	$(CPPUNIT_LIBS)			\
-	-lstdc++
-
-# ------------------------------------------------------------------------
-
-noinst_PROGRAMS =			\
-	test_inband
-
-test_inband_SOURCES = test_inband.cc
-test_inband_LDADD   = libusrp-inband-qa.la