[Commit-gnuradio] r11104 - in gnuradio/branches/releases/3.2: . config usrp usrp/host usrp/host/lib

[jcorgan]

Author: jcorgan
Date: 2009-05-23 16:00:41 -0600 (Sat, 23 May 2009)
New Revision: 11104

Removed:
   gnuradio/branches/releases/3.2/gr-atsc/
   gnuradio/branches/releases/3.2/gr-comedi/
   gnuradio/branches/releases/3.2/gr-msdd6000/
   gnuradio/branches/releases/3.2/usrp/host/apps-inband/
   gnuradio/branches/releases/3.2/usrp/host/lib/inband/
   gnuradio/branches/releases/3.2/usrp/usrp-inband.pc.in
Modified:
   gnuradio/branches/releases/3.2/config/grc_usrp.m4
   gnuradio/branches/releases/3.2/configure.ac
   gnuradio/branches/releases/3.2/usrp/Makefile.am
   gnuradio/branches/releases/3.2/usrp/host/Makefile.am
   gnuradio/branches/releases/3.2/usrp/host/lib/Makefile.am
Log:
Remove gr-atsc, gr-comedi, gr-msdd6000, and usrp-inband from release branch.  
Branch passes distcheck.

Modified: gnuradio/branches/releases/3.2/config/grc_usrp.m4
===================================================================
--- gnuradio/branches/releases/3.2/config/grc_usrp.m4   2009-05-23 21:26:54 UTC 
(rev 11103)
+++ gnuradio/branches/releases/3.2/config/grc_usrp.m4   2009-05-23 22:00:41 UTC 
(rev 11104)
@@ -20,12 +20,8 @@
 AC_DEFUN([GRC_USRP],[
     GRC_ENABLE(usrp)
 
-    GRC_WITH(usrp, [GRC_WITH_PKG_CONFIG_CHECK(usrp-inband)])
-
-    dnl Don't do usrp if omnithread, mblock, or pmt skipped
+    dnl Don't do usrp if omnithread skipped
     GRC_CHECK_DEPENDENCY(usrp, omnithread)
-    GRC_CHECK_DEPENDENCY(usrp, mblock)
-    GRC_CHECK_DEPENDENCY(usrp, pmt)
 
     dnl Make sure the fast usb technique is set, OS dependent.
     dnl This is always performed, since it puts out CLI flags.
@@ -46,9 +42,6 @@
         AC_CHECK_FUNCS([getrusage sched_setscheduler pthread_setschedparam])
         AC_CHECK_FUNCS([sigaction snprintf])
 
-       dnl Don't do usrp if guile not available (inband requires it)
-       GRC_CHECK_GUILE(usrp)
-
        dnl Make sure libusb is installed; required for legacy USB
         USRP_LIBUSB([],[passed=no;AC_MSG_RESULT([Unable to find dependency 
libusb.])])
 
@@ -61,14 +54,8 @@
                -I\${abs_top_srcdir}/usrp/firmware/include \
                -I\${abs_top_builddir}/usrp/host/lib/legacy"
         usrp_LA="\${abs_top_builddir}/usrp/host/lib/legacy/libusrp.la"
-       usrp_inband_INCLUDES="-I\${abs_top_srcdir}/usrp/host/lib/inband"
-       
usrp_inband_LA="\${abs_top_builddir}/usrp/host/lib/inband/libusrp-inband.la"
     fi
 
-    dnl Include the usrp-inband INCLUDES and LA
-    AC_SUBST(usrp_inband_INCLUDES)
-    AC_SUBST(usrp_inband_LA)
-
     dnl There are 2 pkg-config files (usrp, and usrp-inband); the one
     dnl for usrp requires omnithread for Darwin only.  Create a variable
     dnl for just the usrp.pc.in case.
@@ -85,7 +72,6 @@
     AC_CONFIG_FILES([ \
        usrp/Makefile \
        usrp/usrp.pc \
-       usrp/usrp-inband.pc \
         usrp/usrp.iss \
         usrp/doc/Doxyfile \
         usrp/doc/Makefile \
@@ -93,12 +79,10 @@
         usrp/host/Makefile \
         usrp/host/misc/Makefile \
         usrp/host/lib/Makefile \
-        usrp/host/lib/inband/Makefile \
         usrp/host/lib/legacy/Makefile \
         usrp/host/lib/legacy/std_paths.h \
         usrp/host/swig/Makefile \
         usrp/host/apps/Makefile \
-        usrp/host/apps-inband/Makefile \
         usrp/firmware/Makefile \
         usrp/firmware/include/Makefile \
         usrp/firmware/lib/Makefile \

Modified: gnuradio/branches/releases/3.2/configure.ac
===================================================================
--- gnuradio/branches/releases/3.2/configure.ac 2009-05-23 21:26:54 UTC (rev 
11103)
+++ gnuradio/branches/releases/3.2/configure.ac 2009-05-23 22:00:41 UTC (rev 
11104)
@@ -307,15 +307,12 @@
 GRC_GR_USRP                    dnl this must come after GRC_USRP
 GRC_GR_USRP2
 GRC_GR_GCELL                   dnl this must come after GRC_GCELL and 
GRC_GNURADIO_CORE
-GRC_GR_MSDD6000        
 GRC_GR_AUDIO_ALSA
 GRC_GR_AUDIO_JACK
 GRC_GR_AUDIO_OSS
 GRC_GR_AUDIO_OSX
 GRC_GR_AUDIO_PORTAUDIO
 GRC_GR_AUDIO_WINDOWS
-GRC_GR_ATSC
-GRC_GR_COMEDI
 GRC_GR_CVSD_VOCODER
 GRC_GR_GPIO
 GRC_GR_GSM_FR_VOCODER

Modified: gnuradio/branches/releases/3.2/usrp/Makefile.am
===================================================================
--- gnuradio/branches/releases/3.2/usrp/Makefile.am     2009-05-23 21:26:54 UTC 
(rev 11103)
+++ gnuradio/branches/releases/3.2/usrp/Makefile.am     2009-05-23 22:00:41 UTC 
(rev 11104)
@@ -21,7 +21,6 @@
 
 EXTRA_DIST = \
        usrp.pc.in \
-       usrp-inband.pc.in \
        usrp.iss.in \
        usrp.inf
 
@@ -29,6 +28,4 @@
 
 pkgconfigdir = $(libdir)/pkgconfig
 pkgconfig_DATA = \
-       usrp.pc \
-       usrp-inband.pc
-
+       usrp.pc

Modified: gnuradio/branches/releases/3.2/usrp/host/Makefile.am
===================================================================
--- gnuradio/branches/releases/3.2/usrp/host/Makefile.am        2009-05-23 
21:26:54 UTC (rev 11103)
+++ gnuradio/branches/releases/3.2/usrp/host/Makefile.am        2009-05-23 
22:00:41 UTC (rev 11104)
@@ -19,5 +19,4 @@
 # Boston, MA 02110-1301, USA.
 # 
 
-SUBDIRS = misc lib swig apps apps-inband
-
+SUBDIRS = misc lib swig apps

Modified: gnuradio/branches/releases/3.2/usrp/host/lib/Makefile.am
===================================================================
--- gnuradio/branches/releases/3.2/usrp/host/lib/Makefile.am    2009-05-23 
21:26:54 UTC (rev 11103)
+++ gnuradio/branches/releases/3.2/usrp/host/lib/Makefile.am    2009-05-23 
22:00:41 UTC (rev 11104)
@@ -20,5 +20,4 @@
 
 include $(top_srcdir)/Makefile.common
 
-SUBDIRS = legacy inband
-
+SUBDIRS = legacy