[Commit-gnuradio] r6623 - in gnuradio/branches/releases/3.1: . config gnuradio-examples gnuradio-examples/python gnuradio-examples/python/usrp usrp usrp/fpga usrp/fpga/toplevel usrp/host usrp/host/lib

[jcorgan]

Author: jcorgan
Date: 2007-10-11 22:38:51 -0600 (Thu, 11 Oct 2007)
New Revision: 6623

Removed:
   gnuradio/branches/releases/3.1/config/gr_qwt.m4
   gnuradio/branches/releases/3.1/config/grc_gr_cvsd_vocoder.m4
   gnuradio/branches/releases/3.1/config/grc_gr_qtgui.m4
   gnuradio/branches/releases/3.1/config/grc_mblock.m4
   gnuradio/branches/releases/3.1/config/grc_pmt.m4
   gnuradio/branches/releases/3.1/gnuradio-examples/c++/
   gnuradio/branches/releases/3.1/gnuradio-examples/python/dect/
   gnuradio/branches/releases/3.1/gnuradio-examples/python/digital_voice/
   gnuradio/branches/releases/3.1/gnuradio-examples/python/limbo/
   gnuradio/branches/releases/3.1/gnuradio-examples/python/usrp/limbo/
   gnuradio/branches/releases/3.1/gr-cvsd-vocoder/
   gnuradio/branches/releases/3.1/gr-qtgui/
   gnuradio/branches/releases/3.1/mblock/
   gnuradio/branches/releases/3.1/pmt/
   gnuradio/branches/releases/3.1/usrp/fpga/inband_lib/
   gnuradio/branches/releases/3.1/usrp/fpga/toplevel/usrp_inband_usb/
   gnuradio/branches/releases/3.1/usrp/host/apps-inband/
   gnuradio/branches/releases/3.1/usrp/host/lib/inband/
   gnuradio/branches/releases/3.1/usrp/usrp-inband.pc.in
Modified:
   gnuradio/branches/releases/3.1/Makefile.common
   gnuradio/branches/releases/3.1/config/Makefile.am
   gnuradio/branches/releases/3.1/config/grc_gnuradio_examples.m4
   gnuradio/branches/releases/3.1/config/grc_usrp.m4
   gnuradio/branches/releases/3.1/configure.ac
   gnuradio/branches/releases/3.1/gnuradio-examples/Makefile.am
   gnuradio/branches/releases/3.1/gnuradio-examples/python/Makefile.am
   gnuradio/branches/releases/3.1/usrp/Makefile.am
   gnuradio/branches/releases/3.1/usrp/host/Makefile.am
   gnuradio/branches/releases/3.1/usrp/host/lib/Makefile.am
Log:
Removed the wobbly bits from the stable release branch:

* gr-qtgui (incomplete)
* gr-cvsd-vocoder (buggy)
* CVSD vocoder example (buggy)
* DECT example (incomplete)
* C++ dial tone example (incomplete)
* USRP in-band signaling (incomplete)
* libpmt and libmblock (incomplete)
* Miscellaneous cruft (limbo, etc.)

Passes distcheck.  Debian packaging not yet updated to reflect above
changes.



Modified: gnuradio/branches/releases/3.1/Makefile.common
===================================================================
--- gnuradio/branches/releases/3.1/Makefile.common      2007-10-12 03:55:46 UTC 
(rev 6622)
+++ gnuradio/branches/releases/3.1/Makefile.common      2007-10-12 04:38:51 UTC 
(rev 6623)
@@ -77,18 +77,6 @@
                -I$(top_srcdir)/usrp/firmware/include
 USRP_LA = $(top_builddir)/usrp/host/lib/legacy/libusrp.la
 
-# How to link in usrp-inband library from inside the tree
-USRP_INBAND_INCLUDES =         -I$(top_srcdir)/usrp/host/lib/inband 
-USRP_INBAND_LA = $(top_builddir)/usrp/host/lib/inband/libusrp_inband.la
-
-# How to link the PMT library from inside the tree
-PMT_INCLUDES = -I$(top_srcdir)/pmt/src/lib
-PMT_LA = $(top_builddir)/pmt/src/lib/libpmt.la
-
-# How to link the mblock library from inside the tree
-MBLOCK_INCLUDES = -I$(top_srcdir)/mblock/src/lib
-MBLOCK_LA = $(top_builddir)/mblock/src/lib/libmblock.la
-
 # This used to be set in configure.ac but is now defined here for all 
 # Makefiles when this fragment is included.
 STD_DEFINES_AND_INCLUDES=$(DEFINES) $(OMNITHREAD_INCLUDES) 
$(GNURADIO_INCLUDES) $(BOOST_CFLAGS)
@@ -97,8 +85,5 @@
 # using AM_PATH_PROG, but now here have to add a -f to be like GNU make
 RM=$(RM_PROG) -f
 
-RUN_GUILE = 
GUILE_LOAD_PATH="@abs_top_srcdir@/pmt/src/scheme:@abs_top_srcdir@/mblock/src/scheme"
 @GUILE@ -e main -s
-COMPILE_MBH = $(RUN_GUILE) 
$(top_srcdir)/mblock/src/scheme/gnuradio/compile-mbh.scm
-
 # Base directory for example applications
 exampledir = $(datadir)/gnuradio/examples

Modified: gnuradio/branches/releases/3.1/config/Makefile.am
===================================================================
--- gnuradio/branches/releases/3.1/config/Makefile.am   2007-10-12 03:55:46 UTC 
(rev 6622)
+++ gnuradio/branches/releases/3.1/config/Makefile.am   2007-10-12 04:38:51 UTC 
(rev 6623)
@@ -49,12 +49,10 @@
        grc_gr_usrp.m4 \
        grc_gr_video_sdl.m4 \
        grc_gr_wxgui.m4 \
-       grc_mblock.m4 \
        gr_check_createfilemapping.m4 \
        gr_check_mc4020.m4 \
        gr_check_shm_open.m4 \
        gr_check_usrp.m4 \
-       grc_pmt.m4 \
        grc_usrp.m4 \
        gr_doxygen.m4 \
        gr_fortran.m4 \

Deleted: gnuradio/branches/releases/3.1/config/gr_qwt.m4

Modified: gnuradio/branches/releases/3.1/config/grc_gnuradio_examples.m4
===================================================================
--- gnuradio/branches/releases/3.1/config/grc_gnuradio_examples.m4      
2007-10-12 03:55:46 UTC (rev 6622)
+++ gnuradio/branches/releases/3.1/config/grc_gnuradio_examples.m4      
2007-10-12 04:38:51 UTC (rev 6623)
@@ -22,15 +22,12 @@
 
     AC_CONFIG_FILES([ \
         gnuradio-examples/Makefile \
-       gnuradio-examples/c++/Makefile \
         gnuradio-examples/python/Makefile \
         gnuradio-examples/python/apps/hf_explorer/Makefile \
         gnuradio-examples/python/apps/hf_radio/Makefile \
         gnuradio-examples/python/apps/Makefile \
         gnuradio-examples/python/audio/Makefile \
-       gnuradio-examples/python/dect/Makefile \
         gnuradio-examples/python/digital/Makefile \
-        gnuradio-examples/python/digital_voice/Makefile \
         gnuradio-examples/python/multi-antenna/Makefile \
         gnuradio-examples/python/multi_usrp/Makefile \
         gnuradio-examples/python/network/Makefile \

Deleted: gnuradio/branches/releases/3.1/config/grc_gr_cvsd_vocoder.m4

Deleted: gnuradio/branches/releases/3.1/config/grc_gr_qtgui.m4

Deleted: gnuradio/branches/releases/3.1/config/grc_mblock.m4

Deleted: gnuradio/branches/releases/3.1/config/grc_pmt.m4

Modified: gnuradio/branches/releases/3.1/config/grc_usrp.m4
===================================================================
--- gnuradio/branches/releases/3.1/config/grc_usrp.m4   2007-10-12 03:55:46 UTC 
(rev 6622)
+++ gnuradio/branches/releases/3.1/config/grc_usrp.m4   2007-10-12 04:38:51 UTC 
(rev 6623)
@@ -23,7 +23,6 @@
     AC_CONFIG_FILES([ \
        usrp/Makefile \
        usrp/usrp.pc \
-       usrp/usrp-inband.pc \
         usrp/usrp.iss \
         usrp/doc/Doxyfile \
         usrp/doc/Makefile \
@@ -31,12 +30,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.1/configure.ac
===================================================================
--- gnuradio/branches/releases/3.1/configure.ac 2007-10-12 03:55:46 UTC (rev 
6622)
+++ gnuradio/branches/releases/3.1/configure.ac 2007-10-12 04:38:51 UTC (rev 
6623)
@@ -196,8 +196,6 @@
 build_dirs="config"
 GRC_OMNITHREAD                 dnl must come before gnuradio-core and mblock
 GRC_GNURADIO_CORE
-GRC_PMT
-GRC_MBLOCK                     dnl this must come after GRC_PMT
 GRC_USRP
 GRC_GR_USRP                    dnl this must come after GRC_USRP
 GRC_GR_AUDIO_ALSA
@@ -208,14 +206,12 @@
 GRC_GR_AUDIO_WINDOWS
 GRC_GR_ATSC
 GRC_GR_COMEDI
-GRC_GR_CVSD_VOCODER
 GRC_GR_GSM_FR_VOCODER
 GRC_GR_PAGER
 GRC_GR_RADAR_MONO
 GRC_GR_RADIO_ASTRONOMY
 GRC_GR_TRELLIS
 GRC_GR_VIDEO_SDL
-GRC_GR_QTGUI
 GRC_GR_WXGUI
 GRC_GR_SOUNDER                 dnl this must come after GRC_USRP
 GRC_GR_UTILS

Modified: gnuradio/branches/releases/3.1/gnuradio-examples/Makefile.am
===================================================================
--- gnuradio/branches/releases/3.1/gnuradio-examples/Makefile.am        
2007-10-12 03:55:46 UTC (rev 6622)
+++ gnuradio/branches/releases/3.1/gnuradio-examples/Makefile.am        
2007-10-12 04:38:51 UTC (rev 6623)
@@ -21,4 +21,4 @@
 
 include $(top_srcdir)/Makefile.common
 
-SUBDIRS = python c++
+SUBDIRS = python

Modified: gnuradio/branches/releases/3.1/gnuradio-examples/python/Makefile.am
===================================================================
--- gnuradio/branches/releases/3.1/gnuradio-examples/python/Makefile.am 
2007-10-12 03:55:46 UTC (rev 6622)
+++ gnuradio/branches/releases/3.1/gnuradio-examples/python/Makefile.am 
2007-10-12 04:38:51 UTC (rev 6623)
@@ -24,9 +24,7 @@
 SUBDIRS = \
        apps \
        audio \
-       dect \
        digital \
-       digital_voice \
        multi-antenna \
        multi_usrp \
        network \

Modified: gnuradio/branches/releases/3.1/usrp/Makefile.am
===================================================================
--- gnuradio/branches/releases/3.1/usrp/Makefile.am     2007-10-12 03:55:46 UTC 
(rev 6622)
+++ gnuradio/branches/releases/3.1/usrp/Makefile.am     2007-10-12 04:38:51 UTC 
(rev 6623)
@@ -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.1/usrp/host/Makefile.am
===================================================================
--- gnuradio/branches/releases/3.1/usrp/host/Makefile.am        2007-10-12 
03:55:46 UTC (rev 6622)
+++ gnuradio/branches/releases/3.1/usrp/host/Makefile.am        2007-10-12 
04:38:51 UTC (rev 6623)
@@ -19,5 +19,5 @@
 # Boston, MA 02110-1301, USA.
 # 
 
-SUBDIRS = misc lib swig apps apps-inband
+SUBDIRS = misc lib swig apps
 

Modified: gnuradio/branches/releases/3.1/usrp/host/lib/Makefile.am
===================================================================
--- gnuradio/branches/releases/3.1/usrp/host/lib/Makefile.am    2007-10-12 
03:55:46 UTC (rev 6622)
+++ gnuradio/branches/releases/3.1/usrp/host/lib/Makefile.am    2007-10-12 
04:38:51 UTC (rev 6623)
@@ -20,5 +20,5 @@
 
 include $(top_srcdir)/Makefile.common
 
-SUBDIRS = legacy inband
+SUBDIRS = legacy
 

Deleted: gnuradio/branches/releases/3.1/usrp/usrp-inband.pc.in