Removed autotools, gr-waveform, some cleanup

Nick Foster owes Nick Corgan a six-pack of beer!

73 files changed, 0 insertions, 7654 deletions

diff --git a/gnuradio-core/.gitignore b/gnuradio-core/.gitignore
deleted file mode 100644
index 53edad32f..000000000
--- a/gnuradio-core/.gitignore
+++ /dev/null
@@ -1,32 +0,0 @@
-/*.cache
-/*.la
-/*.lo
-/*.pc
-/.deps
-/.la
-/.libs
-/.lo
-/Makefile
-/Makefile.in
-/aclocal.m4
-/autom4te.cache
-/config.cache
-/config.h
-/config.h.in
-/config.log
-/config.status
-/configure
-/depcomp
-/install-sh
-/libtool
-/ltmain.sh
-/make.log
-/missing
-/missing
-/mkinstalldirs
-/py-compile
-/stamp-h
-/stamp-h.in
-/stamp-h1
-/stamp-h1.in
-/stamp-h2.in
diff --git a/gnuradio-core/Makefile.am b/gnuradio-core/Makefile.am
deleted file mode 100644
index 0a4e7e151..000000000
--- a/gnuradio-core/Makefile.am
+++ /dev/null
@@ -1,33 +0,0 @@
-#
-# Copyright 2001,2006,2009 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 GNU Radio; see the file COPYING.  If not, write to
-# the Free Software Foundation, Inc., 51 Franklin Street,
-# Boston, MA 02110-1301, USA.
-# 
-
-include $(top_srcdir)/Makefile.common
-
-EXTRA_DIST += \
-	gnuradio-core.pc.in
-
-SUBDIRS = src
-
-pkgconfigdir = $(libdir)/pkgconfig
-pkgconfig_DATA = gnuradio-core.pc
-
-etcdir = $(gr_prefsdir)
-dist_etc_DATA = gnuradio-core.conf
diff --git a/gnuradio-core/src/.gitignore b/gnuradio-core/src/.gitignore
deleted file mode 100644
index a02b6ff73..000000000
--- a/gnuradio-core/src/.gitignore
+++ /dev/null
@@ -1,8 +0,0 @@
-/Makefile
-/Makefile.in
-/.la
-/.lo
-/.deps
-/.libs
-/*.la
-/*.lo
diff --git a/gnuradio-core/src/Makefile.am b/gnuradio-core/src/Makefile.am
deleted file mode 100644
index 1717d373a..000000000
--- a/gnuradio-core/src/Makefile.am
+++ /dev/null
@@ -1,26 +0,0 @@
-#
-# Copyright 2001,2004,2009,2010 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 GNU Radio; see the file COPYING.  If not, write to
-# the Free Software Foundation, Inc., 51 Franklin Street,
-# Boston, MA 02110-1301, USA.
-# 
-
-include $(top_srcdir)/Makefile.common
-
-SUBDIRS = gen_interpolator_taps lib tests python guile
-
-DIST_SUBDIRS = gen_interpolator_taps lib tests python guile utils
diff --git a/gnuradio-core/src/gen_interpolator_taps/.gitignore b/gnuradio-core/src/gen_interpolator_taps/.gitignore
deleted file mode 100644
index 363c633e1..000000000
--- a/gnuradio-core/src/gen_interpolator_taps/.gitignore
+++ /dev/null
@@ -1,7 +0,0 @@
-/Makefile
-/Makefile.in
-/.deps
-/.libs
-/*.la
-/*.lo
-/gen_interpolator_taps
diff --git a/gnuradio-core/src/gen_interpolator_taps/Makefile.am b/gnuradio-core/src/gen_interpolator_taps/Makefile.am.obsolete
index 1b54af5e7..1b54af5e7 100644
--- a/gnuradio-core/src/gen_interpolator_taps/Makefile.am
+++ b/gnuradio-core/src/gen_interpolator_taps/Makefile.am.obsolete
diff --git a/gnuradio-core/src/guile/.gitignore b/gnuradio-core/src/guile/.gitignore
deleted file mode 100644
index ea2593923..000000000
--- a/gnuradio-core/src/guile/.gitignore
+++ /dev/null
@@ -1,5 +0,0 @@
-/Makefile
-/Makefile.in
-/run_guile_tests
-/guile.log
-/gr-run-waveform-script
diff --git a/gnuradio-core/src/guile/Makefile.am b/gnuradio-core/src/guile/Makefile.am
deleted file mode 100644
index 122f05d97..000000000
--- a/gnuradio-core/src/guile/Makefile.am
+++ /dev/null
@@ -1,80 +0,0 @@
-#
-# Copyright 2010 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, see <http://www.gnu.org/licenses/>.
-#
-
-include $(top_srcdir)/Makefile.common
-
-if GUILE
-
-TESTS = run_guile_tests
-
-EXTRA_DIST += \
-	run_guile_tests.in \
-	$(nobase_guile_DATA) \
-	$(GUILE_TESTS)
-
-bin_SCRIPTS = \
-	gr-run-waveform-script
-
-# These are the hand-coded guile files for gnuradio-core.
-#
-# Swig/common.scm is glue that's required for the goops wrappers.
-# gnuradio/export-safely.scm works around some problems in the goops generated wrappers.
-# gnuradio/core.scm glues the 5 pieces of gnuradio_core_* into a single module.
-# gnuradio/runtime-shim implements "guile friendly" versions of connect & disconnect.
-
-nobase_guile_DATA = \
-	Swig/common.scm \
-	gnuradio/core.scm \
-	gnuradio/export-safely.scm \
-	gnuradio/run-waveform.scm \
-	gnuradio/runtime-shim.scm \
-	gnuradio/waveform.scm \
-	gnuradio/test-suite/guile-test \
-	gnuradio/test-suite/lib.scm
-
-GUILE_TESTS = \
-	tests/00_runtime_basics.test \
-	tests/00_runtime_ctors.test \
-	tests/filter_ctors.test \
-	tests/general_ctors.test \
-	tests/gengen_ctors.test \
-	tests/hier_ctors.test \
-	tests/io_ctors.test
-
-CLEANFILES = guile.log
-
-
-scmlibdir = $(libdir)
-scmdir = $(guiledir)
-
-scmlib_LTLIBRARIES = libguile-gnuradio-dynl-global.la
-
-libguile_gnuradio_dynl_global_la_SOURCES = dynl-global.c
-libguile_gnuradio_dynl_global_la_CPPFLAGS = $(GUILE_CFLAGS)
-libguile_gnuradio_dynl_global_la_LIBADD = $(GUILE_LIBS)
-
-# Create a symlink from gr-run-waveform-script to gr-run-waveform
-install-exec-local:
-	-$(RM) $(DESTDIR)$(bindir)/gr-run-waveform
-	(cd $(DESTDIR)$(bindir) && $(LN_S) gr-run-waveform-script gr-run-waveform)
-
-uninstall-local:
-	-$(RM) $(DESTDIR)$(bindir)/gr-run-waveform
-
-endif
diff --git a/gnuradio-core/src/guile/Swig/common.scm b/gnuradio-core/src/guile/Swig/common.scm
deleted file mode 100644
index a51d3a71d..000000000
--- a/gnuradio-core/src/guile/Swig/common.scm
+++ /dev/null
@@ -1,76 +0,0 @@
-;;;************************************************************************
-;;;*common.scm
-;;;*
-;;;*     This file contains generic SWIG GOOPS classes for generated
-;;;*     GOOPS file support
-;;;*
-;;;* Copyright (C) 2003 John Lenz (jelenz@wisc.edu)
-;;;* Copyright (C) 2004 Matthias Koeppe (mkoeppe@mail.math.uni-magdeburg.de)
-;;;*
-;;;* This file may be freely redistributed without license or fee provided
-;;;* this copyright message remains intact.
-;;;************************************************************************
-
-(define-module (Swig swigrun))
-
-(define-module (Swig common)
-  #:use-module (oop goops)
-  #:use-module (Swig swigrun))
-
-(define-class <swig-metaclass> (<class>)
-  (new-function #:init-value #f))
-
-(define-method (initialize (class <swig-metaclass>) initargs)
-  (slot-set! class 'new-function (get-keyword #:new-function initargs #f))
-  (next-method))
-
-(define-class <swig> () 
-  (swig-smob #:init-value #f)
-  #:metaclass <swig-metaclass>
-)
-
-(define-method (initialize (obj <swig>) initargs)
-  (next-method)
-  (slot-set! obj 'swig-smob
-    (let ((arg (get-keyword #:init-smob initargs #f)))
-      (if arg
-        arg
-        (let ((ret (apply (slot-ref (class-of obj) 'new-function) (get-keyword #:args initargs '()))))
-          ;; if the class is registered with runtime environment,
-          ;; new-Function will return a <swig> goops class.  In that case, extract the smob
-          ;; from that goops class and set it as the current smob.
-          (if (slot-exists? ret 'swig-smob)
-            (slot-ref ret 'swig-smob)
-            ret))))))
-
-(define (display-address o file)
-  (display (number->string (object-address o) 16) file))
-
-(define (display-pointer-address o file)
-  ;; Don't fail if the function SWIG-PointerAddress is not present.
-  (let ((address (false-if-exception (SWIG-PointerAddress o))))
-    (if address
-	(begin
-	  (display " @ " file)
-	  (display (number->string address 16) file)))))
-
-(define-method (write (o <swig>) file)
-  ;; We display _two_ addresses to show the object's identity:
-  ;;  * first the address of the GOOPS proxy object,
-  ;;  * second the pointer address.
-  ;; The reason is that proxy objects are created and discarded on the
-  ;; fly, so different proxy objects for the same C object will appear.
-  (let ((class (class-of o)))
-    (if (slot-bound? class 'name)
-	(begin
-	  (display "#<" file)
-	  (display (class-name class) file)
-	  (display #\space file)
-	  (display-address o file)
-	  (display-pointer-address o file)
-	  (display ">" file))
-	(next-method))))
-                                              
-(export <swig-metaclass> <swig>)
-
-;;; common.scm ends here
diff --git a/gnuradio-core/src/guile/dynl-global.c b/gnuradio-core/src/guile/dynl-global.c
deleted file mode 100644
index 3bf2741b1..000000000
--- a/gnuradio-core/src/guile/dynl-global.c
+++ /dev/null
@@ -1,123 +0,0 @@
-/* -*- c -*- */
-/*
- * Copyright 2010 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, see <http://www.gnu.org/licenses/>.
- */
-
-/*
- * This file is an attempt to work around a problem that appears on
- * certain Ubuntu (and perhaps other) systems.  On those systems
- * (10.04 is known to have the problem, while 10.10 and later work OK
- * without this kludge), we end up with a situation where exceptions
- * are not caught by the swig code, even though the swig generated
- * code "looks right" and "is right".  Details of the issue can be
- * found in swig bug 1863647,
- * http://sourceforge.net/tracker/index.php?func=detail&aid=1863647&group_id=1645&atid=101645
- *
- * We work around the problem by loading swig generated guile modules
- * using the equivalent of the dlopen's RTLD_GLOBAL flag.  This is
- * only possible on systems using libtool-2.*.  Those systems contain
- * the lt_dlavise_global function.
- */
-#ifdef HAVE_CONFIG_H
-#include <config.h>
-#endif
-
-#include <ltdl.h>
-#include <libguile.h>
-
-extern scm_t_bits scm_tc16_dynamic_obj;
-
-#ifdef HAVE_LT_DLADVISE_GLOBAL
-/*
- * Load shared module using the equivalent of the RTLD_GLOBAL flag
- */
-static lt_dlhandle
-dlopenext_global (const char *filename)
-{
-  lt_dlhandle handle = 0;
-  lt_dladvise advise;
-
-  if (!lt_dladvise_init (&advise)
-      && !lt_dladvise_ext (&advise)
-      && !lt_dladvise_global(&advise))
-    handle = lt_dlopenadvise (filename, advise);
-
-  lt_dladvise_destroy (&advise);
-  return handle;
-}
-
-#else
-
-/*
- * We don't have lt_dladvise_global.  Fall back to lt_dlopenext.
- */
-static lt_dlhandle
-dlopenext_global (const char *filename)
-{
-  return lt_dlopenext (filename);
-}
-#endif
-
-
-static void *
-sysdep_dynl_link_global (const char *fname, const char *subr)
-{
-  lt_dlhandle handle;
-  handle = dlopenext_global (fname);
-  if (NULL == handle)
-    {
-      SCM fn;
-      SCM msg;
-
-      fn = scm_from_locale_string (fname);
-      msg = scm_from_locale_string (lt_dlerror ());
-      scm_misc_error (subr, "file: ~S, message: ~S", scm_list_2 (fn, msg));
-    }
-  return (void *) handle;
-}
-
-SCM_DEFINE (scm_dynamic_link_global, "dynamic-link-global", 1, 0, 0, 
-            (SCM filename),
-	    "Find the shared object (shared library) denoted by\n"
-	    "@var{filename} and link it into the running Guile\n"
-	    "application.  The returned\n"
-	    "scheme object is a ``handle'' for the library which can\n"
-	    "be passed to @code{dynamic-func}, @code{dynamic-call} etc.\n\n"
-	    "Searching for object files is system dependent.  Normally,\n"
-	    "if @var{filename} does have an explicit directory it will\n"
-	    "be searched for in locations\n"
-	    "such as @file{/usr/lib} and @file{/usr/local/lib}.")
-#define FUNC_NAME s_scm_dynamic_link_global
-{
-  void *handle;
-  char *file;
-
-  scm_dynwind_begin (0);
-  file = scm_to_locale_string (filename);
-  scm_dynwind_free (file);
-  handle = sysdep_dynl_link_global (file, FUNC_NAME);
-  scm_dynwind_end ();
-  SCM_RETURN_NEWSMOB2 (scm_tc16_dynamic_obj, SCM_UNPACK (filename), handle);
-}
-#undef FUNC_NAME
-
-void
-scm_init_gnuradio_dynl_global_module(void)
-{
-  scm_c_define_gsubr (s_scm_dynamic_link_global, 1, 0, 0, (SCM (*)()) scm_dynamic_link_global);
-}
diff --git a/gnuradio-core/src/guile/gnuradio/core.scm b/gnuradio-core/src/guile/gnuradio/core.scm
deleted file mode 100644
index 9c69cea42..000000000
--- a/gnuradio-core/src/guile/gnuradio/core.scm
+++ /dev/null
@@ -1,32 +0,0 @@
-;;; Glue the separate pieces of gnuradio-core into a single module
-
-(define-module (gnuradio core)
-  #:use-module (oop goops)
-  #:use-module (gnuradio gnuradio_core_runtime)
-  #:use-module (gnuradio runtime-shim)
-  #:use-module (gnuradio gnuradio_core_filter)
-  #:use-module (gnuradio gnuradio_core_io)
-  #:use-module (gnuradio gnuradio_core_general)
-  #:use-module (gnuradio gnuradio_core_gengen)
-  #:use-module (gnuradio gnuradio_core_hier)
-  #:duplicates (merge-generics replace check))
-
-(re-export-all '(gnuradio gnuradio_core_runtime))
-(re-export-all '(gnuradio runtime-shim))
-(re-export-all '(gnuradio gnuradio_core_filter))
-(re-export-all '(gnuradio gnuradio_core_io))
-(re-export-all '(gnuradio gnuradio_core_general))
-(re-export-all '(gnuradio gnuradio_core_gengen))
-(re-export-all '(gnuradio gnuradio_core_hier))
-
-;; Work around problem with gr:message-source
-(define-generic gr:message-source)
-(define-method (gr:message-source itemsize (msgq <gr-msg-queue-sptr>))
-  (gr:message-source-msgq-ctor itemsize msgq))
-(define-method (gr:message-source itemsize (limit <integer>))
-  (gr:message-source-limit-ctor itemsize limit))
-(export gr:message-source)
-
-;;; Return #t if x is not #f
-(define-public (true? x)
-  (and x #t))
diff --git a/gnuradio-core/src/guile/gnuradio/export-safely.scm b/gnuradio-core/src/guile/gnuradio/export-safely.scm
deleted file mode 100644
index 664292d2b..000000000
--- a/gnuradio-core/src/guile/gnuradio/export-safely.scm
+++ /dev/null
@@ -1,90 +0,0 @@
-;;;
-;;; Copyright 2010 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, see <http://www.gnu.org/licenses/>.
-;;;
-
-;;; This module implements a macro, export-safely, that avoids
-;;; exporting symbols that are actually generic-functions imported
-;;; (explicity or implicitly) from elsewhere.
-;;;
-;;; This hackery is required so that the swig generated goops wrappers
-;;; don't stomp on each other.  For background on what this is about
-;;; see this thread:
-;;;
-;;;   http://lists.gnu.org/archive/html/guile-user/2006-05/msg00007.html
-;;;
-;;; Don't expect to understand what's going on here without looking at
-;;; the guts of the module system (implemented in ice-9/boot-9.scm) and
-;;; having a pretty good understanding of goops and generic-functions.
-
-
-(define-module (gnuradio export-safely)
-  #:use-module (oop goops)
-  #:use-module (srfi srfi-1)
-  #:export-syntax (export-safely))
-
-(define-public (generics-in-module module)
-  (let ((lst '()))
-    (module-for-each (lambda (sym var)
-		       (if (variable-bound? var)
-			   (let ((v (variable-ref var)))
-			     (cond ((is-a? v <generic>)
-				    (set! lst (cons v lst)))))))
-		     module)
-    lst))
-
-(define-public (generic-function-names-in-module module)
-  (map generic-function-name (generics-in-module module)))
-
-(define-public (generic-function-names-in-imported-modules module)
-  (concatenate (map generic-function-names-in-module (module-uses module))))
-
-(define-public (export-syms-if-not-imported-gf list-of-syms)
-  (let ((gf-names (generic-function-names-in-imported-modules (current-module))))
-    (let ((to-export (filter (lambda (sym)
-			       (not (memq sym gf-names)))
-			     (delete-duplicates list-of-syms))))
-      (module-export! (current-module) to-export))))
-	 
-(defmacro export-safely names
-  `(export-syms-if-not-imported-gf ',names))
-
-
-(define-public (names-in-module module)
-  (let ((lst '()))
-    (module-for-each (lambda (sym var)
-		       (if (variable-bound? var)
-			   (set! lst (cons sym lst))))
-		     module)
-    lst))
-
-(define-public (names-in-imported-modules module)
-  (delete-duplicates (concatenate (map names-in-module (module-uses module)))))
-
-(define-public (re-export-all src-module-name)
-  (let ((current (current-module))
-	(src-module (resolve-interface src-module-name)))
-
-    (define (ok-to-re-export? name)
-      (let ((var (module-variable current name)))
-	(cond ((not var) #f)					  ; Undefined var
-	      ((eq? var (module-local-variable current name)) #f) ; local var
-	      (else #t))))					  ; OK
-
-    (module-re-export! current
-		       (filter ok-to-re-export?
-			       (names-in-module src-module)))))
diff --git a/gnuradio-core/src/guile/gnuradio/run-waveform.scm b/gnuradio-core/src/guile/gnuradio/run-waveform.scm
deleted file mode 100644
index 01930521c..000000000
--- a/gnuradio-core/src/guile/gnuradio/run-waveform.scm
+++ /dev/null
@@ -1,55 +0,0 @@
-;;;
-;;; Copyright 2010 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, see <http://www.gnu.org/licenses/>.
-;;;
-
-;;; Load and run a waveform defined with define-waveform
-
-
-;; I don't seem to be able to make this work...
-;; I think it's some kind of interaction with the syntax-case
-;; macro, define-waveform, and the module system.
-;;
-;;(define-module (gnuradio run-waveform)
-;;  #:use-module (oop goops)
-;;  #:use-module (gnuradio core)
-;;  #:use-module (gnuradio waveform)
-;;  #:duplicates (merge-generics replace check))
-
-(use-modules (oop goops)
-	     (gnuradio core)
-	     (gnuradio waveform))
-
-
-(define (load-into-module filename module)
-  (let ((f (open-file filename "r")))
-    (let loop ((form (read f)))
-      (cond ((eof-object? form) #t)
-	    (else (eval form module)
-		  (loop (read f)))))))
-
-
-(define-public (run-waveform waveform-filename . args)
-  (debug-enable 'backtrace 'debug)
-  (load waveform-filename)
-  ;;(load-into-module waveform-filename (current-module))
-  (let ((f (waveform-last-registered)))
-    (if (not f)
-	(error "No define-waveform found in file \n" filename))
-    (gr:run (f args))
-    ;; Attempt to get block destructors called now.
-    (gc)))
diff --git a/gnuradio-core/src/guile/gnuradio/runtime-shim.scm b/gnuradio-core/src/guile/gnuradio/runtime-shim.scm
deleted file mode 100644
index bba702670..000000000
--- a/gnuradio-core/src/guile/gnuradio/runtime-shim.scm
+++ /dev/null
@@ -1,129 +0,0 @@
-;;;
-;;; Copyright 2010 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, see <http://www.gnu.org/licenses/>.
-;;;
-
-(define-module (gnuradio runtime-shim)
-  #:use-module (oop goops)
-  #:use-module (ice-9 threads)
-  #:use-module (gnuradio gnuradio_core_runtime)
-  #:duplicates (merge-generics replace check))
-
-(define-class <gr-endpoint> (<object>)
-  (block #:accessor block #:init-keyword #:block)
-  (port #:init-value 0 #:accessor port #:init-keyword #:port))
-
-(define (gr:ep block port)
-  (make <gr-endpoint>
-    #:block (coerce-to-basic-block block) #:port port))
-
-(define (coerce-to-endpoint ep)
-  (cond ((is-a? ep <gr-endpoint>) ep)
-	((false-if-exception (gr:to-basic-block ep))
-	 => (lambda (x) (gr:ep x 0)))
-	((and (pair? ep) (= 2 (length ep))
-	      (false-if-exception (gr:to-basic-block (car ep))))
-	 => (lambda (x) (gr:ep x (cadr ep))))
-	(else (error "Cannot coerce to an endpoint: " ep))))
-
-(define (coerce-to-basic-block block)
-  (cond ((is-a? block <gr-basic-block-sptr>) block)
-	((false-if-exception (gr:to-basic-block block)) => (lambda (x) x))
-	(else (error "Cannot coerce to a gr_basic_block: " block))))
-
-(define (coerce-to-top-block block)
-  (cond ((is-a? block <gr-top-block-sptr>) block)
-	((false-if-exception (gr:to-top-block block)) => (lambda (x) x))
-	(else (error "Cannot coerce to a gr_top_block: " block))))
-
-(define (coerce-to-hier-block2 block)
-  (cond ((is-a? block <gr-hier-block2-sptr>) block)
-	((false-if-exception (gr:to-hier-block2 block)) => (lambda (x) x))
-	(else (error "Cannot coerce to a gr_hier_block2: " block))))
-
-
-;;; Connect one or more block endpoints.  An endpoint is either a <gr-endpoint>,
-;;; a 2-list (block port), or a block instance.  In the latter case, the port number
-;;; is assumed to be zero.
-;;;
-;;; If multiple arguments are provided, connect will attempt to wire them in series,
-;;; interpreting the endpoints as inputs or outputs as appropriate.
-(define-method (gr:connect hb . points)
-  (dis/connect "connect" gr:primitive-connect hb points))
-
-;;; Disconnect one or more block endpoints...
-(define-method (gr:disconnect hb . points)
-  (dis/connect "disconnect" gr:primitive-disconnect hb points))
-
-(define (dis/connect name gf hb points)
-  (let ((hb (coerce-to-hier-block2 hb))
-	(points (list->vector (map coerce-to-endpoint points))))
-
-    (define (op2 p0 p1)
-      (gf hb (block p0) (port p0) (block p1) (port p1)))
-
-    (let ((len (vector-length points)))
-      (case len
-	((0) (error (string-append name " requires at least 1 endpoint;  None provided.")))
-	((1) (gf hb (vector-ref points 0)))
-	(else
-	 (let loop ((n 1))
-	   (cond ((< n len)
-		  (op2 (vector-ref points (1- n)) (vector-ref points n))
-		  (loop (1+ n))))))))))
-
-
-
-
-(define-method (gr:run (self <gr-top-block-sptr>))
-  (gr:start self)
-  (gr:wait self))
-
-
-(define-method (gr:wait (tb <gr-top-block-sptr>))
-
-  (define (sigint-handler sig)
-    ;;(display "\nSIGINT!\n" (current-error-port))
-    ;; tell flow graph to stop
-    (gr:stop tb))
-
-  (let ((old-handler #f))
-    (dynamic-wind
-
-	;; Called at entry
-	(lambda ()
-	  ;; Install SIGINT handler
-	  (set! old-handler (sigaction SIGINT sigint-handler)))
-
-	;; Protected thunk
-	(lambda ()
-	  (let ((waiter (begin-thread (gr:top-block-wait-unlocked tb))))
-	    (join-thread waiter)
-	    ;;(display "\nAfter join-thread\n" (current-error-port))
-	    ))
-
-	;; Called at exit
-	(lambda ()
-	  ;; Restore SIGINT handler
-	  (if (not (car old-handler))
-	      ;; restore original C handler
-	      (sigaction SIGINT #f)
-	      ;; restore Scheme handler, SIG_IGN or SIG_DFL
-	      (sigaction SIGINT (car old-handler) (cdr old-handler)))))))
-
-
-(export-safely <gr-endpoint> gr:ep gr:connect gr:disconnect gr:run gr:wait)
diff --git a/gnuradio-core/src/guile/gnuradio/test-suite/guile-test b/gnuradio-core/src/guile/gnuradio/test-suite/guile-test
deleted file mode 100644
index 6dc1a9658..000000000
--- a/gnuradio-core/src/guile/gnuradio/test-suite/guile-test
+++ /dev/null
@@ -1,241 +0,0 @@
-#!/usr/bin/guile \
--e main -s
-!#
-
-;;;; guile-test --- run the Guile test suite
-;;;; Jim Blandy <jimb@red-bean.com> --- May 1999
-;;;;
-;;;; 	Copyright (C) 1999, 2001, 2006 Free Software Foundation, Inc.
-;;;;
-;;;; This program 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 2, or (at your option)
-;;;; any later version.
-;;;;
-;;;; This program 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 software; see the file COPYING.  If not, write to
-;;;; the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
-;;;; Boston, MA 02110-1301 USA
-
-
-;;;; Usage: [guile -e main -s] guile-test [OPTIONS] [TEST ...]
-;;;;
-;;;; Run tests from the Guile test suite.  Report failures and
-;;;; unexpected passes to the standard output, along with a summary of
-;;;; all the results.  Record each reported test outcome in the log
-;;;; file, `guile.log'.  The exit status is #f if any of the tests
-;;;; fail or pass unexpectedly.
-;;;;
-;;;; Normally, guile-test scans the test directory, and executes all
-;;;; files whose names end in `.test'.  (It assumes they contain
-;;;; Scheme code.)  However, you can have it execute specific tests by
-;;;; listing their filenames on the command line.
-;;;;
-;;;; The option `--test-suite' can be given to specify the test
-;;;; directory.  If no such option is given, the test directory is
-;;;; taken from the environment variable TEST_SUITE_DIR (if defined),
-;;;; otherwise a default directory that is hardcoded in this file is
-;;;; used (see "Installation" below).
-;;;;
-;;;; If present, the `--log-file LOG' option tells `guile-test' to put
-;;;; the log output in a file named LOG.
-;;;;
-;;;; If present, the `--debug' option will enable a debugging mode.
-;;;;
-;;;; If present, the `--flag-unresolved' option will cause guile-test
-;;;; to exit with failure status if any tests are UNRESOLVED.
-;;;;
-;;;;
-;;;; Installation:
-;;;;
-;;;; If you change the #! line at the top of this script to point at
-;;;; the Guile interpreter you want to test, you can call this script
-;;;; as an executable instead of having to pass it as a parameter to
-;;;; guile via "guile -e main -s guile-test".  Further, you can edit
-;;;; the definition of default-test-suite to point to the parent
-;;;; directory of the `tests' tree, which makes it unnecessary to set
-;;;; the environment variable `TEST_SUITE_DIR'.
-;;;;
-;;;;
-;;;; Shortcomings:
-;;;;
-;;;; At the moment, due to a simple-minded implementation, test files
-;;;; must live in the test directory, and you must specify their names
-;;;; relative to the top of the test directory.  If you want to send
-;;;; me a patch that fixes this, but still leaves sane test names in
-;;;; the log file, that would be great.  At the moment, all the tests
-;;;; I care about are in the test directory, though.
-;;;;
-;;;; It would be nice if you could specify the Guile interpreter you
-;;;; want to test on the command line.  As it stands, if you want to
-;;;; change which Guile interpreter you're testing, you need to edit
-;;;; the #! line at the top of this file, which is stupid.
-
-(define (main . args)
-  (let ((module (resolve-module '(gnuradio test-suite guile-test))))
-    (apply (module-ref module 'main) args)))
-
-(define-module (gnuradio test-suite guile-test)
-  :use-module (gnuradio test-suite lib)
-  :use-module (ice-9 getopt-long)
-  :use-module (ice-9 and-let-star)
-  :use-module (ice-9 rdelim)
-  :export (main data-file-name test-file-name))
-
-
-;;; User configurable settings:
-(define default-test-suite
-  (string-append (getenv "HOME") "/bogus-path/test-suite"))
-
-
-;;; Variables that will receive their actual values later.
-(define test-suite default-test-suite)
-
-(define tmp-dir #f)
-
-
-;;; General utilities, that probably should be in a library somewhere.
-
-;;; Enable debugging
-(define (enable-debug-mode)
-  (write-line %load-path)
-  (set! %load-verbosely #t)
-  (debug-enable 'backtrace 'debug))
-
-;;; Traverse the directory tree at ROOT, applying F to the name of
-;;; each file in the tree, including ROOT itself.  For a subdirectory
-;;; SUB, if (F SUB) is true, we recurse into SUB.  Do not follow
-;;; symlinks.
-(define (for-each-file f root)
-
-  ;; A "hard directory" is a path that denotes a directory and is not a
-  ;; symlink.
-  (define (file-is-hard-directory? filename)
-    (eq? (stat:type (lstat filename)) 'directory))
-
-  (let visit ((root root))
-    (let ((should-recur (f root)))
-      (if (and should-recur (file-is-hard-directory? root))
-	  (let ((dir (opendir root)))
-	    (let loop ()
-	      (let ((entry (readdir dir)))
-		(cond
-		 ((eof-object? entry) #f)
-		 ((or (string=? entry ".")
-		      (string=? entry "..")
-                      (string=? entry "CVS")
-                      (string=? entry "RCS"))
-		  (loop))
-		 (else
-		  (visit (string-append root "/" entry))
-		  (loop))))))))))
-
-
-;;; The test driver.
-
-
-;;; Localizing test files and temporary data files.
-
-(define (data-file-name filename)
-  (in-vicinity tmp-dir filename))
-
-(define (test-file-name test)
-  (in-vicinity test-suite test))
-
-;;; Return a list of all the test files in the test tree.
-(define (enumerate-tests test-dir)
-  (let ((root-len (+ 1 (string-length test-dir)))
-	(tests '()))
-    (for-each-file (lambda (file)
-		     (if (has-suffix? file ".test")
-			 (let ((short-name
-				(substring file root-len)))
-			   (set! tests (cons short-name tests))))
-		     #t)
-		   test-dir)
-
-    ;; for-each-file presents the files in whatever order it finds
-    ;; them in the directory.  We sort them here, so they'll always
-    ;; appear in the same order.  This makes it easier to compare test
-    ;; log files mechanically.
-    (sort tests string<?)))
-
-(define (main args)
-  (let ((options (getopt-long args
-			      `((test-suite
-				 (single-char #\t)
-				 (value #t))
-                                (flag-unresolved
-                                 (single-char #\u))
-				(log-file
-				 (single-char #\l)
-				 (value #t))
-				(debug
-				 (single-char #\d))))))
-    (define (opt tag default)
-      (let ((pair (assq tag options)))
-	(if pair (cdr pair) default)))
-
-    (if (opt 'debug #f)
-	(enable-debug-mode))
-
-    (set! test-suite
-	  (or (opt 'test-suite #f)
-	      (getenv "TEST_SUITE_DIR")
-	      default-test-suite))
-
-    ;; directory where temporary files are created.
-    ;; when run from "make check", this must be under the build-dir,
-    ;; not the src-dir.
-    (set! tmp-dir (getcwd))
-
-    (let* ((tests
-	    (let ((foo (opt '() '())))
-	      (if (null? foo)
-		  (enumerate-tests test-suite)
-		  foo)))
-	   (log-file
-	    (opt 'log-file "guile.log")))
-
-      ;; Open the log file.
-      (let ((log-port (open-output-file log-file)))
-
-	;; Register some reporters.
-	(let ((global-pass #t)
-	      (counter (make-count-reporter)))
-	  (register-reporter (car counter))
-	  (register-reporter (make-log-reporter log-port))
-	  (register-reporter user-reporter)
-	  (register-reporter (lambda results
-			       (case (car results)
-                                 ((unresolved)
-                                  (and (opt 'flag-unresolved #f)
-                                       (set! global-pass #f)))
-				 ((fail upass error)
-				  (set! global-pass #f)))))
-
-	  ;; Run the tests.
-	  (for-each (lambda (test)
-                      (display (string-append "Running " test "\n"))
-		      (with-test-prefix test
-			(load (test-file-name test))))
-		    tests)
-
-	  ;; Display the final counts, both to the user and in the log
-	  ;; file.
-	  (let ((counts ((cadr counter))))
-	    (print-counts counts)
-	    (print-counts counts log-port))
-
-	  (close-port log-port)
-	  (quit global-pass))))))
-
-
-;;; Local Variables:
-;;; mode: scheme
-;;; End:
diff --git a/gnuradio-core/src/guile/gnuradio/test-suite/lib.scm b/gnuradio-core/src/guile/gnuradio/test-suite/lib.scm
deleted file mode 100644
index abdc89632..000000000
--- a/gnuradio-core/src/guile/gnuradio/test-suite/lib.scm
+++ /dev/null
@@ -1,627 +0,0 @@
-;;;; test-suite/lib.scm --- generic support for testing
-;;;; Copyright (C) 1999, 2000, 2001, 2004, 2006, 2007 Free Software Foundation, Inc.
-;;;;
-;;;; This program 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 2, or (at your option)
-;;;; any later version.
-;;;;
-;;;; This program 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 software; see the file COPYING.  If not, write to
-;;;; the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
-;;;; Boston, MA 02110-1301 USA
-
-(define-module (gnuradio test-suite lib)
-  :use-module (ice-9 stack-catch)
-  :use-module (ice-9 regex)
-  :use-module (ice-9 syncase)
-  :use-module (ice-9 format)
-  :export (
-
- ;; Exceptions which are commonly being tested for.
- exception:bad-variable
- exception:missing-expression
- exception:out-of-range exception:unbound-var
- exception:used-before-defined
- exception:wrong-num-args exception:wrong-type-arg
- exception:numerical-overflow
- exception:struct-set!-denied
- exception:system-error
- exception:miscellaneous-error
- exception:string-contains-nul
-
- ;; Reporting passes and failures.
- run-test
- pass-if expect-fail
- pass-if-exception expect-fail-exception
- pass-if-throw expect-fail-throw
-
- ;; Naming groups of tests in a regular fashion.
- with-test-prefix with-test-prefix* current-test-prefix
- format-test-name
-
- ;; Using the debugging evaluator.
- with-debugging-evaluator with-debugging-evaluator*
-
- ;; Reporting results in various ways.
- register-reporter unregister-reporter reporter-registered?
- make-count-reporter print-counts
- make-log-reporter
- full-reporter
- user-reporter
-
- ;; srfi-64 compatibility macros
- test-equal
- test-eqv
- test-eq
-))
-
-
-;;;; If you're using Emacs's Scheme mode:
-;;;;   (put 'with-test-prefix 'scheme-indent-function 1)
-
-
-;;;; CORE FUNCTIONS
-;;;;
-;;;; The function (run-test name expected-result thunk) is the heart of the
-;;;; testing environment.  The first parameter NAME is a unique name for the
-;;;; test to be executed (for an explanation of this parameter see below under
-;;;; TEST NAMES).  The second parameter EXPECTED-RESULT is a boolean value
-;;;; that indicates whether the corresponding test is expected to pass.  If
-;;;; EXPECTED-RESULT is #t the test is expected to pass, if EXPECTED-RESULT is
-;;;; #f the test is expected to fail.  Finally, THUNK is the function that
-;;;; actually performs the test.  For example:
-;;;;
-;;;;    (run-test "integer addition" #t (lambda () (= 2 (+ 1 1))))
-;;;;
-;;;; To report success, THUNK should either return #t or throw 'pass.  To
-;;;; report failure, THUNK should either return #f or throw 'fail.  If THUNK
-;;;; returns a non boolean value or throws 'unresolved, this indicates that
-;;;; the test did not perform as expected.  For example the property that was
-;;;; to be tested could not be tested because something else went wrong.
-;;;; THUNK may also throw 'untested to indicate that the test was deliberately
-;;;; not performed, for example because the test case is not complete yet.
-;;;; Finally, if THUNK throws 'unsupported, this indicates that this test
-;;;; requires some feature that is not available in the configured testing
-;;;; environment.  All other exceptions thrown by THUNK are considered as
-;;;; errors.
-;;;;
-;;;;
-;;;; Convenience macros for tests expected to pass or fail
-;;;;
-;;;; * (pass-if name body) is a short form for
-;;;;   (run-test name #t (lambda () body))
-;;;; * (expect-fail name body) is a short form for
-;;;;   (run-test name #f (lambda () body))
-;;;;
-;;;; For example:
-;;;;
-;;;;    (pass-if "integer addition" (= 2 (+ 1 1)))
-;;;;
-;;;;
-;;;; Convenience macros to test for exceptions
-;;;;
-;;;; The following macros take exception parameters which are pairs
-;;;; (type . message), where type is a symbol that denotes an exception type
-;;;; like 'wrong-type-arg or 'out-of-range, and message is a string holding a
-;;;; regular expression that describes the error message for the exception
-;;;; like "Argument .* out of range".
-;;;;
-;;;; * (pass-if-exception name exception body) will pass if the execution of
-;;;;   body causes the given exception to be thrown.  If no exception is
-;;;;   thrown, the test fails.  If some other exception is thrown, is is an
-;;;;   error.
-;;;; * (expect-fail-exception name exception body) will pass unexpectedly if
-;;;;   the execution of body causes the given exception to be thrown.  If no
-;;;;   exception is thrown, the test fails expectedly.  If some other
-;;;;   exception is thrown, it is an error.
-
-
-;;;; TEST NAMES
-;;;;
-;;;; Every test in the test suite has a unique name, to help
-;;;; developers find tests that are failing (or unexpectedly passing),
-;;;; and to help gather statistics.
-;;;;
-;;;; A test name is a list of printable objects.  For example:
-;;;; ("ports.scm" "file" "read and write back list of strings")
-;;;; ("ports.scm" "pipe" "read")
-;;;;
-;;;; Test names may contain arbitrary objects, but they always have
-;;;; the following properties:
-;;;; - Test names can be compared with EQUAL?.
-;;;; - Test names can be reliably stored and retrieved with the standard WRITE
-;;;;   and READ procedures; doing so preserves their identity.
-;;;;
-;;;; For example:
-;;;;
-;;;;    (pass-if "simple addition" (= 4 (+ 2 2)))
-;;;;
-;;;; In that case, the test name is the list ("simple addition").
-;;;;
-;;;; In the case of simple tests the expression that is tested would often
-;;;; suffice as a test name by itself.  Therefore, the convenience macros
-;;;; pass-if and expect-fail provide a shorthand notation that allows to omit
-;;;; a test name in such cases.
-;;;;
-;;;; * (pass-if expression) is a short form for
-;;;;   (run-test 'expression #t (lambda () expression))
-;;;; * (expect-fail expression) is a short form for
-;;;;   (run-test 'expression #f (lambda () expression))
-;;;;
-;;;; For example:
-;;;;
-;;;;    (pass-if (= 2 (+ 1 1)))
-;;;;
-;;;; The WITH-TEST-PREFIX syntax and WITH-TEST-PREFIX* procedure establish
-;;;; a prefix for the names of all tests whose results are reported
-;;;; within their dynamic scope.  For example:
-;;;;
-;;;; (begin
-;;;;   (with-test-prefix "basic arithmetic"
-;;;;     (pass-if "addition" (= (+ 2 2) 4))
-;;;;     (pass-if "subtraction" (= (- 4 2) 2)))
-;;;;   (pass-if "multiplication" (= (* 2 2) 4)))
-;;;;
-;;;; In that example, the three test names are:
-;;;;   ("basic arithmetic" "addition"),
-;;;;   ("basic arithmetic" "subtraction"), and
-;;;;   ("multiplication").
-;;;;
-;;;; WITH-TEST-PREFIX can be nested.  Each WITH-TEST-PREFIX postpends
-;;;; a new element to the current prefix:
-;;;;
-;;;; (with-test-prefix "arithmetic"
-;;;;   (with-test-prefix "addition"
-;;;;     (pass-if "integer" (= (+ 2 2) 4))
-;;;;     (pass-if "complex" (= (+ 2+3i 4+5i) 6+8i)))
-;;;;   (with-test-prefix "subtraction"
-;;;;     (pass-if "integer" (= (- 2 2) 0))
-;;;;     (pass-if "complex" (= (- 2+3i 1+2i) 1+1i))))
-;;;;
-;;;; The four test names here are:
-;;;;   ("arithmetic" "addition" "integer")
-;;;;   ("arithmetic" "addition" "complex")
-;;;;   ("arithmetic" "subtraction" "integer")
-;;;;   ("arithmetic" "subtraction" "complex")
-;;;;
-;;;; To print a name for a human reader, we DISPLAY its elements,
-;;;; separated by ": ".  So, the last set of test names would be
-;;;; reported as:
-;;;;
-;;;;   arithmetic: addition: integer
-;;;;   arithmetic: addition: complex
-;;;;   arithmetic: subtraction: integer
-;;;;   arithmetic: subtraction: complex
-;;;;
-;;;; The Guile benchmarks use with-test-prefix to include the name of
-;;;; the source file containing the test in the test name, to help
-;;;; developers to find failing tests, and to provide each file with its
-;;;; own namespace.
-
-
-;;;; REPORTERS
-;;;;
-;;;; A reporter is a function which we apply to each test outcome.
-;;;; Reporters can log results, print interesting results to the
-;;;; standard output, collect statistics, etc.
-;;;;
-;;;; A reporter function takes two mandatory arguments, RESULT and TEST, and
-;;;; possibly additional arguments depending on RESULT; its return value
-;;;; is ignored.  RESULT has one of the following forms:
-;;;;
-;;;; pass         - The test named TEST passed.
-;;;;                Additional arguments are ignored.
-;;;; upass        - The test named TEST passed unexpectedly.
-;;;;                Additional arguments are ignored.
-;;;; fail         - The test named TEST failed.
-;;;;                Additional arguments are ignored.
-;;;; xfail        - The test named TEST failed, as expected.
-;;;;                Additional arguments are ignored.
-;;;; unresolved   - The test named TEST did not perform as expected, for
-;;;;                example the property that was to be tested could not be
-;;;;                tested because something else went wrong.
-;;;;                Additional arguments are ignored.
-;;;; untested     - The test named TEST was not actually performed, for
-;;;;                example because the test case is not complete yet.
-;;;;                Additional arguments are ignored.
-;;;; unsupported  - The test named TEST requires some feature that is not
-;;;;                available in the configured testing environment.
-;;;;                Additional arguments are ignored.
-;;;; error        - An error occurred while the test named TEST was
-;;;;                performed.  Since this result means that the system caught
-;;;;                an exception it could not handle, the exception arguments
-;;;;                are passed as additional arguments.
-;;;;
-;;;; This library provides some standard reporters for logging results
-;;;; to a file, reporting interesting results to the user, and
-;;;; collecting totals.
-;;;;
-;;;; You can use the REGISTER-REPORTER function and friends to add
-;;;; whatever reporting functions you like.  If you don't register any
-;;;; reporters, the library uses FULL-REPORTER, which simply writes
-;;;; all results to the standard output.
-
-
-;;;; MISCELLANEOUS
-;;;;
-
-;;; Define some exceptions which are commonly being tested for.
-(define exception:bad-variable
-  (cons 'syntax-error "Bad variable"))
-(define exception:missing-expression
-  (cons 'misc-error "^missing or extra expression"))
-(define exception:out-of-range
-  (cons 'out-of-range "^.*out of range"))
-(define exception:unbound-var
-  (cons 'unbound-variable "^Unbound variable"))
-(define exception:used-before-defined
-  (cons 'unbound-variable "^Variable used before given a value"))
-(define exception:wrong-num-args
-  (cons 'wrong-number-of-args "^Wrong number of arguments"))
-(define exception:wrong-type-arg
-  (cons 'wrong-type-arg "^Wrong type"))
-(define exception:numerical-overflow
-  (cons 'numerical-overflow "^Numerical overflow"))
-(define exception:struct-set!-denied
-  (cons 'misc-error "^set! denied for field"))
-(define exception:system-error
-  (cons 'system-error ".*"))
-(define exception:miscellaneous-error
-  (cons 'misc-error "^.*"))
-
-;; as per throw in scm_to_locale_stringn()
-(define exception:string-contains-nul
-  (cons 'misc-error "^string contains #\\\\nul character"))
-
-
-;;; Display all parameters to the default output port, followed by a newline.
-(define (display-line . objs)
-  (for-each display objs)
-  (newline))
-
-;;; Display all parameters to the given output port, followed by a newline.
-(define (display-line-port port . objs)
-  (for-each (lambda (obj) (display obj port)) objs)
-  (newline port))
-
-
-;;;; CORE FUNCTIONS
-;;;;
-
-;;; The central testing routine.
-;;; The idea is taken from Greg, the GNUstep regression test environment.
-(define run-test #f)
-(let ((test-running #f))
-  (define (local-run-test name expect-pass thunk)
-    (if test-running
-	(error "Nested calls to run-test are not permitted.")
-	(let ((test-name (full-name name)))
-	  (set! test-running #t)
-	  (catch #t
-	    (lambda ()
-	      (let ((result (thunk)))
-		(if (eq? result #t) (throw 'pass))
-		(if (eq? result #f) (throw 'fail))
-		(throw 'unresolved)))
-	    (lambda (key . args)
-	      (case key
-		((pass)
-		 (report (if expect-pass 'pass 'upass) test-name))
-		((fail)
-		 (report (if expect-pass 'fail 'xfail) test-name))
-		((unresolved untested unsupported)
-		 (report key test-name))
-		((quit)
-		 (report 'unresolved test-name)
-		 (quit))
-		(else
-		 (report 'error test-name (cons key args))))))
-	  (set! test-running #f))))
-  (set! run-test local-run-test))
-
-;;; A short form for tests that are expected to pass, taken from Greg.
-(defmacro pass-if (name . rest)
-  (if (and (null? rest) (pair? name))
-      ;; presume this is a simple test, i.e. (pass-if (even? 2))
-      ;; where the body should also be the name.
-      `(run-test ',name #t (lambda () ,name))
-      `(run-test ,name #t (lambda () ,@rest))))
-
-;;; A short form for tests that are expected to fail, taken from Greg.
-(defmacro expect-fail (name . rest)
-  (if (and (null? rest) (pair? name))
-      ;; presume this is a simple test, i.e. (expect-fail (even? 2))
-      ;; where the body should also be the name.
-      `(run-test ',name #f (lambda () ,name))
-      `(run-test ,name #f (lambda () ,@rest))))
-
-;;; A helper function to implement the macros that test for exceptions.
-;;;
-;;; This doesn't work for all exceptions, just those that were
-;;; raised by scm-error or error.  This doesn't include those
-;;; raised by throw in the general case, or SWIG in particular.
-;;;
-;;; See also run-raise-exception, pass-if-throw and expect-fail-throw
-;;; for alternatives that work with all exceptions.
-(define (run-test-exception name exception expect-pass thunk)
-  (run-test name expect-pass
-    (lambda ()
-      (stack-catch (car exception)
-	(lambda () (thunk) #f)
-	(lambda (key proc message . rest)
-	  (cond
-           ;; handle explicit key
-           ((string-match (cdr exception) message)
-            #t)
-           ;; handle `(error ...)' which uses `misc-error' for key and doesn't
-           ;; yet format the message and args (we have to do it here).
-           ((and (eq? 'misc-error (car exception))
-                 (list? rest)
-                 (string-match (cdr exception)
-                               (apply simple-format #f message (car rest))))
-            #t)
-           ;; handle syntax errors which use `syntax-error' for key and don't
-           ;; yet format the message and args (we have to do it here).
-           ((and (eq? 'syntax-error (car exception))
-                 (list? rest)
-                 (string-match (cdr exception)
-                               (apply simple-format #f message (car rest))))
-            #t)
-           ;; unhandled; throw again
-           (else
-            (apply throw key proc message rest))))))))
-
-;;; A short form for tests that expect a certain exception to be thrown.
-(defmacro pass-if-exception (name exception body . rest)
-  `(,run-test-exception ,name ,exception #t (lambda () ,body ,@rest)))
-
-;;; A short form for tests expected to fail to throw a certain exception.
-(defmacro expect-fail-exception (name exception body . rest)
-  `(,run-test-exception ,name ,exception #f (lambda () ,body ,@rest)))
-
-
-;;; Helper for macros below
-(define (run-test-throw name exception-key expect-pass thunk)
-  (run-test name expect-pass
-    (lambda ()
-      (stack-catch exception-key
-	(lambda () (thunk) #f)
-	(lambda (key . rest) #t)))))
-
-;;; A short form for tests that expect a certain exception to be thrown,
-;;; where the exception is specified only by the exception-key symbol.
-(defmacro pass-if-throw (name exception-key body . rest)
-  `(,run-test-throw ,name ,exception-key #t (lambda () ,body ,@rest)))
-
-;;; A short form for tests that expect a certain exception to be thrown,
-;;; where the exception is specified only by the exception-key symbol.
-(defmacro expect-fail-throw (name exception-key body . rest)
-  `(,run-test-throw ,name ,exception-key #f (lambda () ,body ,@rest)))
-
-;;;; TEST NAMES
-;;;;
-
-;;;; Turn a test name into a nice human-readable string.
-(define (format-test-name name)
-  (call-with-output-string
-   (lambda (port)
-     (let loop ((name name)
-		(separator ""))
-       (if (pair? name)
-	   (begin
-	     (display separator port)
-	     (display (car name) port)
-	     (loop (cdr name) ": ")))))))
-
-;;;; For a given test-name, deliver the full name including all prefixes.
-(define (full-name name)
-  (append (current-test-prefix) (list name)))
-
-;;; A fluid containing the current test prefix, as a list.
-(define prefix-fluid (make-fluid))
-(fluid-set! prefix-fluid '())
-(define (current-test-prefix)
-  (fluid-ref prefix-fluid))
-
-;;; Postpend PREFIX to the current name prefix while evaluting THUNK.
-;;; The name prefix is only changed within the dynamic scope of the
-;;; call to with-test-prefix*.  Return the value returned by THUNK.
-(define (with-test-prefix* prefix thunk)
-  (with-fluids ((prefix-fluid
-		 (append (fluid-ref prefix-fluid) (list prefix))))
-    (thunk)))
-
-;;; (with-test-prefix PREFIX BODY ...)
-;;; Postpend PREFIX to the current name prefix while evaluating BODY ...
-;;; The name prefix is only changed within the dynamic scope of the
-;;; with-test-prefix expression.  Return the value returned by the last
-;;; BODY expression.
-(defmacro with-test-prefix (prefix . body)
-  `(with-test-prefix* ,prefix (lambda () ,@body)))
-
-;;; Call THUNK using the debugging evaluator.
-(define (with-debugging-evaluator* thunk)
-  (let ((dopts #f))
-    (dynamic-wind
-	(lambda ()
-	  (set! dopts (debug-options))
-	  (debug-enable 'debug))
-	thunk
-	(lambda ()
-	  (debug-options dopts)))))
-
-;;; Evaluate BODY... using the debugging evaluator.
-(define-macro (with-debugging-evaluator . body)
-  `(with-debugging-evaluator* (lambda () ,@body)))
-
-
-
-;;;; REPORTERS
-;;;;
-
-;;; The global list of reporters.
-(define reporters '())
-
-;;; The default reporter, to be used only if no others exist.
-(define default-reporter #f)
-
-;;; Add the procedure REPORTER to the current set of reporter functions.
-;;; Signal an error if that reporter procedure object is already registered.
-(define (register-reporter reporter)
-  (if (memq reporter reporters)
-      (error "register-reporter: reporter already registered: " reporter))
-  (set! reporters (cons reporter reporters)))
-
-;;; Remove the procedure REPORTER from the current set of reporter
-;;; functions.  Signal an error if REPORTER is not currently registered.
-(define (unregister-reporter reporter)
-  (if (memq reporter reporters)
-      (set! reporters (delq! reporter reporters))
-      (error "unregister-reporter: reporter not registered: " reporter)))
-
-;;; Return true iff REPORTER is in the current set of reporter functions.
-(define (reporter-registered? reporter)
-  (if (memq reporter reporters) #t #f))
-
-;;; Send RESULT to all currently registered reporter functions.
-(define (report . args)
-  (if (pair? reporters)
-      (for-each (lambda (reporter) (apply reporter args))
-		reporters)
-      (apply default-reporter args)))
-
-
-;;;; Some useful standard reporters:
-;;;; Count reporters count the occurrence of each test result type.
-;;;; Log reporters write all test results to a given log file.
-;;;; Full reporters write all test results to the standard output.
-;;;; User reporters write interesting test results to the standard output.
-
-;;; The complete list of possible test results.
-(define result-tags
-  '((pass        "PASS"        "passes:                 ")
-    (fail        "FAIL"        "failures:               ")
-    (upass       "UPASS"       "unexpected passes:      ")
-    (xfail       "XFAIL"       "expected failures:      ")
-    (unresolved  "UNRESOLVED"  "unresolved test cases:  ")
-    (untested    "UNTESTED"    "untested test cases:    ")
-    (unsupported "UNSUPPORTED" "unsupported test cases: ")
-    (error       "ERROR"       "errors:                 ")))
-
-;;; The list of important test results.
-(define important-result-tags
-  '(fail upass unresolved error))
-
-;;; Display a single test result in formatted form to the given port
-(define (print-result port result name . args)
-  (let* ((tag (assq result result-tags))
-	 (label (if tag (cadr tag) #f)))
-    (if label
-	(begin
-	  (display label port)
-	  (display ": " port)
-	  (display (format-test-name name) port)
-	  (if (pair? args)
-	      (begin
-		(display " - arguments: " port)
-		(write args port)))
-	  (newline port))
-	(error "(test-suite lib) FULL-REPORTER: unrecognized result: "
-	       result))))
-
-;;; Return a list of the form (COUNTER RESULTS), where:
-;;; - COUNTER is a reporter procedure, and
-;;; - RESULTS is a procedure taking no arguments which returns the
-;;;   results seen so far by COUNTER.  The return value is an alist
-;;;   mapping outcome symbols (`pass', `fail', etc.) onto counts.
-(define (make-count-reporter)
-  (let ((counts (map (lambda (tag) (cons (car tag) 0)) result-tags)))
-    (list
-     (lambda (result name . args)
-       (let ((pair (assq result counts)))
-	 (if pair
-	     (set-cdr! pair (+ 1 (cdr pair)))
-	     (error "count-reporter: unexpected test result: "
-		    (cons result (cons name args))))))
-     (lambda ()
-       (append counts '())))))
-
-;;; Print a count reporter's results nicely.  Pass this function the value
-;;; returned by a count reporter's RESULTS procedure.
-(define (print-counts results . port?)
-  (let ((port (if (pair? port?)
-		  (car port?)
-		  (current-output-port))))
-    (newline port)
-    (display-line-port port "Totals for this test run:")
-    (for-each
-     (lambda (tag)
-       (let ((result (assq (car tag) results)))
-	 (if result
-	     (display-line-port port (caddr tag) (cdr result))
-	     (display-line-port port
-				"Test suite bug: "
-				"no total available for `" (car tag) "'"))))
-     result-tags)
-    (newline port)))
-
-;;; Return a reporter procedure which prints all results to the file
-;;; FILE, in human-readable form.  FILE may be a filename, or a port.
-(define (make-log-reporter file)
-  (let ((port (if (output-port? file) file
-		  (open-output-file file))))
-    (lambda args
-      (apply print-result port args)
-      (force-output port))))
-
-;;; A reporter that reports all results to the user.
-(define (full-reporter . args)
-  (apply print-result (current-output-port) args))
-
-;;; A reporter procedure which shows interesting results (failures,
-;;; unexpected passes etc.) to the user.
-(define (user-reporter result name . args)
-  (if (memq result important-result-tags)
-      (apply full-reporter result name args)))
-
-(set! default-reporter full-reporter)
-
-
-;;; Macros for a bit of compatibility with srfi-64
-;;; (test-equal [name] expected test-expr)
-(define-syntax test-equal
-  (syntax-rules ()
-    ((_ expected test-expr)
-     (pass-if (verbose-equal? expected test-expr)))
-    ((_ name expected test-exprt)
-     (pass-if name (verbose-equal? expected test-expr)))))
-
-;;; (test-eqv [name] expected test-expr)
-(define-syntax test-eqv
-  (syntax-rules ()
-    ((_ expected test-expr)
-     (pass-if (eqv? expected test-expr)))
-    ((_ name expected test-exprt)
-     (pass-if name (eqv? expected test-expr)))))
-
-;;; (test-eq [name] expected test-expr)
-(define-syntax test-eq
-  (syntax-rules ()
-    ((_ expected test-expr)
-     (pass-if (eq? expected test-expr)))
-    ((_ name expected test-exprt)
-     (pass-if name (eq? expected test-expr)))))
-
-
-(define-public (verbose-equal? expected actual)
-  (cond ((equal? expected actual) #t)
-	(else
-	 (format #t "Expected:\n~y\n" expected)
-	 (format #t "Actual:\n~y\n" actual)
-	 #f)))
diff --git a/gnuradio-core/src/guile/gnuradio/waveform.scm b/gnuradio-core/src/guile/gnuradio/waveform.scm
deleted file mode 100644
index 0031be931..000000000
--- a/gnuradio-core/src/guile/gnuradio/waveform.scm
+++ /dev/null
@@ -1,54 +0,0 @@
-;;;
-;;; Copyright 2010 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, see <http://www.gnu.org/licenses/>.
-;;;
-
-(define-module (gnuradio waveform)
-  #:use-module (ice-9 syncase)
-  #:export-syntax (define-waveform))
-
-
-(define *registry* '())			; alist
-(define *last-registered* #f)
-
-
-(define-syntax define-waveform
-  (syntax-rules (vars blocks connections)
-    ((_ (name cmd-line-args)
-	(vars (v-name v-val) ...)
-	(blocks (b-name b-val) ...)
-	(connections (endpoint1 endpoint2 ...) ...))
-     (waveform-register 'name
-      (lambda (cmd-line-args)
-	(let* ((v-name v-val) ...
-	       (b-name b-val) ...
-	       (tb (gr:top-block-swig "waveform-top-block")))
-	  (gr:connect tb endpoint1 endpoint2 ...) ...
-	  tb))))))
-
-
-(define-public (waveform-register name thunk)
-  (set! *registry* (assoc-set! *registry* name thunk))
-  (set! *last-registered* thunk)
-  #t)
-
-(define-public (waveform-lookup name)
-  (let ((r (assoc name *registry*)))
-    (and r (cdr r))))
-
-(define-public (waveform-last-registered)
-  *last-registered*)
diff --git a/gnuradio-core/src/guile/gr-run-waveform-script.in b/gnuradio-core/src/guile/gr-run-waveform-script.in
deleted file mode 100644
index 651b387e9..000000000
--- a/gnuradio-core/src/guile/gr-run-waveform-script.in
+++ /dev/null
@@ -1,51 +0,0 @@
-#!/bin/sh
-
-# usage: prepend <path-varname> <dir>
-prepend() {
-  if [ $# -ne 2 ]
-  then
-    echo "$0: prepend needs 2 args" 1>&2
-    exit 1
-  fi
-  local path="$1" dir="$2" contents=""
-  eval "contents=\$$path"
-  if [ "$dir" != "" ]
-  then
-    if [ "$contents" = "" ]
-    then
-      eval "$path=\"$dir\""
-    else
-      eval "$path=\"$dir:$contents\""
-    fi
-  fi
-  #echo end-of-prepend: $path=${!path}
-}
-
-prefix="@prefix@"
-exec_prefix="@exec_prefix@"
-
-prepend GUILE_LOAD_PATH "${prefix}/share/guile/site"
-prepend LTDL_LIBRARY_PATH "@libdir@"
-prepend DYLD_LIBRARY_PATH "@libdir@"
-
-export GUILE_LOAD_PATH LTDL_LIBRARY_PATH DYLD_LIBRARY_PATH
-
-export GUILE_WARN_DEPRECATED="no"
-
-exec @GUILE@ -e main -s $0 "$@"
-!#
-
-;;; Load and run a waveform defined with define-waveform
-;;;
-;;; usage: gr-run-waveform filename.wfd [args...]
-
-(load-from-path "gnuradio/run-waveform")
-
-(define (main args)
-  (if (not (>= (length args) 2))
-      (let ((port (current-error-port)))
-	(display "usage: " port)
-	(display (car args) port)
-	(display " filename.wfd [args...]\n" port)
-	(exit 1)))
-  (apply run-waveform (cdr args)))
diff --git a/gnuradio-core/src/guile/run_guile_tests.in b/gnuradio-core/src/guile/run_guile_tests.in
deleted file mode 100644
index 61968065e..000000000
--- a/gnuradio-core/src/guile/run_guile_tests.in
+++ /dev/null
@@ -1,17 +0,0 @@
-#!/bin/sh
-
-. @top_builddir@/setup_guile_test_env
-
-# Since we're in gnuradio-core, we don't need to add anything,
-# but we do need to call add_local_paths to set everything up
-
-# 1st argument is absolute path to hand coded guile source directory
-# 2nd argument is absolute path to component C++ shared library build directory
-# 3nd argument is absolute path to component SWIG build directory
-
-add_local_paths \
-    "" \
-    "" \
-    ""
-
-@GUILE@ -e main -c '(use-modules (gnuradio test-suite guile-test))' -t @srcdir@/tests
diff --git a/gnuradio-core/src/guile/tests/00_runtime_basics.test b/gnuradio-core/src/guile/tests/00_runtime_basics.test
deleted file mode 100644
index 4a5d967a1..000000000
--- a/gnuradio-core/src/guile/tests/00_runtime_basics.test
+++ /dev/null
@@ -1,159 +0,0 @@
-;;; -*- Scheme -*-
-;;;
-;;; Copyright 2010 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, see <http://www.gnu.org/licenses/>.
-;;;
-
-;;; If you're using Emacs's Scheme mode:
-;;;   (put 'with-test-prefix 'scheme-indent-function 1)
-
-;;; See the comments in gnuradio/test-suite/lib.scm for info on writing tests.
-;;; See also the very end of the file, where the test-equal, test-eqv
-;;; and test-eq macros are defined.
-
-(use-modules (gnuradio test-suite lib))
-(use-modules (gnuradio core))
-(use-modules (oop goops))
-
-(define (vector-map f v)
-  (list->vector (map f (vector->list v))))
-
-(pass-if "Guile was built with threads" (not (not (memq 'threads *features*))))
-
-(with-test-prefix "connect-1"
- (let* ((src-data #(-5 -4 -3 -2 -1 0 1 2 3 4 5))
-	 (expected-result (vector-map (lambda (x) (* x 2)) src-data))
-	 (tb (gr:top-block-swig "QA top block"))
-	 (src (gr:vector-source-i src-data #f))
-	 (op (gr:multiply-const-ii 2))
-	 (dst (gr:vector-sink-i)))
-
-    ;; using gr:ep to create endpoints
-    (gr:connect tb (gr:ep src 0) (gr:ep op 0))
-    (gr:connect tb (gr:ep op 0) (gr:ep dst 0))
-
-    (gr:run tb)
-    ;;(pass-if (equal? expected-result (gr:data dst)))
-    (test-equal expected-result (gr:data dst))
-    ))
-
-(with-test-prefix "connect-2"
-  (let* ((src-data #(-5 -4 -3 -2 -1 0 1 2 3 4 5))
-	 (expected-result (vector-map (lambda (x) (* x 2)) src-data))
-	 (tb (gr:top-block-swig "QA top block"))
-	 (src (gr:vector-source-i src-data #f))
-	 (op (gr:multiply-const-ii 2))
-	 (dst (gr:vector-sink-i)))
-
-    ;; using just blocks
-    (gr:connect tb src op)
-    (gr:connect tb op dst)
-
-    (gr:run tb)
-    (test-equal expected-result (gr:data dst))))
-
-
-(with-test-prefix "connect-3"
-  (let* ((src-data #(-5 -4 -3 -2 -1 0 1 2 3 4 5))
-	 (expected-result (vector-map (lambda (x) (* x 2)) src-data))
-	 (tb (gr:top-block-swig "QA top block"))
-	 (src (gr:vector-source-i src-data #f))
-	 (op (gr:multiply-const-ii 2))
-	 (dst (gr:vector-sink-i)))
-
-    ;; using lists to represent endpoints
-    (gr:connect tb `(,src 0) `(,op 0))
-    (gr:connect tb `(,op 0) `(,dst 0))
-
-    (gr:run tb)
-    (test-equal expected-result (gr:data dst))))
-
-
-(with-test-prefix "connect-4"
-  (let* ((src-data #(-5 -4 -3 -2 -1 0 1 2 3 4 5))
-	 (expected-result (vector-map (lambda (x) (* x 2)) src-data))
-	 (tb (gr:top-block-swig "QA top block"))
-	 (src (gr:vector-source-i src-data #f))
-	 (op (gr:multiply-const-ii 2))
-	 (dst (gr:vector-sink-i)))
-
-    ;; using multiple endpoints
-    (gr:connect tb src op dst)
-
-    (gr:run tb)
-    (test-equal expected-result (gr:data dst))))
-
-(with-test-prefix "connect-5"
-  (let* ((src-data #(-5 -4 -3 -2 -1 0 1 2 3 4 5))
-	 (expected-result (vector-map (lambda (x) (* x 2)) src-data))
-	 (tb (gr:top-block-swig "QA top block"))
-	 (src (gr:vector-source-i src-data #f))
-	 (op (gr:multiply-const-ii 2))
-	 (dst (gr:vector-sink-i)))
-
-    (pass-if-throw "bad port exception" 'swig-exception
-      (gr:connect tb src op (gr:ep dst 1)))
-    ))
-
-(with-test-prefix "gr_top_block::start throw"
-  (let* ((src-data #(-5 -4 -3 -2 -1 0 1 2 3 4 5))
-	 (expected-result (vector-map (lambda (x) (* x 2)) src-data))
-	 (tb (gr:top-block-swig "QA top block"))
-	 (src (gr:vector-source-i src-data #f))
-	 (op (gr:multiply-const-ii 2))
-	 (dst (gr:vector-sink-i)))
-
-    ;; We deliberately don't connect op's output
-    (gr:connect tb src op)
-
-    ;; Which will lead to an exception here...
-    (pass-if-throw "throws std::runtime_error" 'swig-exception
-      (gr:run tb))
-    ))
-
-(with-test-prefix "io-signature-1"
-  (let ((ios1 (gr:io-signature 1 2 8))
-	(ios2 (gr:io-signature2 1 2 16 32))
-	(ios3 (gr:io-signature3 1 -1 14 32 48))
-	(iosv (gr:io-signaturev 1 4 '(1 2 3))))
-
-    (test-equal 1 (gr:min-streams ios1))
-    (test-equal 2 (gr:max-streams ios1))
-    (test-equal 8 (gr:sizeof-stream-item ios1 0))
-    (test-equal 8 (gr:sizeof-stream-item ios1 1))
-
-    (test-equal 1 (gr:min-streams ios2))
-    (test-equal 2 (gr:max-streams ios2))
-    (test-equal 16 (gr:sizeof-stream-item ios2 0))
-    (test-equal 32 (gr:sizeof-stream-item ios2 1))
-
-    (test-equal 1 (gr:min-streams ios3))
-    (test-equal -1 (gr:max-streams ios3))
-    (test-equal 14 (gr:sizeof-stream-item ios3 0))
-    (test-equal 32 (gr:sizeof-stream-item ios3 1))
-    (test-equal 48 (gr:sizeof-stream-item ios3 2))
-    (test-equal '#(14 32 48) (gr:sizeof-stream-items ios3))
-
-    (test-equal 1 (gr:min-streams iosv))
-    (test-equal 4 (gr:max-streams iosv))
-    (test-equal 1 (gr:sizeof-stream-item iosv 0))
-    (test-equal 2 (gr:sizeof-stream-item iosv 1))
-    (test-equal 3 (gr:sizeof-stream-item iosv 2))
-    (test-equal 3 (gr:sizeof-stream-item iosv 3))
-    (test-equal '#(1 2 3) (gr:sizeof-stream-items iosv))
-    ))
-
diff --git a/gnuradio-core/src/guile/tests/00_runtime_ctors.test b/gnuradio-core/src/guile/tests/00_runtime_ctors.test
deleted file mode 100644
index 966d8c909..000000000
--- a/gnuradio-core/src/guile/tests/00_runtime_ctors.test
+++ /dev/null
@@ -1,54 +0,0 @@
-;;; -*- Scheme -*-
-;;;
-;;; Copyright 2010 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, see <http://www.gnu.org/licenses/>.
-;;;
-
-;;; If you're using Emacs's Scheme mode:
-;;;   (put 'with-test-prefix 'scheme-indent-function 1)
-
-;;; See the comments in gnuradio/test-suite/lib.scm for info on writing tests.
-;;; See also the very end of the file where the test-equal, test-eqv
-;;; and test-eq macros are defined.
-
-(use-modules (gnuradio test-suite lib))
-(use-modules (gnuradio core))
-(use-modules (oop goops))
-
-;;; Add test code for all constructors in these files
-;;;
-;;; ./runtime/gr_hier_block2.h
-
-;;; ./runtime/gr_msg_queue.h
-
-(define (equal-message? a b)
-  (equal? (gr:to-string a) (gr:to-string b)))
-
-(with-test-prefix "gr:message/gr:msg-queue"
-  (let ((msg1 (gr:message-from-string "Hello"))
-	(msg2 (gr:message-from-string "World!"))
-	(q (gr:msg-queue)))
-    (pass-if (equal? "Hello" (gr:to-string msg1)))
-    (pass-if (equal? "World!" (gr:to-string msg2)))
-    (pass-if (gr:empty-p q))
-    (gr:insert-tail q msg1)
-    (pass-if (not (gr:empty-p q)))
-    (gr:insert-tail q msg2)
-    (let ((r1 (gr:delete-head q))
-	  (r2 (gr:delete-head q)))
-      (pass-if (equal-message? r1 msg1))
-      (pass-if (equal-message? r2 msg2)))))
diff --git a/gnuradio-core/src/guile/tests/filter_ctors.test b/gnuradio-core/src/guile/tests/filter_ctors.test
deleted file mode 100644
index fe1d9421d..000000000
--- a/gnuradio-core/src/guile/tests/filter_ctors.test
+++ /dev/null
@@ -1,245 +0,0 @@
-;;; -*- Scheme -*-
-;;;
-;;; Copyright 2010 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, see <http://www.gnu.org/licenses/>.
-;;;
-
-;;; If you're using Emacs's Scheme mode:
-;;;   (put 'with-test-prefix 'scheme-indent-function 1)
-
-;;; See the comments in gnuradio/test-suite/lib.scm for info on writing tests.
-;;; See also the very end of the file, where the test-equal, test-eqv
-;;; and test-eq macros are defined.
-
-(use-modules (gnuradio test-suite lib))
-(use-modules (gnuradio core))
-(use-modules (oop goops))
-
-;;; Add test code for all constructors in these files
-;;;
-
-;;; ./filter/gr_adaptive_fir_ccf.h WONTFIX: not wrapped
-;; gr_adaptive_fir_ccf(char *name, int decimation, const std::vector<float> &taps);
-;; (pass-if (true? (gr:adaptive-fir-ccf "foo" 0 #(1.0 2.0 3.0 4.0))))
-
-;;; ./filter/gr_fft_filter_ccc.h
-(pass-if (true? (gr:fft-filter-ccc 0 #(1+3i 23+5i))))
-
-;;; ./filter/gr_fft_filter_fff.h
-(pass-if (true? (gr:fft-filter-fff 0 #(1.0 2.0))))
-
-;;; ./filter/gr_filter_delay_fc.h
-(pass-if (true? (gr:filter-delay-fc #(1.0 2.0))))
-
-;;; ./filter/gr_fir_ccc_generic. FIXME: Unbound variable: ~S" (gr:fir-ccc-generic) #f))
-;;  (pass-if (true? (gr:fir-ccc-generic)))
-;; (pass-if (true? (gr:fir-ccc-generic #(1+3i 23+5i))))
-
-;;; ./filter/gr_fir_ccc_simd.h FIXME: not found
-;; (pass-if (true? (gr:fir-ccc-simd)))
-;; (pass-if (true? (gr:fir-ccc-simd #(1+3i 23+5i))))
-
-;;; ./filter/gr_fir_ccc_x86.h FIXME: not found
-;; (pass-if (true? (gr:fir-ccc-x86)))
-;; (pass-if (true? (gr:fir-ccc-x86 #(1+3i 23+5i))))
-
-;;; ./filter/gr_fir_ccf_generic.h FIXME: not found
-;; (pass-if (true? (gr:fir-ccf-generic)))
-;; (pass-if (true? (gr:fir-ccf-generic #(1+3i 23+5i))))
-
-;;; ./filter/gr_fir_ccf_simd.h FIXME: not found
-;; (pass-if (true? (gr:fir-ccf-simd 0 0 0 0)))
-
-;;; ./filter/gr_fir_ccf_x86.h FIXME: not found
-;; (pass-if (true? (gr:fir-ccf-x86)))
-;; (pass-if (true? (gr:fir-ccf-x86 #(1.0 2.0))))
-
-;;; ./filter/gr_fir_fcc_generic.h FIXME: not found
-;; (pass-if (true? (gr:fir-fcc-generic)))
-;; (pass-if (true? (gr:fir-fcc-generic #(1+3i 23+5i))))
-
-;;; ./filter/gr_fir_fcc_simd.h FIXME: not found
-;; (pass-if (true? (gr:fir-fcc-simd 0 0 0 0)))
-
-;;; ./filter/gr_fir_fcc_x86.h FIXME: not found
-;; (pass-if (true? (gr:fir-fcc-x86)))
-;; (pass-if (true? (gr:fir-fcc-x86 #(1+3i 23+5i))))
-
-;;; ./filter/gr_fir_fff_altivec.h FIXME: not found
-;; (pass-if (true? (gr:fir-fff-altivec)))
-;; (pass-if (true? (gr:fir-fff-altivec #(1.0 2.0))))
-
-;;; ./filter/gr_fir_fff_armv7_a.h FIXME: not found
-;; (pass-if (true? (gr:fir-fff-armv7-a)))
-;; (pass-if (true? (gr:fir-fff-armv7-a #(1.0 2.0))))
-
-;;; ./filter/gr_fir_fff_generic.h FIXME: not found
-;; (pass-if (true? (gr:fir-fff-generic)))
-;; (pass-if (true? (gr:fir-fff-generic #(1.0 2.0))))
-
-;;; ./filter/gr_fir_fff_simd.h FIXME: not found
-;; (pass-if (true? (gr:fir-fff-simd 0 0 0)))
-
-;;; ./filter/gr_fir_fff_x86.h FIXME: not found
-;; (pass-if (true? (gr:fir-fff-x86)))
-;; (pass-if (true? (gr:fir-fff-x86 #(1.0 2.0))))
-
-;;; ./filter/gr_fir_filter_ccc.h FIXME: not found
-;; (pass-if (true? (gr:fir-filter-ccc 1 #(1+3i 23+5i))))
-
-;;; ./filter/gr_fir_filter_ccf.h
-(pass-if (true? (gr:fir-filter-ccf 1 #(1.0 2.0))))
-
-;;; ./filter/gr_fir_filter_fcc.h
-(pass-if (true? (gr:fir-filter-fcc 1 #(1+3i 23+5i))))
-
-;;; ./filter/gr_fir_filter_fff.h
-(pass-if (true? (gr:fir-filter-fff 1 #(1.0 2.0))))
-
-;;; ./filter/gr_fir_filter_fsf.h
-(pass-if (true? (gr:fir-filter-fsf 1 #(1.0 2.0))))
-
-;;; ./filter/gr_fir_filter_scc.h
-(pass-if (true? (gr:fir-filter-scc 1 #(1+3i 23+5i))))
-
-;;; ./filter/gr_fir_fsf_generic.h FIXME: "Unbound variable: ~S" (gr:fir-fsf-generic) #f))
-;; (pass-if (true? (gr:fir-fsf-generic)))
-;; (pass-if (true? (gr:fir-fsf-generic #(1.0 2.0))))
-
-;;; ./filter/gr_fir_fsf_simd.h FIXME: not found
-;; (pass-if (true? (gr:fir-fsf-simd 0 0 0)))
-
-;;; ./filter/gr_fir_fsf_x86.h FIXME: "Unbound variable: ~S" (gr:fir-fsf-x86) #f))
-;; (pass-if (true? (gr:fir-fsf-x86)))
-;; (pass-if (true? (gr:fir-fsf-x86  #(1.0 2.0))))
-
-;;; ./filter/gr_fir_scc_generic.h FIXME: file not found
-;; (pass-if (true? (gr:fir-scc-generic)))
-;; (pass-if (true? (gr:fir-scc-generic #(1+3i 23+5i))))
- 
-;;; ./filter/gr_fir_scc_simd.h FIXME: Unbound variable: ~S" (gr:fir-scc-simd) #f))
-;; (pass-if (true? (gr:fir-scc-simd)))
-;; (pass-if (true? (gr:fir-scc-simd #(1+3i 23+5i))))
-
-;;; ./filter/gr_fir_scc_x86.h FIXME: "Unbound variable: ~S" (gr:fir-scc-x86) #f))
-;; (pass-if (true? (gr:fir-scc-x86)))
-;; (pass-if (true? (gr:fir-scc-x86 #(1+3i 23+5i))))
-
-;;; ./filter/gr_fir_sysconfig_armv7_a.h FIXME: virtual methods
-;; (pass-if (true? (gr:fir-sysconfig-armv7-a )))
-
-;;; ./filter/gr_fir_sysconfig_generic.h FIXME: virtual methods
-;; (pass-if (true? (gr:fir-sysconfig-generic )))
-
-;;; ./filter/gr_fir_sysconfig_powerpc.h FIXME: virtual methods
-;; (pass-if (true? (gr:fir-sysconfig-powerpc )))
-
-;;; ./filter/gr_fir_sysconfig_x86.h FIXME: virtual methods
-;; (pass-if (true? (gr:fir-sysconfig-x86 #(1+3i 23+5i))))
-
-;;; ./filter/gr_fractional_interpolator_cc.h
-(pass-if (true? (gr:fractional-interpolator-cc 1.0 1.0)))
-
-;;; ./filter/gr_fractional_interpolator_ff.h
-(pass-if (true? (gr:fractional-interpolator-ff 1.0 1.0)))
-
-;;; ./filter/gr_freq_xlating_fir_filter_ccc.h 
-(pass-if (true? (gr:freq-xlating-fir-filter-ccc 1 #(1+3i 23+5i) 1.0 1.0)))
-
-;;; ./filter/gr_freq_xlating_fir_filter_ccf.h
-(pass-if (true? (gr:freq-xlating-fir-filter-ccf 1 #(1.0 2.0) 1.0 1.0)))
-
-;;; ./filter/gr_freq_xlating_fir_filter_fcc.h
-(pass-if (true? (gr:freq-xlating-fir-filter-fcc 1 #(1.0 2.0) 1.0 1.0)))
-
-;;; ./filter/gr_freq_xlating_fir_filter_fcf.h
-(pass-if (true? (gr:freq-xlating-fir-filter-fcf 1 #(1.0 2.0) 1.0 1.0)))
-
-;;; ./filter/gr_freq_xlating_fir_filter_scc.h
-(pass-if (true? (gr:freq-xlating-fir-filter-scc 1 #(1.0 2.0) 1.0 1.0)))
-
-;;; ./filter/gr_freq_xlating_fir_filter_scf.h
-(pass-if (true? (gr:freq-xlating-fir-filter-scf 1 #(1.0 2.0) 1.0 1.0)))
-
-;;; ./filter/gr_goertzel_fc.h
-(pass-if (true? (gr:goertzel-fc 1 1 1)))
-
-;;; ./filter/gr_hilbert_fc.h
-(pass-if (true? (gr:hilbert-fc 1)))
-
-;;; ./filter/gr_iir_filter_ffd.h
-(pass-if (true? (gr:iir-filter-ffd #(1.0 2.0) #(1.0 2.0))))
-
-;;; ./filter/gr_interp_fir_filter_ccc.h FIXME: not found
-;; (pass-if (true? (gr:interp-fir-filter-ccc #(1+3i 23+5i))))
-
-;;; ./filter/gr_interp_fir_filter_ccf.h FIXME: not found
-;; (pass-if (true? (gr:interp-fir-filter-ccf )))
-
-;;; ./filter/gr_interp_fir_filter_fcc.h FIXME: not found
-;; (pass-if (true? (gr:interp-fir-filter-fcc )))
-
-;;; ./filter/gr_interp_fir_filter_fff.h FIXME: not found
-;; (pass-if (true? (gr:interp-fir-filter-fff )))
-
-;;; ./filter/gr_interp_fir_filter_fsf.h FIXME: not found
-;; (pass-if (true? (gr:interp-fir-filter-fsf )))
-
-;;; ./filter/gr_interp_fir_filter_scc.h FIXME: not found
-;; (pass-if (true? (gr:interp-fir-filter-scc )))
-
-;;; ./filter/gr_pfb_arb_resampler_ccf.h
-(pass-if (true? (gr:pfb-arb-resampler-ccf 1.0 #(1.0 2.0) 32)))
-
-;;; ./filter/gr_pfb_channelizer_ccf.h
-(pass-if (true? (gr:pfb-channelizer-ccf 1 #(1.0 2.0) 1)))
-
-;;; ./filter/gr_pfb_clock_sync_ccf.h
-(pass-if (true? (gr:pfb-clock-sync-ccf 1.0 1.0 #(1.0 2.0) 32 0 1.5)))
-
-;;; ./filter/gr_pfb_clock_sync_fff.h
-(pass-if (true? (gr:pfb-clock-sync-fff 1.0 1.0 #(1.0 2.0) 32 0 1.5)))
-
-;;; ./filter/gr_pfb_decimator_ccf.h
-(pass-if (true? (gr:pfb-decimator-ccf 1 #(1.0 2.0) 0)))
-
-;;; ./filter/gr_pfb_interpolator_ccf.h
-(pass-if (true? (gr:pfb-interpolator-ccf 1 #(1.0 2.0))))
-
-;;; ./filter/gr_rational_resampler_base_ccc.h FIXME: not found
-;; (pass-if (true? (gr:rational-resampler-base-ccc 1 1 #(1+3i 23+5i))))
-
-;;; ./filter/gr_rational_resampler_base_ccf.h FIXME: not found
-;; (pass-if (true? (gr:rational-resampler-base-ccf )))
-
-;;; ./filter/gr_rational_resampler_base_fcc.h FIXME: not found
-;; (pass-if (true? (gr:rational-resampler-base-fcc )))
-
-;;; ./filter/gr_rational_resampler_base_fff.h FIXME: not found
-;; (pass-if (true? (gr:rational-resampler-base-fff )))
-
-;;; ./filter/gr_rational_resampler_base_fsf.h FIXME: not found
-;; (pass-if (true? (gr:rational-resampler-base-fsf )))
-
-;;; ./filter/gr_rational_resampler_base_scc.h FIXME: not found
-;; (pass-if (true? (gr:rational-resampler-base-scc )))
-
-;;; ./filter/gr_single_pole_iir_filter_cc.h
-(pass-if (true? (gr:single-pole-iir-filter-cc 1.0 1)))
-
-;;; ./filter/gr_single_pole_iir_filter_ff.h
-(pass-if (true? (gr:single-pole-iir-filter-ff 1.0 1)))
diff --git a/gnuradio-core/src/guile/tests/general_ctors.test b/gnuradio-core/src/guile/tests/general_ctors.test
deleted file mode 100644
index ca4d60460..000000000
--- a/gnuradio-core/src/guile/tests/general_ctors.test
+++ /dev/null
@@ -1,348 +0,0 @@
-;;; -*- Scheme -*-
-;;;
-;;; Copyright 2010 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, see <http://www.gnu.org/licenses/>.
-;;;
-
-;;; If you're using Emacs's Scheme mode:
-;;;   (put 'with-test-prefix 'scheme-indent-function 1)
-
-;;; See the comments in gnuradio/test-suite/lib.scm for info on writing tests.
-;;; See also the very end of the file, where the test-equal, test-eqv
-;;; and test-eq macros are defined.
-
-(use-modules (gnuradio test-suite lib))
-(use-modules (gnuradio core))
-(use-modules (oop goops))
-(use-modules (ice-9 format))
-
-
-;;; Test complex<float> scalars
-(pass-if (equal? 5.0+5.0i (gr:complex-scalar-test0)))
-(pass-if (equal? 1.5+0.5i (gr:complex-scalar-test1 1+1i)))
-
-;;; Test complex<float> vectors
-(pass-if (verbose-equal? #(0+0i 1+1i 2+2i 3+3i 4+4i)
-			 (gr:complex-vec-test0)))
-
-(pass-if (verbose-equal? #(1.5+0.5i 2.5+1.5i 3.5+2.5i)
-			 (gr:complex-vec-test1 #(1+1i 2+2i 3+3i))))
-
-
-;;; Add test code for all constructors in these files
-
-;;; ./general/gr_additive_scrambler_bb.h
-(pass-if (true? (gr:additive-scrambler-bb 0 0 0 0)))
-
-;; Here's one that will throw if its arg is 0
-(pass-if (true? (gr:unpack-k-bits-bb 10)))
-(pass-if-throw "confirm throw gr:unpack-k-bits-bb" #t (true? (gr:unpack-k-bits-bb 0)))
-
-;;; ./general/gr_agc2_cc.h
-(pass-if (true? (gr:agc2-cc 1e-1 1e-2 1.0 1.0 0.0)))
-
-;;; ./general/gr_agc2_ff.h
-(pass-if (true? (gr:agc2-ff 0 0 0 0 0)))
-
-;;; ./general/gr_agc_cc.h
-(pass-if (true? (gr:agc-cc 0 0 0 0)))
-
-;;; ./general/gr_agc_ff.h
-(pass-if (true? (gr:agc-ff 0 0 0 0)))
-
-;;; ./general/gr_align_on_samplenumbers_ss.h
-(pass-if (true? (gr:align-on-samplenumbers-ss 2 128)))
-(pass-if-throw "confirm throw gr:align-on-samplenumbers-ss" #t (true? (gr:align-on-samplenumbers-ss 0 0)))
-
-;;; ./general/gr_bin_statistics_f.h WONTFIX: requires gr_feval_dd & swig directors
-;;;(pass-if (true? (gr:bin-statistics-f 1 (gr:msg-queue) 0 0 0)))
-
-;;; ./general/gr_bytes_to_syms.h
-(pass-if (true? (gr:bytes-to-syms)))
-
-;;; ./general/gr_char_to_float.h
-(pass-if (true? (gr:char-to-float)))
-
-;;; ./general/gr_check_counting_s.h
-(pass-if (true? (gr:check-counting-s #f)))
-
-;;; ./general/gr_check_lfsr_32k_s.h
-(pass-if (true? (gr:check-lfsr-32k-s)))
-
-;;; ./general/gr_complex_to_interleaved_short.h
-(pass-if (true? (gr:complex-to-interleaved-short)))
-
-;;; ./general/gr_complex_to_xxx.h
-(pass-if (true? (gr:complex-to-float 1)))
-(pass-if (true? (gr:complex-to-real 1)))
-(pass-if (true? (gr:complex-to-imag 1)))
-(pass-if (true? (gr:complex-to-mag 1)))
-(pass-if (true? (gr:complex-to-mag-squared 1)))
-(pass-if (true? (gr:complex-to-arg 1)))
-
-;;; ./general/gr_conjugate_cc.h
-(pass-if (true? (gr:conjugate-cc)))
-
-;;; ./general/gr_copy.h
-(pass-if (true? (gr:copy 1)))
-
-;;; ./general/gr_cpfsk_bc.h
-(pass-if (true? (gr:cpfsk-bc 1 1 1)))
-
-;;; ./general/gr_ctcss_squelch_ff.h
-(pass-if (true? (gr:ctcss-squelch-ff 0 0 0 0 0 #t)))
-
-;;; ./general/gr_decode_ccsds_27_fb.h
-(pass-if (true? (gr:decode-ccsds-27-fb)))
-
-;;; ./general/gr_deinterleave.h
-(pass-if (true? (gr:deinterleave 1)))
-
-;;; ./general/gr_delay.h
-(pass-if (true? (gr:delay 1 1)))
- 
-;;; ./general/gr_descrambler_bb.h
-(pass-if (true? (gr:descrambler-bb 0 0 0)))
-
-;;; ./general/gr_diff_decoder_bb.h
-(pass-if (true? (gr:diff-decoder-bb 0)))
-
-;;; ./general/gr_diff_encoder_bb.h
-(pass-if (true? (gr:diff-encoder-bb 0)))
-
-;;; ./general/gr_diff_phasor_cc.h
-(pass-if (true? (gr:diff-phasor-cc)))
-
-;;; ./general/gr_dpll_bb.h
-(pass-if (true? (gr:dpll-bb 0 0)))
-
-;;; ./general/gr_encode_ccsds_27_bb.h
-(pass-if (true? (gr:encode-ccsds-27-bb)))
-
-;;; ./general/gr_fake_channel_coder_pp.h
-(pass-if (true? (gr:fake-channel-encoder-pp 1 1)))
-(pass-if-throw "confirm throw" #t (true? (gr:fake-channel-encoder-pp -1 1)))
-
-;;; ./general/gr_feedforward_agc_cc.h
-(pass-if (true? (gr:feedforward-agc-cc 1 1)))
-
-;;; ./general/gr_fft_vcc.h
-(pass-if (true? (gr:fft-vcc 1 #f #(1.0 2.0) #t)))
-
-;;; ./general/gr_fft_vfc.h
-(pass-if (true? (gr:fft-vfc 4 #t #(1.0 2.0 3.0 4.0))))
-(pass-if-throw "confirm throw gr:fft-vfc" #t (true? (gr:fft-vfc 4 #f #(1.0 2.0 3.0 4.0))))
-
-;; ;;; ./general/gr_float_to_char.h
-(pass-if (true? (gr:float-to-char)))
-
-;; ;;; ./general/gr_float_to_complex.h
-(pass-if (true? (gr:float-to-complex 1)))
-
-;;; ./general/gr_float_to_short.h
-(pass-if (true? (gr:float-to-short)))
-
-;;; ./general/gr_float_to_uchar.h
-(pass-if (true? (gr:float-to-uchar)))
-
-;;; ./general/gr_fmdet_cf.h
-(pass-if (true? (gr:fmdet-cf 0 0 0 0)))
-
-;;; ./general/gr_framer_sink_1.h
-(pass-if (true? (gr:framer-sink-1 (gr:msg-queue))))
-
-;;; ./general/gr_frequency_modulator_fc.h
-(pass-if (true? (gr:frequency-modulator-fc 0)))
-
-;;; ./general/gr_glfsr_source_b.h
-(pass-if (true? (gr:glfsr-source-b 1 #t 0 1)))
-(pass-if-throw "confirm throw" #t (true? (gr:glfsr_source_b 33 #t 0 0)))
-
-;;; ./general/gr_glfsr_source_f.h
-(pass-if (true? (gr:glfsr-source-f 1 #t 1 1)))
-(pass-if-throw "confirm throw" #t (true? (gr:glfsr_source_f 33 #t 0 0)))
-
-;;; ./general/gr_head.h
-(pass-if (true? (gr:head 1 1)))
-
-;;; ./general/gr_interleave.h
-(pass-if (true? (gr:interleave 1)))
-
-;;; ./general/gr_interleaved_short_to_complex.h
-(pass-if (true? (gr:interleaved-short-to-complex)))
-
-;;; ./general/gr_keep_one_in_n.h
-(pass-if (true? (gr:keep-one-in-n 1 1)))
-
-;;; ./general/gr_kludge_copy.h
-(pass-if (true? (gr:kludge-copy 1)))
-
-;;; ./general/gr_lfsr_32k_source_s.h
-(pass-if (true? (gr:lfsr-32k-source-s)))
-
-;;; ./general/gr_map_bb.h
-(pass-if (true? (gr:map-bb #(1 2))))
-
-;;; ./general/gr_nlog10_ff.h
-(pass-if (true? (gr:nlog10-ff 1 1 1)))
-
-;;; ./general/gr_nop.h
-(pass-if (true? (gr:nop 1)))
-
-;;; ./general/gr_null_sink.h
-(pass-if (true? (gr:null-sink 1)))
-
-;;; ./general/gr_null_source.h
-(pass-if (true? (gr:null-source 1)))
-
-;;; ./general/gr_pa_2x2_phase_combiner.h
-(pass-if (true? (gr:pa-2x2-phase-combiner)))
-
-;;; ./general/gr_packet_sink.h
-(pass-if (true? (gr:packet-sink #(1 2) (gr:msg-queue) -1)))
-
-;;; ./general/gr_peak_detector2_fb.h
-(pass-if (true? (gr:peak-detector2-fb 0 0 0)))
-
-;;; ./general/gr_phase_modulator_fc.h
-(pass-if (true? (gr:phase-modulator-fc 0)))
-
-;;; ./general/gr_pll_carriertracking_cc.h
-(pass-if (true? (gr:pll-carriertracking-cc 0 0 0)))
-
-;;; ./general/gr_pll_freqdet_cf.h
-(pass-if (true? (gr:pll-freqdet-cf 0 0 0)))
-
-;;; ./general/gr_pll_refout_cc.h
-(pass-if (true? (gr:pll-refout-cc 0 0 0)))
-
-;;; ./general/gr_pn_correlator_cc.h
-(pass-if (true? (gr:pn-correlator-cc 1 1 1)))
-
-;;; ./general/gr_probe_avg_mag_sqrd_c.h
-(pass-if (true? (gr:probe-avg-mag-sqrd-c 0 0)))
-
-;;; ./general/gr_probe_avg_mag_sqrd_cf.h
-(pass-if (true? (gr:probe-avg-mag-sqrd-cf 0 0)))
-
-;;; ./general/gr_probe_avg_mag_sqrd_f.h
-(pass-if (true? (gr:probe-avg-mag-sqrd-f 0 0)))
-
-;;; ./general/gr_probe_density_b.h
-(pass-if (true? (gr:probe-density-b 0)))
-
-;;; ./general/gr_probe_mpsk_snr_c.h
-(pass-if (true? (gr:probe-mpsk-snr-c 0)))
-
-;;; ./general/gr_probe_signal_f.h
-(pass-if (true? (gr:probe-signal-f)))
-
-;;; ./general/gr_pwr_squelch_cc.h
-(pass-if (true? (gr:pwr-squelch-cc 0 0 0 #f)))
-
-;;; ./general/gr_pwr_squelch_ff.h
-(pass-if (true? (gr:pwr-squelch-ff 0.0 0.0 0 #f)))
-
-;;; ./general/gr_quadrature_demod_cf.h
-(pass-if (true? (gr:quadrature-demod-cf 0)))
-
-;;; ./general/gr_rail_ff.h
-(pass-if (true? (gr:rail-ff 0 0)))
-
-;;; ./general/gr_regenerate_bb.h
-(pass-if (true? (gr:regenerate-bb 0 0)))
-
-;;; ./general/gr_repeat.h
-(pass-if (true? (gr:repeat 1 1)))
-
-;;; ./general/gr_rms_cf.h
-(pass-if (true? (gr:rms-cf 0)))
-
-;;; ./general/gr_rms_ff.h
-(pass-if (true? (gr:rms-ff 0)))
-
-;;; ./general/gr_scrambler_bb.h
-(pass-if (true? (gr:scrambler-bb 0 0 0)))
-
-;;; ./general/gr_short_to_float.h
-(pass-if (true? (gr:short-to-float)))
-
-;;; ./general/gr_simple_correlator.h
-(pass-if (true? (gr:simple-correlator 0)))
-
-;;; ./general/gr_simple_framer.h
-(pass-if (true? (gr:simple-framer 0)))
-
-;;; ./general/gr_simple_squelch_cc.h
-(pass-if (true? (gr:simple-squelch-cc 0 0)))
-
-;;; ./general/gr_skiphead.h
-(pass-if (true? (gr:skiphead 1 1)))
-
-;;; ./general/gr_squash_ff.h
-(pass-if (true? (gr:squash-ff #(1.0 2.0 3.0 4.0 5.0) #(1.0 2.0 3.0 4.0 5.0))))
-
-;;; ./general/gr_squelch_base_cc.h WONTFIX: not wrapped
-;;; (pass-if (true? (gr:squelch-base-cc "foo" 0 #f)))
-
-;;; ./general/gr_squelch_base_ff.h WONTFIX: not wrapped
-;; (pass-if (true? (gr:squelch-base-ff "foo" 0 #f)))
-
-;;; ./general/gr_stream_mux.h
-(pass-if (true? (gr:stream-mux 1 #(1 2))))
-
-;;; ./general/gr_stream_to_streams.h
-(pass-if (true? (gr:stream-to-streams 1 1)))
-
-;;; ./general/gr_stream_to_vector.h
-(pass-if (true? (gr:stream-to-vector 1 1)))
-
-;;; ./general/gr_streams_to_stream.h
-(pass-if (true? (gr:streams-to-stream 1 1)))
-
-;;; ./general/gr_streams_to_vector.h
-(pass-if (true? (gr:streams-to-vector 1 1)))
-
-;;; ./general/gr_stretch_ff.h
-(pass-if (true? (gr:stretch-ff 1 1)))
-
-;;; ./general/gr_test.h
-(pass-if (true? (gr:test "foo" 1 1 1 1 1 1 1 1)))
-
-;;; ./general/gr_threshold_ff.h
-(pass-if (true? (gr:threshold-ff 0 0)))
-
-;;; ./general/gr_throttle.h
-(pass-if (true? (gr:throttle 1 1)))
-
-;;; ./general/gr_uchar_to_float.h
-(pass-if (true? (gr:uchar-to-float)))
-
-;;; ./general/gr_vco_f.h
-(pass-if (true? (gr:vco-f 0 0 0)))
-
-;;; ./general/gr_vector_to_stream.h
-(pass-if (true? (gr:vector-to-stream 1 1)))
-
-;;; ./general/gr_vector_to_streams.h
-(pass-if (true? (gr:vector-to-streams 1 1)))
-
-;;; ./general/gr_wavelet_ff.h
-(pass-if (true? (gr:wavelet-ff 1024 20 #t)))
-
-;;; ./general/gr_wvps_ff.h
-(pass-if (true? (gr:wvps-ff 2)))
diff --git a/gnuradio-core/src/guile/tests/gengen_ctors.test b/gnuradio-core/src/guile/tests/gengen_ctors.test
deleted file mode 100644
index 6e1213c63..000000000
--- a/gnuradio-core/src/guile/tests/gengen_ctors.test
+++ /dev/null
@@ -1,342 +0,0 @@
-;;; -*- Scheme -*-
-;;;
-;;; Copyright 2010 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, see <http://www.gnu.org/licenses/>.
-;;;
-
-;;; If you're using Emacs's Scheme mode:
-;;;   (put 'with-test-prefix 'scheme-indent-function 1)
-
-;;; See the comments in gnuradio/test-suite/lib.scm for info on writing tests.
-;;; See also the very end of the file, where the test-equal, test-eqv
-;;; and test-eq macros are defined.
-
-(use-modules (gnuradio test-suite lib))
-(use-modules (gnuradio core))
-(use-modules (oop goops))
-
-;;; Add test code for all constructors in these files
-;;;
-
-;;; ./gengen/gr_add_cc.h
-(pass-if (true? (gr:add-cc 1)))
-
-;;; ./gengen/gr_add_const_cc.h
-(pass-if (true? (gr:add-const-cc 0)))
-
-;;; ./gengen/gr_add_const_ff.h
-(pass-if (true? (gr:add-const-ff 0)))
-
-;;; ./gengen/gr_add_const_ii.h
-(pass-if (true? (gr:add-const-ii 0)))
-
-;;; ./gengen/gr_add_const_sf.h
-(pass-if (true? (gr:add-const-sf 0)))
-
-;;; ./gengen/gr_add_const_ss.h
-(pass-if (true? (gr:add-const-ss 0)))
-
-;;; ./gengen/gr_add_const_vcc.h
-(pass-if (true? (gr:add-const-vcc #(1+3i 23+5i))))
-
-;;; ./gengen/gr_add_const_vff.h
-(pass-if (true? (gr:add-const-vff #(1.0 2.0))))
-
-;;; ./gengen/gr_add_const_vii.h
-(pass-if (true? (gr:add-const-vii #(1 2))))
-
-;;; ./gengen/gr_add_const_vss.h
-(pass-if (true? (gr:add-const-vss #(1 2))))
-
-;;; ./gengen/gr_add_ff.h
-(pass-if (true? (gr:add-ff 1)))
-
-;;; ./gengen/gr_add_ii.h
-(pass-if (true? (gr:add-ii 1)))
-
-;;; ./gengen/gr_add_ss.h
-(pass-if (true? (gr:add-ss 1)))
-
-;;; ./gengen/gr_and_bb.h
-(pass-if (true? (gr:and-bb)))
-
-;;; ./gengen/gr_and_const_bb.h
-(pass-if (true? (gr:and-const-bb 0)))
-
-;;; ./gengen/gr_and_const_ii.h
-(pass-if (true? (gr:and-const-ii 0)))
-
-;;; ./gengen/gr_and_const_ss.h
-(pass-if (true? (gr:and-const-ss 0)))
-
-;;; ./gengen/gr_and_ii.h
-(pass-if (true? (gr:and-ii)))
-
-;;; ./gengen/gr_and_ss.h
-(pass-if (true? (gr:and-ss)))
-
-;;; ./gengen/gr_argmax_fs.h
-(pass-if (true? (gr:argmax-fs 1)))
-
-;;; ./gengen/gr_argmax_is.h
-(pass-if (true? (gr:argmax-is 1)))
-
-;;; ./gengen/gr_argmax_ss.h
-(pass-if (true? (gr:argmax-ss 1)))
-
-;;; ./gengen/gr_chunks_to_symbols_bc.h
-(pass-if (true? (gr:chunks-to-symbols-bc #(1+3i 23+5i) 1)))
-
-;;; ./gengen/gr_chunks_to_symbols_bf.h
-(pass-if (true? (gr:chunks-to-symbols-bf #(1.0 2.0) 1)))
-
-;;; ./gengen/gr_chunks_to_symbols_ic.h
-(pass-if (true? (gr:chunks-to-symbols-ic #(1+3i 23+5i) 1)))
-
-;;; ./gengen/gr_chunks_to_symbols_if.h
-(pass-if (true? (gr:chunks-to-symbols-if #(1.0 2.0) 1)))
-
-;;; ./gengen/gr_chunks_to_symbols_sc.h
-(pass-if (true? (gr:chunks-to-symbols-sc #(1.0 2.0) 1)))
-
-;;; ./gengen/gr_chunks_to_symbols_sf.h
-(pass-if (true? (gr:chunks-to-symbols-sf #(1.0 2.0) 1)))
-
-;;; ./gengen/gr_divide_cc.h
-(pass-if (true? (gr:divide-cc 1)))
-
-;;; ./gengen/gr_divide_ff.h
-(pass-if (true? (gr:divide-ff 1)))
-
-;;; ./gengen/gr_divide_ii.h
-(pass-if (true? (gr:divide-ii 1)))
-
-;;; ./gengen/gr_divide_ss.h
-(pass-if (true? (gr:divide-ss 1)))
-
-;;; ./gengen/gr_integrate_cc.h
-(pass-if (true? (gr:integrate-cc 0)))
-
-;;; ./gengen/gr_integrate_ff.h
-(pass-if (true? (gr:integrate-ff 0)))
-
-;;; ./gengen/gr_integrate_ii.h
-(pass-if (true? (gr:integrate-ii 0)))
-
-;;; ./gengen/gr_integrate_ss.h
-(pass-if (true? (gr:integrate-ss 0)))
-
-;;; ./gengen/gr_max_ff.h
-(pass-if (true? (gr:max-ff 1)))
-
-;;; ./gengen/gr_max_ii.h
-(pass-if (true? (gr:max-ii 1)))
-
-;;; ./gengen/gr_max_ss.h
-(pass-if (true? (gr:max-ss 1)))
-
-;;; ./gengen/gr_moving_average_cc.h
-(pass-if (true? (gr:moving-average-cc 1 1+3i 4096)))
-
-;;; ./gengen/gr_moving_average_ff.h
-(pass-if (true? (gr:moving-average-ff 1 0 4096)))
-
-;;; ./gengen/gr_moving_average_ii.h
-(pass-if (true? (gr:moving-average-ii 1 0 4096)))
-
-;;; ./gengen/gr_moving_average_ss.h
-(pass-if (true? (gr:moving-average-ss 1 0 4096)))
-
-;;; ./gengen/gr_multiply_cc.h
-(pass-if (true? (gr:multiply-cc 1)))
-
-;;; ./gengen/gr_multiply_const_cc.h
-(pass-if (true? (gr:multiply-const-cc 1)))
-
-;;; ./gengen/gr_multiply_const_ff.h
-(pass-if (true? (gr:multiply-const-ff 1)))
-
-;;; ./gengen/gr_multiply_const_ii.h
-(pass-if (true? (gr:multiply-const-ii 1)))
-
-;;; ./gengen/gr_multiply_const_ss.h
-(pass-if (true? (gr:multiply-const-ss 1)))
-
-;;; ./gengen/gr_multiply_const_vcc.h
-(pass-if (true? (gr:multiply-const-vcc #(1+3i 23+5i))))
-
-;;; ./gengen/gr_multiply_const_vff.h
-(pass-if (true? (gr:multiply-const-vff #(1.0 2.0))))
-
-;;; ./gengen/gr_multiply_const_vii.h
-(pass-if (true? (gr:multiply-const-vii #(1 2))))
-
-;;; ./gengen/gr_multiply_const_vss.h
-(pass-if (true? (gr:multiply-const-vss #(1 2))))
-
-;;; ./gengen/gr_multiply_ff.h
-(pass-if (true? (gr:multiply-ff 1)))
-
-;;; ./gengen/gr_multiply_ii.h
-(pass-if (true? (gr:multiply-ii 1)))
-
-;;; ./gengen/gr_multiply_ss.h
-(pass-if (true? (gr:multiply-ss 1)))
-
-;;; ./gengen/gr_mute_cc.h FIXME: not found
-(pass-if (true? (gr:mute-cc #f)))
-
-;;; ./gengen/gr_mute_ff.h FIXME: not found
-(pass-if (true? (gr:mute-ff #f)))
-
-;;; ./gengen/gr_mute_ii.h FIXME: not found
-(pass-if (true? (gr:mute-ii #f)))
-
-;;; ./gengen/gr_mute_ss.h FIXME: not found
-(pass-if (true? (gr:mute-ss #f)))
-
-;;; ./gengen/gr_noise_source_c.h
-(pass-if (true? (gr:noise-source-c 1 0 3021)))
-
-;;; ./gengen/gr_noise_source_f.h
-(pass-if (true? (gr:noise-source-f 1 0 3021)))
-
-;;; ./gengen/gr_noise_source_i.h
-(pass-if (true? (gr:noise-source-i 1 0 3021)))
-
-;;; ./gengen/gr_noise_source_s.h
-(pass-if (true? (gr:noise-source-s 1 0 3021)))
-
-;;; ./gengen/gr_not_bb.h
-(pass-if (true? (gr:not-bb)))
-
-;;; ./gengen/gr_not_ii.h
-(pass-if (true? (gr:not-ii)))
-
-;;; ./gengen/gr_not_ss.h
-(pass-if (true? (gr:not-ss)))
-
-;;; ./gengen/gr_or_bb.h
-(pass-if (true? (gr:or-bb)))
-
-;;; ./gengen/gr_or_ii.h
-(pass-if (true? (gr:or-ii)))
-
-;;; ./gengen/gr_or_ss.h
-(pass-if (true? (gr:or-ss)))
-
-;;; ./gengen/gr_packed_to_unpacked_bb.h
-(pass-if (true? (gr:packed-to-unpacked-bb 1 1)))
-
-;;; ./gengen/gr_packed_to_unpacked_ii.h
-(pass-if (true? (gr:packed-to-unpacked-ii 1 1)))
-
-;;; ./gengen/gr_packed_to_unpacked_ss.h
-(pass-if (true? (gr:packed-to-unpacked-ss 1 1)))
-
-;;; ./gengen/gr_peak_detector_fb.h
-(pass-if (true? (gr:peak-detector-fb 0.25 0.40 10 0.001)))
-
-;;; ./gengen/gr_peak_detector_ib.h
-(pass-if (true? (gr:peak-detector-ib 0.25 0.40 10 0.001)))
-
-;;; ./gengen/gr_peak_detector_sb.h
-(pass-if (true? (gr:peak-detector-sb 0.25 0.40 10 0.001)))
-
-;;; ./gengen/gr_sample_and_hold_bb.h
-(pass-if (true? (gr:sample-and-hold-bb)))
-
-;;; ./gengen/gr_sample_and_hold_ff.h
-(pass-if (true? (gr:sample-and-hold-ff)))
-
-;;; ./gengen/gr_sample_and_hold_ii.h
-(pass-if (true? (gr:sample-and-hold-ii)))
-
-;;; ./gengen/gr_sample_and_hold_ss.h
-(pass-if (true? (gr:sample-and-hold-ss)))
-
-;;; ./gengen/gr_sig_source_c.h
-(pass-if (true? (gr:sig-source-c 0 0 0 0 0)))
-
-;;; ./gengen/gr_sig_source_f.h
-(pass-if (true? (gr:sig-source-f 0 0 0 0 0)))
-
-;;; ./gengen/gr_sig_source_i.h
-(pass-if (true? (gr:sig-source-i 0 0 0 0 0)))
-
-;;; ./gengen/gr_sig_source_s.h
-(pass-if (true? (gr:sig-source-s 0 0 0 0 0)))
-
-;;; ./gengen/gr_sub_cc.h
-(pass-if (true? (gr:sub-cc 1)))
-
-;;; ./gengen/gr_sub_ff.h
-(pass-if (true? (gr:sub-ff 1)))
-
-;;; ./gengen/gr_sub_ii.h
-(pass-if (true? (gr:sub-ii 1)))
-
-;;; ./gengen/gr_sub_ss.h
-(pass-if (true? (gr:sub-ss 1)))
-
-;;; ./gengen/gr_unpacked_to_packed_bb.h
-(pass-if (true? (gr:unpacked-to-packed-bb 1 1)))
-
-;;; ./gengen/gr_unpacked_to_packed_ii.h
-(pass-if (true? (gr:unpacked-to-packed-ii 1 1)))
-
-;;; ./gengen/gr_unpacked_to_packed_ss.h
-(pass-if (true? (gr:unpacked-to-packed-ss 1 1)))
-
-;;; ./gengen/gr_vector_sink_b.h
-(pass-if (true? (gr:vector-sink-b 1)))
-
-;;; ./gengen/gr_vector_sink_c.h
-(pass-if (true? (gr:vector-sink-c 1)))
-
-;;; ./gengen/gr_vector_sink_f.h
-(pass-if (true? (gr:vector-sink-f 1)))
-
-;;; ./gengen/gr_vector_sink_i.h
-(pass-if (true? (gr:vector-sink-i 1)))
-
-;;; ./gengen/gr_vector_sink_s.h
-(pass-if (true? (gr:vector-sink-s 1)))
-
-;;; ./gengen/gr_vector_source_b.h
-;; (pass-if (true? (gr:vector-source-b #(1 2) #f 1)))
-
-;; ;;; ./gengen/gr_vector_source_c.h
-;; (pass-if (true? (gr:vector-source-c #(1+3i 23+5i) #f 1)))
-
-;; ;;; ./gengen/gr_vector_source_f.h
-;; (pass-if (true? (gr:vector-source-f #(1.0 2.0) #f 1)))
-
-;;; ./gengen/gr_vector_source_i.h
-;; (pass-if (true? (gr:vector-source-i #(1 2) #f 1)))
-
-;;; ./gengen/gr_vector_source_s.h FIXME: not found
-;; (pass-if (true? (gr:vector-source-s #(1 2) #f 1)))
-
-;;; ./gengen/gr_xor_bb.h
-(pass-if (true? (gr:xor-bb)))
-
-;;; ./gengen/gr_xor_ii.h
-(pass-if (true? (gr:xor-ii)))
-
-;;; ./gengen/gr_xor_ss.h
-(pass-if (true? (gr:xor-ss)))
diff --git a/gnuradio-core/src/guile/tests/hier_ctors.test b/gnuradio-core/src/guile/tests/hier_ctors.test
deleted file mode 100644
index b79ee0f15..000000000
--- a/gnuradio-core/src/guile/tests/hier_ctors.test
+++ /dev/null
@@ -1,40 +0,0 @@
-;;; -*- Scheme -*-
-;;;
-;;; Copyright 2010 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, see <http://www.gnu.org/licenses/>.
-;;;
-
-;;; If you're using Emacs's Scheme mode:
-;;;   (put 'with-test-prefix 'scheme-indent-function 1)
-
-;;; See the comments in gnuradio/test-suite/lib.scm for info on writing tests.
-;;; See also the very end of the file, where the test-equal, test-eqv
-;;; and test-eq macros are defined.
-
-(use-modules (gnuradio test-suite lib))
-(use-modules (gnuradio core))
-(use-modules (oop goops))
-
-;;; Add test code for all constructors in these files
-;;;
-
-;;; ./hier/gr_channel_model.h FIXME: Unbound variable: ~S" (gr:channel_model) #f))
-;; gr_make_channel_model(double noise_voltage=0.0, double frequency_offset=0.0,
-;;                       double epsilon=1.0,
-;; 		      const std::vector<gr_complex> &taps=std::vector<gr_complex>(1, 1),
-;;                       double noise_seed=3021);
-;; (pass-if (true? (gr:channel_model 0.0 0.0 1.0 #(1 1) 3021)))
diff --git a/gnuradio-core/src/guile/tests/io_ctors.test b/gnuradio-core/src/guile/tests/io_ctors.test
deleted file mode 100644
index 5f40d321c..000000000
--- a/gnuradio-core/src/guile/tests/io_ctors.test
+++ /dev/null
@@ -1,82 +0,0 @@
-;;; -*- Scheme -*-
-;;;
-;;; Copyright 2010 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, see <http://www.gnu.org/licenses/>.
-;;;
-
-;;; If you're using Emacs's Scheme mode:
-;;;   (put 'with-test-prefix 'scheme-indent-function 1)
-
-;;; See the comments in gnuradio/test-suite/lib.scm for info on writing tests.
-;;; See also the very end of the file, where the test-equal, test-eqv
-;;; and test-eq macros are defined.
-
-(use-modules (gnuradio test-suite lib))
-(use-modules (gnuradio core))
-(use-modules (oop goops))
-
-
-(define (rm-foo)
-  (false-if-exception (delete-file "foo")))
-
-;;; Add test code for all constructors in these files
-;;;
-
-;;; ./io/gr_file_descriptor_sink.h
-(pass-if (true? (gr:file-descriptor-sink 1 (dup 1))))
-
-;;; ./io/gr_file_descriptor_source.h
-(pass-if (true? (gr:file-descriptor-source 1 (dup 0) #f)))
-
-;;; ./io/gr_file_sink.h
-(pass-if (true? (gr:file-sink 1 "foo")))
-
-;;; ./io/gr_file_source.h
-(pass-if (true? (gr:file-source 1 "foo" #f)))
-(rm-foo)
-
-;;; ./io/gr_histo_sink_f.h
-;; gr_make_histo_sink_f (gr_msg_queue_sptr msgq);
-(pass-if (true? (gr:histo-sink-f (gr:msg-queue))))
-
-;;; ./io/gr_message_sink.h
-(pass-if (true? (gr:message-sink 1 (gr:msg-queue) #f)))
-
-;;; ./io/gr_message_source.h
-(pass-if (true? (gr:message-source 1 1)))
-(pass-if (true? (gr:message-source 1 (gr:msg-queue))))
-
-;;; ./io/gr_oscope_sink_f.h
-(pass-if (true? (gr:oscope-sink-f 1000 (gr:msg-queue))))
-
-;;; ./io/gr_udp_sink.h
-;;(pass-if (true? (gr:udp-sink 4 "localhost" 80 1472 #f)))
-;;(pass-if-throw "confirm throw gr:udp-sink" #t
-;;  (true? (gr:udp-sink 4 "localhostx" 80 1472 #f)))
-
-;;; ./io/gr_udp_source.h
-;;(pass-if (true? (gr:udp-source 4 "localhost" 0 1472 #f #t)))
-;;(pass-if-throw "confirm throw gr:udp-source" #t
-;;  (true? (gr:udp-source 4 "localhostx" 0 1472 #f #t)))
-
-;;; ./io/gr_wavfile_sink.h
-(pass-if (true? (gr:wavfile-sink "foo" 2 48000 16)))
-
-;;; ./io/gr_wavfile_source.h WONTFIX: buggy source won't accept file
-;;;                                   created immediately above.
-;;(pass-if (true? (gr:wavfile-source "foo" #f)))
-(rm-foo)
diff --git a/gnuradio-core/src/lib/.gitignore b/gnuradio-core/src/lib/.gitignore
deleted file mode 100644
index 0d5077da5..000000000
--- a/gnuradio-core/src/lib/.gitignore
+++ /dev/null
@@ -1,7 +0,0 @@
-/Makefile
-/Makefile.in
-/.deps
-/.libs
-/*.la
-/*.lo
-/gnuradio-config-info
diff --git a/gnuradio-core/src/lib/Makefile.am b/gnuradio-core/src/lib/Makefile.am
deleted file mode 100644
index fc1b7917b..000000000
--- a/gnuradio-core/src/lib/Makefile.am
+++ /dev/null
@@ -1,71 +0,0 @@
-# Copyright 2001,2004,2009,2010 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 GNU Radio; see the file COPYING.  If not, write to
-# the Free Software Foundation, Inc., 51 Franklin Street,
-# Boston, MA 02110-1301, USA.
-# 
-
-include $(top_srcdir)/Makefile.common
-
-## Process this file with automake to produce Makefile.in
-
-# We've got to build . before swig
-SUBDIRS = missing runtime filter viterbi general gengen reed-solomon io hier . swig
-
-AM_CPPFLAGS = $(STD_DEFINES_AND_INCLUDES) $(CPPUNIT_INCLUDES) $(WITH_INCLUDES)
-
-# generate libgnuradio-core.la from the convenience libraries in subdirs
-
-lib_LTLIBRARIES = libgnuradio-core.la
-noinst_LTLIBRARIES = libgnuradio-core-qa.la
-
-libgnuradio_core_la_SOURCES = bug_work_around_6.cc
-libgnuradio_core_la_LDFLAGS = $(NO_UNDEFINED) $(LTVERSIONFLAGS)
-
-libgnuradio_core_qa_la_SOURCES = bug_work_around_6.cc
-libgnuradio_core_qa_la_LDFLAGS = $(NO_UNDEFINED) -version-info 0:0:0 \
-				 $(LIBGNURADIO_CORE_EXTRA_LDFLAGS)
-
-
-libgnuradio_core_la_LIBADD  = 		\
-	filter/libfilter.la		\
-	viterbi/libviterbi.la		\
-	general/libgeneral.la		\
-	gengen/libgengen.la		\
-	io/libio.la			\
-	missing/libmissing.la		\
-	reed-solomon/librs.la		\
-	runtime/libruntime.la		\
-	hier/libhier.la			\
-	$(GRUEL_LA)			\
-	$(FFTW3F_LIBS)			\
-	$(GSL_LIBS)			\
-	$(CBLAS_LIBS)			\
-	$(BOOST_FILESYSTEM_LIB)
-
-libgnuradio_core_qa_la_LIBADD  = 	\
-	filter/libfilter-qa.la		\
-	general/libgeneral-qa.la	\
-	runtime/libruntime-qa.la	\
-	libgnuradio-core.la		\
-	$(CPPUNIT_LIBS)			
-
-bin_PROGRAMS = gnuradio-config-info
-gnuradio_config_info_SOURCES = gnuradio-config-info.cc
-gnuradio_config_info_LDADD = libgnuradio-core.la \
-	$(BOOST_LDFLAGS) \
-	$(BOOST_PROGRAM_OPTIONS_LIB) \
-	$(BOOST_FILESYSTEM_LIB)
diff --git a/gnuradio-core/src/lib/filter/.gitignore b/gnuradio-core/src/lib/filter/.gitignore
deleted file mode 100644
index faaf02cb8..000000000
--- a/gnuradio-core/src/lib/filter/.gitignore
+++ /dev/null
@@ -1,226 +0,0 @@
-/Makefile
-/Makefile.in
-/.la
-/.lo
-/.deps
-/.libs
-/*.la
-/*.lo
-/*.pyc
-/generate-stamp
-/#
-/---
-/generate
-/files:
-/don't
-/go
-/in
-/CVS
-/---
-/GrFIRfilterCCC.cc
-/GrFIRfilterCCC.h
-/GrFIRfilterCCF.cc
-/GrFIRfilterCCF.h
-/GrFIRfilterFCC.cc
-/GrFIRfilterFCC.h
-/GrFIRfilterFFF.cc
-/GrFIRfilterFFF.h
-/GrFIRfilterFSF.cc
-/GrFIRfilterFSF.h
-/GrFIRfilterSCC.cc
-/GrFIRfilterSCC.h
-/GrFIRfilterSIS.cc
-/GrFIRfilterSIS.h
-/GrFreqXlatingFIRfilterCCC.cc
-/GrFreqXlatingFIRfilterCCC.h
-/GrFreqXlatingFIRfilterCCF.cc
-/GrFreqXlatingFIRfilterCCF.h
-/GrFreqXlatingFIRfilterFCC.cc
-/GrFreqXlatingFIRfilterFCC.h
-/GrFreqXlatingFIRfilterFCF.cc
-/GrFreqXlatingFIRfilterFCF.h
-/GrFreqXlatingFIRfilterSCC.cc
-/GrFreqXlatingFIRfilterSCC.h
-/GrFreqXlatingFIRfilterSCF.cc
-/GrFreqXlatingFIRfilterSCF.h
-/gr_fir_CCC.cc
-/gr_fir_CCC.h
-/gr_fir_CCC_generic.cc
-/gr_fir_CCC_generic.h
-/gr_fir_CCF.cc
-/gr_fir_CCF.h
-/gr_fir_CCF_generic.cc
-/gr_fir_CCF_generic.h
-/gr_fir_FCC.cc
-/gr_fir_FCC.h
-/gr_fir_FCC_generic.cc
-/gr_fir_FCC_generic.h
-/gr_fir_FFF.cc
-/gr_fir_FFF.h
-/gr_fir_FFF_generic.cc
-/gr_fir_FFF_generic.h
-/gr_fir_FSF.cc
-/gr_fir_FSF.h
-/gr_fir_FSF_generic.cc
-/gr_fir_FSF_generic.h
-/gr_fir_SCC.cc
-/gr_fir_SCC.h
-/gr_fir_SCC_generic.cc
-/gr_fir_SCC_generic.h
-/gr_fir_SIS.cc
-/gr_fir_SIS.h
-/gr_fir_SIS_generic.cc
-/gr_fir_SIS_generic.h
-/gr_fir_sysconfig.cc
-/gr_fir_sysconfig.h
-/gr_fir_sysconfig_generic.cc
-/gr_fir_sysconfig_generic.h
-/gr_fir_util.cc
-/gr_fir_util.h
-/GrFIRfilterCCC.i
-/GrFIRfilterCCF.i
-/GrFIRfilterFCC.i
-/GrFIRfilterFFF.i
-/GrFIRfilterFSF.i
-/GrFIRfilterSCC.i
-/GrFIRfilterSIS.i
-/GrFreqXlatingFIRfilterCCC.i
-/GrFreqXlatingFIRfilterCCF.i
-/GrFreqXlatingFIRfilterFCC.i
-/GrFreqXlatingFIRfilterFCF.i
-/GrFreqXlatingFIRfilterSCC.i
-/GrFreqXlatingFIRfilterSCF.i
-/#
-/---
-/end
-/generated
-/files
-/---
-/filter_generated.i
-/gr_fir_ccc.cc
-/gr_fir_ccc.h
-/gr_fir_ccc_generic.cc
-/gr_fir_ccc_generic.h
-/gr_fir_ccf.cc
-/gr_fir_ccf.h
-/gr_fir_ccf_generic.cc
-/gr_fir_ccf_generic.h
-/gr_fir_fcc.cc
-/gr_fir_fcc.h
-/gr_fir_fcc_generic.cc
-/gr_fir_fcc_generic.h
-/gr_fir_fff.cc
-/gr_fir_fff.h
-/gr_fir_fff_generic.cc
-/gr_fir_fff_generic.h
-/gr_fir_fsf.cc
-/gr_fir_fsf.h
-/gr_fir_fsf_generic.cc
-/gr_fir_fsf_generic.h
-/gr_fir_scc.cc
-/gr_fir_scc.h
-/gr_fir_scc_generic.cc
-/gr_fir_scc_generic.h
-/gr_fir_filter_ccc.cc
-/gr_fir_filter_ccc.h
-/gr_fir_filter_ccc.i
-/gr_fir_filter_ccf.cc
-/gr_fir_filter_ccf.h
-/gr_fir_filter_ccf.i
-/gr_fir_filter_fcc.cc
-/gr_fir_filter_fcc.h
-/gr_fir_filter_fcc.i
-/gr_fir_filter_fff.cc
-/gr_fir_filter_fff.h
-/gr_fir_filter_fff.i
-/gr_fir_filter_fsf.cc
-/gr_fir_filter_fsf.h
-/gr_fir_filter_fsf.i
-/gr_fir_filter_scc.cc
-/gr_fir_filter_scc.h
-/gr_fir_filter_scc.i
-/gr_freq_xlating_fir_filter_ccc.cc
-/gr_freq_xlating_fir_filter_ccc.h
-/gr_freq_xlating_fir_filter_ccc.i
-/gr_freq_xlating_fir_filter_ccf.cc
-/gr_freq_xlating_fir_filter_ccf.h
-/gr_freq_xlating_fir_filter_ccf.i
-/gr_freq_xlating_fir_filter_fcc.cc
-/gr_freq_xlating_fir_filter_fcc.h
-/gr_freq_xlating_fir_filter_fcc.i
-/gr_freq_xlating_fir_filter_fcf.cc
-/gr_freq_xlating_fir_filter_fcf.h
-/gr_freq_xlating_fir_filter_fcf.i
-/gr_freq_xlating_fir_filter_scc.cc
-/gr_freq_xlating_fir_filter_scc.h
-/gr_freq_xlating_fir_filter_scc.i
-/gr_freq_xlating_fir_filter_scf.cc
-/gr_freq_xlating_fir_filter_scf.h
-/gr_freq_xlating_fir_filter_scf.i
-/gr_interp_fir_filter_ccc.cc
-/gr_interp_fir_filter_ccc.h
-/gr_interp_fir_filter_ccc.i
-/gr_interp_fir_filter_ccf.cc
-/gr_interp_fir_filter_ccf.h
-/gr_interp_fir_filter_ccf.i
-/gr_interp_fir_filter_fcc.cc
-/gr_interp_fir_filter_fcc.h
-/gr_interp_fir_filter_fcc.i
-/gr_interp_fir_filter_fff.cc
-/gr_interp_fir_filter_fff.h
-/gr_interp_fir_filter_fff.i
-/gr_interp_fir_filter_fsf.cc
-/gr_interp_fir_filter_fsf.h
-/gr_interp_fir_filter_fsf.i
-/gr_interp_fir_filter_scc.cc
-/gr_interp_fir_filter_scc.h
-/gr_interp_fir_filter_scc.i
-/gr_rational_resampler_ccc.cc
-/gr_rational_resampler_ccc.h
-/gr_rational_resampler_ccc.i
-/gr_rational_resampler_ccf.cc
-/gr_rational_resampler_ccf.h
-/gr_rational_resampler_ccf.i
-/gr_rational_resampler_fcc.cc
-/gr_rational_resampler_fcc.h
-/gr_rational_resampler_fcc.i
-/gr_rational_resampler_fff.cc
-/gr_rational_resampler_fff.h
-/gr_rational_resampler_fff.i
-/gr_rational_resampler_fsf.cc
-/gr_rational_resampler_fsf.h
-/gr_rational_resampler_fsf.i
-/gr_rational_resampler_scc.cc
-/gr_rational_resampler_scc.h
-/gr_rational_resampler_scc.i
-/gr_rational_resampler_base_ccc.cc
-/gr_rational_resampler_base_ccc.h
-/gr_rational_resampler_base_ccc.i
-/gr_rational_resampler_base_ccf.cc
-/gr_rational_resampler_base_ccf.h
-/gr_rational_resampler_base_ccf.i
-/gr_rational_resampler_base_fcc.cc
-/gr_rational_resampler_base_fcc.h
-/gr_rational_resampler_base_fcc.i
-/gr_rational_resampler_base_fff.cc
-/gr_rational_resampler_base_fff.h
-/gr_rational_resampler_base_fff.i
-/gr_rational_resampler_base_fsf.cc
-/gr_rational_resampler_base_fsf.h
-/gr_rational_resampler_base_fsf.i
-/gr_rational_resampler_base_scc.cc
-/gr_rational_resampler_base_scc.h
-/gr_rational_resampler_base_scc.i
-/gri_fir_filter_with_buffer_ccc.cc
-/gri_fir_filter_with_buffer_ccc.h
-/gri_fir_filter_with_buffer_ccf.cc
-/gri_fir_filter_with_buffer_ccf.h
-/gri_fir_filter_with_buffer_fcc.cc
-/gri_fir_filter_with_buffer_fcc.h
-/gri_fir_filter_with_buffer_fff.cc
-/gri_fir_filter_with_buffer_fff.h
-/gri_fir_filter_with_buffer_fsf.cc
-/gri_fir_filter_with_buffer_fsf.h
-/gri_fir_filter_with_buffer_scc.cc
-/gri_fir_filter_with_buffer_scc.h
-/stamp-*
diff --git a/gnuradio-core/src/lib/filter/Makefile.am b/gnuradio-core/src/lib/filter/Makefile.am
deleted file mode 100644
index c314431bf..000000000
--- a/gnuradio-core/src/lib/filter/Makefile.am
+++ /dev/null
@@ -1,402 +0,0 @@
-#
-# Copyright 2001,2002,2004-2011 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 GNU Radio; see the file COPYING.  If not, write to
-# the Free Software Foundation, Inc., 51 Franklin Street,
-# Boston, MA 02110-1301, USA.
-# 
-
-include $(top_srcdir)/Makefile.common
-
-#
-# This directory contains mostly filter routines, plus a few
-# other performance critical items
-#
-
-# $(WITH_INCLUDES) must _always_ be last
-AM_CPPFLAGS = $(STD_DEFINES_AND_INCLUDES) $(CPPUNIT_INCLUDES) \
-	$(FFTW3F_CPPFLAGS) $(WITH_INCLUDES)
-
-noinst_LTLIBRARIES = libfilter.la libfilter-qa.la
-
-# ----------------------------------------------------------------
-# these scripts generate FIR code
-#
-
-code_generator = 					\
-	generate_all.py					\
-	generate_gr_fir_XXX.py				\
-	generate_gr_fir_filter_XXX.py			\
-	generate_gr_interp_fir_filter_XXX.py		\
-	generate_gr_rational_resampler_base_XXX.py	\
-	generate_gr_fir_sysconfig.py			\
-	generate_gr_fir_sysconfig_generic.py		\
-	generate_gr_fir_util.py				\
-	generate_gr_freq_xlating_fir_filter_XXX.py	\
-	generate_gri_fir_filter_with_buffer_XXX.py	\
-	generate_utils.py				\
-	gr_fir_XXX.cc.t					\
-	gr_fir_XXX.h.t					\
-	gr_fir_XXX_generic.cc.t				\
-	gr_fir_XXX_generic.h.t				\
-	gr_fir_filter_XXX.cc.t				\
-	gr_fir_filter_XXX.h.t				\
-	gr_fir_filter_XXX.i.t				\
-	gr_interp_fir_filter_XXX.cc.t			\
-	gr_interp_fir_filter_XXX.h.t			\
-	gr_interp_fir_filter_XXX.i.t			\
-	gr_rational_resampler_base_XXX.cc.t		\
-	gr_rational_resampler_base_XXX.h.t		\
-	gr_rational_resampler_base_XXX.i.t		\
-	gr_freq_xlating_fir_filter_XXX.cc.t		\
-	gr_freq_xlating_fir_filter_XXX.h.t		\
-	gr_freq_xlating_fir_filter_XXX.i.t		\
-	gri_fir_filter_with_buffer_XXX.cc.t		\
-	gri_fir_filter_with_buffer_XXX.h.t
-
-
-# Source built by Python into $(builddir)
-BUILT_SOURCES +=		\
-	$(GENERATED_H)		\
-	$(GENERATED_I)		\
-	$(GENERATED_CC)		\
-	filter_generated.i
-
-# ----------------------------------------------------------------
-# MD_CPU and MD_SUBCPU are set at configure time by way of 
-#   gnuradio/config/gr_set_md_cpu.m4.  
-#   It indicates which set of machine dependent code we should be building.
-#   We currently implement "generic" and "x86"
-
-#
-# <foo>_CODE entry for each set of machine specific speedups
-#
-
-generic_CODE =				\
-	sysconfig_generic.cc		
-
-generic_qa_CODE =			\
-	qa_dotprod_generic.cc
-
-x86_CODE = 				\
-	sysconfig_x86.cc		\
-	gr_fir_sysconfig_x86.cc		\
-	gr_cpu_x86.cc			\
-	gr_fir_ccc_simd.cc		\
-	gr_fir_ccc_x86.cc		\
-	gr_fir_fff_simd.cc		\
-	gr_fir_fff_x86.cc		\
-	gr_fir_fsf_simd.cc		\
-	gr_fir_fsf_x86.cc		\
-	gr_fir_scc_simd.cc		\
-	gr_fir_scc_x86.cc		\
-	gr_fir_fcc_simd.cc		\
-	gr_fir_fcc_x86.cc		\
-	gr_fir_ccf_simd.cc		\
-	gr_fir_ccf_x86.cc		\
-	sse_debug.c
-
-x86_SUBCODE = 				\
-	float_dotprod_sse.S		\
-	float_dotprod_3dnow.S		\
-	complex_dotprod_3dnowext.S	\
-	complex_dotprod_3dnow.S		\
-	complex_dotprod_sse.S		\
-	ccomplex_dotprod_3dnowext.S	\
-	ccomplex_dotprod_3dnow.S	\
-	ccomplex_dotprod_sse.S		\
-	fcomplex_dotprod_3dnow.S	\
-	fcomplex_dotprod_sse.S		\
-	short_dotprod_mmx.S
-
-x86_64_SUBCODE = 			\
-	float_dotprod_sse64.S		\
-	float_dotprod_3dnow64.S		\
-	complex_dotprod_3dnowext64.S	\
-	complex_dotprod_3dnow64.S	\
-	complex_dotprod_sse64.S		\
-	ccomplex_dotprod_3dnowext64.S	\
-	ccomplex_dotprod_3dnow64.S	\
-	ccomplex_dotprod_sse64.S	\
-	fcomplex_dotprod_3dnow64.S	\
-	fcomplex_dotprod_sse64.S	\
-	short_dotprod_mmx64.S
-
-x86_qa_CODE = 				\
-	qa_dotprod_x86.cc		\
-	qa_float_dotprod_x86.cc		\
-	qa_complex_dotprod_x86.cc	\
-	qa_ccomplex_dotprod_x86.cc	
-
-powerpc_CODE = \
-	sysconfig_powerpc.cc \
-	gr_fir_sysconfig_powerpc.cc \
-	gr_cpu_powerpc.cc \
-	gr_fir_fff_altivec.cc \
-	gr_altivec.c \
-	dotprod_fff_altivec.c
-
-powerpc_qa_CODE = \
-	qa_dotprod_powerpc.cc
-
-armv7_a_CODE = \
-	sysconfig_armv7_a.cc \
-	gr_fir_sysconfig_armv7_a.cc \
-	gr_cpu_armv7_a.cc \
-	gr_fir_fff_armv7_a.cc \
-	dotprod_fff_armv7_a.c \
-	gr_fir_ccf_armv7_a.cc \
-	dotprod_ccf_armv7_a.c
-
-armv7_a_qa_CODE = \
-	qa_dotprod_armv7_a.cc
-
-#
-# include each <foo>_CODE entry here...
-#
-EXTRA_libfilter_la_SOURCES =		\
-	$(generic_CODE)			\
-	$(generic_qa_CODE)		\
-	$(x86_CODE)			\
-	$(x86_SUBCODE)			\
-	$(x86_64_SUBCODE)		\
-	$(x86_qa_CODE)			\
-	$(powerpc_CODE)			\
-	$(powerpc_qa_CODE)		\
-	$(armv7_a_CODE)		\
-	$(armv7_a_qa_CODE)
-
-
-EXTRA_DIST += \
-	3dnow_float_dotprod_really_simple.S	\
-	3dnow_float_dotprod_simple.S		\
-	$(code_generator)
-
-# work around automake deficiency
-libfilter_la_common_SOURCES = 		\
-	$(GENERATED_CC)			\
-	gr_adaptive_fir_ccc.cc		\
-	gr_adaptive_fir_ccf.cc		\
-	gri_fft_filter_fff_generic.cc	\
-	gri_fft_filter_ccc_generic.cc	\
-	gr_fft_filter_ccc.cc		\
-	gr_fft_filter_fff.cc		\
-	gr_goertzel_fc.cc		\
-	gr_filter_delay_fc.cc		\
-	gr_fractional_interpolator_ff.cc \
-	gr_fractional_interpolator_cc.cc \
-	gr_hilbert_fc.cc		\
-	gr_iir_filter_ffd.cc		\
-	gr_sincos.c			\
-	gr_single_pole_iir_filter_ff.cc	\
-	gr_single_pole_iir_filter_cc.cc	\
-	gri_goertzel.cc			\
-	gri_mmse_fir_interpolator.cc	\
-	gri_mmse_fir_interpolator_cc.cc	\
-	complex_dotprod_generic.cc	\
-	ccomplex_dotprod_generic.cc	\
-	float_dotprod_generic.c		\
-	short_dotprod_generic.c		\
-	gr_pfb_channelizer_ccf.cc	\
-	gr_pfb_synthesis_filterbank_ccf.cc\
-	gr_pfb_decimator_ccf.cc		\
-	gr_pfb_interpolator_ccf.cc	\
-	gr_pfb_arb_resampler_ccf.cc	\
-	gr_pfb_arb_resampler_fff.cc	\
-	gr_pfb_clock_sync_ccf.cc	\
-	gr_pfb_clock_sync_fff.cc	\
-	gr_dc_blocker_cc.cc		\
-	gr_dc_blocker_ff.cc
-
-libfilter_qa_la_common_SOURCES = 	\
-	qa_filter.cc			\
-	qa_gr_fir_ccf.cc		\
-	qa_gr_fir_fcc.cc		\
-	qa_gr_fir_fff.cc		\
-	qa_gr_fir_ccc.cc		\
-	qa_gr_fir_scc.cc		\
-	qa_gr_rotator.cc		\
-	qa_gri_mmse_fir_interpolator.cc	\
-	qa_gri_mmse_fir_interpolator_cc.cc \
-	qa_gri_fir_filter_with_buffer_ccf.cc \
-	qa_gri_fir_filter_with_buffer_ccc.cc \
-	qa_gri_fir_filter_with_buffer_fcc.cc \
-	qa_gri_fir_filter_with_buffer_fff.cc \
-	qa_gri_fir_filter_with_buffer_fsf.cc \
-	qa_gri_fir_filter_with_buffer_scc.cc
-
-if MD_CPU_generic
-libfilter_la_SOURCES = $(libfilter_la_common_SOURCES) $(generic_CODE)
-libfilter_qa_la_SOURCES = $(libfilter_qa_la_common_SOURCES) $(generic_qa_CODE)
-endif
-
-if MD_CPU_x86
-if MD_SUBCPU_x86_64
-libfilter_la_SOURCES = $(libfilter_la_common_SOURCES) $(x86_64_SUBCODE) $(x86_CODE)
-else
-libfilter_la_SOURCES = $(libfilter_la_common_SOURCES) $(x86_SUBCODE) $(x86_CODE)
-endif
-
-libfilter_qa_la_SOURCES = $(libfilter_qa_la_common_SOURCES) $(x86_qa_CODE)
-endif
-
-if MD_CPU_powerpc
-libfilter_la_SOURCES = $(libfilter_la_common_SOURCES) $(powerpc_CODE)
-libfilter_qa_la_SOURCES = $(libfilter_qa_la_common_SOURCES) $(powerpc_qa_CODE)
-endif
-
-if MD_CPU_armv7_a
-libfilter_la_SOURCES = $(libfilter_la_common_SOURCES) $(armv7_a_CODE)
-libfilter_qa_la_SOURCES = $(libfilter_qa_la_common_SOURCES) $(armv7_a_qa_CODE)
-endif
-
-
-grinclude_HEADERS = 			\
-	$(GENERATED_H)			\
-	complex_dotprod_generic.h	\
-	complex_dotprod_x86.h		\
-	fcomplex_dotprod_x86.h		\
-	ccomplex_dotprod_generic.h	\
-	ccomplex_dotprod_x86.h		\
-	float_dotprod_generic.h		\
-	float_dotprod_x86.h		\
-	gr_adaptive_fir_ccc.h		\
-	gr_adaptive_fir_ccf.h		\
-	gr_altivec.h			\
-	gr_cpu.h			\
-	gri_fft_filter_fff_generic.h	\
-	gri_fft_filter_ccc_generic.h	\
-	gr_fft_filter_ccc.h		\
-	gr_fft_filter_fff.h		\
-	gr_filter_delay_fc.h		\
-	gr_fir_sysconfig_x86.h		\
-	gr_fir_sysconfig_powerpc.h	\
-	gr_fractional_interpolator_ff.h	\
-	gr_fractional_interpolator_cc.h	\
-	gr_goertzel_fc.h		\
-	gr_hilbert_fc.h			\
-	gr_iir_filter_ffd.h		\
-	gr_rotator.h			\
-	gr_sincos.h			\
-	gr_single_pole_iir.h		\
-	gr_single_pole_iir_filter_ff.h	\
-	gr_single_pole_iir_filter_cc.h  \
-	gr_vec_types.h			\
-	gri_goertzel.h			\
-	gri_iir.h			\
-	gri_mmse_fir_interpolator.h	\
-	gri_mmse_fir_interpolator_cc.h	\
-	qa_filter.h			\
-	short_dotprod_generic.h		\
-	short_dotprod_x86.h		\
-	sse_debug.h			\
-	gr_pfb_channelizer_ccf.h	\
-	gr_pfb_synthesis_filterbank_ccf.h\
-	gr_pfb_decimator_ccf.h		\
-	gr_pfb_interpolator_ccf.h	\
-	gr_pfb_arb_resampler_ccf.h	\
-	gr_pfb_arb_resampler_fff.h	\
-	gr_pfb_clock_sync_ccf.h		\
-	gr_pfb_clock_sync_fff.h		\
-	gr_dc_blocker_cc.h		\
-	gr_dc_blocker_ff.h
-
-noinst_HEADERS = 			\
-	assembly.h			\
-	gcc_x86_cpuid.h			\
-	dotprod_fff_altivec.h		\
-	dotprod_fff_armv7_a.h		\
-	dotprod_ccf_armv7_a.h		\
-	gr_fir_scc_simd.h		\
-	gr_fir_scc_x86.h		\
-	gr_fir_fcc_simd.h		\
-	gr_fir_fcc_x86.h		\
-	gr_fir_ccf_simd.h		\
-	gr_fir_ccf_x86.h		\
-	gr_fir_ccc_simd.h		\
-	gr_fir_ccc_x86.h		\
-	gr_fir_fff_altivec.h		\
-	gr_fir_fff_armv7_a.h		\
-	gr_fir_ccf_armv7_a.h		\
-	gr_fir_fff_simd.h		\
-	gr_fir_fff_x86.h		\
-	gr_fir_fsf_simd.h		\
-	gr_fir_fsf_x86.h		\
-	interpolator_taps.h		\
-	qa_complex_dotprod_x86.h	\
-	qa_ccomplex_dotprod_x86.h	\
-	qa_dotprod.h			\
-	qa_float_dotprod_x86.h		\
-	qa_gr_fir_ccf.h			\
-	qa_gr_fir_fcc.h			\
-	qa_gr_fir_fff.h			\
-	qa_gr_fir_ccc.h			\
-	qa_gr_fir_scc.h			\
-	qa_gr_rotator.h			\
-	qa_gri_mmse_fir_interpolator.h	\
-	qa_gri_mmse_fir_interpolator_cc.h \
-	qa_gri_fir_filter_with_buffer_ccf.h \
-	qa_gri_fir_filter_with_buffer_ccc.h \
-	qa_gri_fir_filter_with_buffer_fcc.h \
-	qa_gri_fir_filter_with_buffer_fff.h \
-	qa_gri_fir_filter_with_buffer_fsf.h \
-	qa_gri_fir_filter_with_buffer_scc.h
-
-
-swiginclude_HEADERS =			\
-	filter.i			\
-	filter_generated.i		\
-	gr_adaptive_fir_ccc.i		\
-	gr_adaptive_fir_ccf.i		\
-	gr_fft_filter_ccc.i		\
-	gr_fft_filter_fff.i		\
-	gr_filter_delay_fc.i		\
-	gr_fractional_interpolator_ff.i \
-	gr_fractional_interpolator_cc.i \
-	gr_goertzel_fc.i		\
-	gr_hilbert_fc.i			\
-	gr_iir_filter_ffd.i		\
-	gr_single_pole_iir_filter_ff.i	\
-	gr_single_pole_iir_filter_cc.i	\
-	gr_pfb_channelizer_ccf.i	\
-	gr_pfb_synthesis_filterbank_ccf.i\
-	gr_pfb_decimator_ccf.i		\
-	gr_pfb_interpolator_ccf.i	\
-	gr_pfb_arb_resampler_ccf.i	\
-	gr_pfb_arb_resampler_fff.i	\
-	gr_pfb_clock_sync_ccf.i		\
-	gr_pfb_clock_sync_fff.i		\
-	gr_dc_blocker_cc.i		\
-	gr_dc_blocker_ff.i		\
-	$(GENERATED_I)
-
-
-# Do creation and inclusion of other Makefiles last
-
-# include the srcdir's Makefile.gen; doing this creates an implicit
-# dependency between $(srcdir)/Makefile.in and $(srcdir)/Makefile.gen.
-include $(srcdir)/Makefile.gen
-
-# common way for generating local Makefile.gen
-makefile_gen_gen_command = PYTHONPATH=$(top_srcdir)/gnuradio-core/src/python srcdir=$(srcdir) do_makefile=1 do_sources=0 $(PYTHON) $(srcdir)/generate_all.py
-include $(top_srcdir)/Makefile.gen.gen
-
-# common way for generating sources from templates when using
-# BUILT_SOURCES, using parallel build protection.
-gen_sources = $(BUILT_SOURCES)
-gen_sources_deps = $(core_generator)
-par_gen_command = PYTHONPATH=$(top_srcdir)/gnuradio-core/src/python srcdir=$(srcdir) $(PYTHON) $(srcdir)/generate_all.py
-include $(top_srcdir)/Makefile.par.gen
diff --git a/gnuradio-core/src/lib/general/.gitignore b/gnuradio-core/src/lib/general/.gitignore
deleted file mode 100644
index 4f3696f58..000000000
--- a/gnuradio-core/src/lib/general/.gitignore
+++ /dev/null
@@ -1,323 +0,0 @@
-/Makefile
-/Makefile.in
-/.la
-/.lo
-/.deps
-/.libs
-/*.la
-/*.lo
-/*.pyc
-/generate-stamp
-/gr_constants.cc
-/GrFIRfilterCCC.cc
-/GrFIRfilterCCC.h
-/GrFIRfilterCCF.cc
-/GrFIRfilterCCF.h
-/GrFIRfilterFCC.cc
-/GrFIRfilterFCC.h
-/GrFIRfilterFFF.cc
-/GrFIRfilterFFF.h
-/GrFIRfilterFSF.cc
-/GrFIRfilterFSF.h
-/GrFIRfilterSCC.cc
-/GrFIRfilterSCC.h
-/GrFIRfilterSIS.cc
-/GrFIRfilterSIS.h
-/GrFreqXlatingFIRfilterCCC.cc
-/GrFreqXlatingFIRfilterCCC.h
-/GrFreqXlatingFIRfilterCCF.cc
-/GrFreqXlatingFIRfilterCCF.h
-/GrFreqXlatingFIRfilterFCC.cc
-/GrFreqXlatingFIRfilterFCC.h
-/GrFreqXlatingFIRfilterFCF.cc
-/GrFreqXlatingFIRfilterFCF.h
-/GrFreqXlatingFIRfilterSCC.cc
-/GrFreqXlatingFIRfilterSCC.h
-/GrFreqXlatingFIRfilterSCF.cc
-/GrFreqXlatingFIRfilterSCF.h
-/gr_fir_CCC.cc
-/gr_fir_CCC.h
-/gr_fir_CCC_generic.cc
-/gr_fir_CCC_generic.h
-/gr_fir_CCF.cc
-/gr_fir_CCF.h
-/gr_fir_CCF_generic.cc
-/gr_fir_CCF_generic.h
-/gr_fir_FCC.cc
-/gr_fir_FCC.h
-/gr_fir_FCC_generic.cc
-/gr_fir_FCC_generic.h
-/gr_fir_FFF.cc
-/gr_fir_FFF.h
-/gr_fir_FFF_generic.cc
-/gr_fir_FFF_generic.h
-/gr_fir_FSF.cc
-/gr_fir_FSF.h
-/gr_fir_FSF_generic.cc
-/gr_fir_FSF_generic.h
-/gr_fir_SCC.cc
-/gr_fir_SCC.h
-/gr_fir_SCC_generic.cc
-/gr_fir_SCC_generic.h
-/gr_fir_SIS.cc
-/gr_fir_SIS.h
-/gr_fir_SIS_generic.cc
-/gr_fir_SIS_generic.h
-/gr_fir_sysconfig.cc
-/gr_fir_sysconfig.h
-/gr_fir_sysconfig_generic.cc
-/gr_fir_sysconfig_generic.h
-/gr_fir_util.cc
-/gr_fir_util.h
-/GrFIRfilterCCC.i
-/GrFIRfilterCCF.i
-/GrFIRfilterFCC.i
-/GrFIRfilterFFF.i
-/GrFIRfilterFSF.i
-/GrFIRfilterSCC.i
-/GrFIRfilterSIS.i
-/GrFreqXlatingFIRfilterCCC.i
-/GrFreqXlatingFIRfilterCCF.i
-/GrFreqXlatingFIRfilterFCC.i
-/GrFreqXlatingFIRfilterFCF.i
-/GrFreqXlatingFIRfilterSCC.i
-/GrFreqXlatingFIRfilterSCF.i
-/# --- generated files ---
-/gr_add_cc.cc
-/gr_add_cc.h
-/gr_add_cc.i
-/gr_add_const_c.cc
-/gr_add_const_c.h
-/gr_add_const_c.i
-/gr_add_const_cc.cc
-/gr_add_const_cc.h
-/gr_add_const_cc.i
-/gr_add_const_f.cc
-/gr_add_const_f.h
-/gr_add_const_f.i
-/gr_add_const_ff.cc
-/gr_add_const_ff.h
-/gr_add_const_ff.i
-/gr_add_const_i.cc
-/gr_add_const_i.h
-/gr_add_const_i.i
-/gr_add_const_ii.cc
-/gr_add_const_ii.h
-/gr_add_const_ii.i
-/gr_add_const_s.cc
-/gr_add_const_s.h
-/gr_add_const_s.i
-/gr_add_const_sf.cc
-/gr_add_const_sf.h
-/gr_add_const_sf.i
-/gr_add_const_ss.cc
-/gr_add_const_ss.h
-/gr_add_const_ss.i
-/gr_add_const_vcc.cc
-/gr_add_const_vcc.h
-/gr_add_const_vcc.i
-/gr_add_const_vff.cc
-/gr_add_const_vff.h
-/gr_add_const_vff.i
-/gr_add_const_vii.cc
-/gr_add_const_vii.h
-/gr_add_const_vii.i
-/gr_add_const_vss.cc
-/gr_add_const_vss.h
-/gr_add_const_vss.i
-/gr_add_ff.cc
-/gr_add_ff.h
-/gr_add_ff.i
-/gr_add_ii.cc
-/gr_add_ii.h
-/gr_add_ii.i
-/gr_add_ss.cc
-/gr_add_ss.h
-/gr_add_ss.i
-/gr_add_vcc.cc
-/gr_add_vcc.h
-/gr_add_vcc.i
-/gr_add_vff.cc
-/gr_add_vff.h
-/gr_add_vff.i
-/gr_add_vii.cc
-/gr_add_vii.h
-/gr_add_vii.i
-/gr_add_vss.cc
-/gr_add_vss.h
-/gr_add_vss.i
-/gr_divide_cc.cc
-/gr_divide_cc.h
-/gr_divide_cc.i
-/gr_divide_ff.cc
-/gr_divide_ff.h
-/gr_divide_ff.i
-/gr_divide_ii.cc
-/gr_divide_ii.h
-/gr_divide_ii.i
-/gr_divide_ss.cc
-/gr_divide_ss.h
-/gr_divide_ss.i
-/gr_multiply_cc.cc
-/gr_multiply_cc.h
-/gr_multiply_cc.i
-/gr_multiply_const_cc.cc
-/gr_multiply_const_cc.h
-/gr_multiply_const_cc.i
-/gr_multiply_const_ff.cc
-/gr_multiply_const_ff.h
-/gr_multiply_const_ff.i
-/gr_multiply_const_ii.cc
-/gr_multiply_const_ii.h
-/gr_multiply_const_ii.i
-/gr_multiply_const_ss.cc
-/gr_multiply_const_ss.h
-/gr_multiply_const_ss.i
-/gr_multiply_ff.cc
-/gr_multiply_ff.h
-/gr_multiply_ff.i
-/gr_multiply_ii.cc
-/gr_multiply_ii.h
-/gr_multiply_ii.i
-/gr_multiply_ss.cc
-/gr_multiply_ss.h
-/gr_multiply_ss.i
-/gr_multiply_vcc.cc
-/gr_multiply_vcc.h
-/gr_multiply_vcc.i
-/gr_multiply_vff.cc
-/gr_multiply_vff.h
-/gr_multiply_vff.i
-/gr_multiply_vii.cc
-/gr_multiply_vii.h
-/gr_multiply_vii.i
-/gr_multiply_vss.cc
-/gr_multiply_vss.h
-/gr_multiply_vss.i
-/gr_multiply_const_vcc.cc
-/gr_multiply_const_vcc.h
-/gr_multiply_const_vcc.i
-/gr_multiply_const_vff.cc
-/gr_multiply_const_vff.h
-/gr_multiply_const_vff.i
-/gr_multiply_const_vii.cc
-/gr_multiply_const_vii.h
-/gr_multiply_const_vii.i
-/gr_multiply_const_vss.cc
-/gr_multiply_const_vss.h
-/gr_multiply_const_vss.i
-/gr_noise_source_c.cc
-/gr_noise_source_c.h
-/gr_noise_source_c.i
-/gr_noise_source_f.cc
-/gr_noise_source_f.h
-/gr_noise_source_f.i
-/gr_noise_source_i.cc
-/gr_noise_source_i.h
-/gr_noise_source_i.i
-/gr_noise_source_s.cc
-/gr_noise_source_s.h
-/gr_noise_source_s.i
-/gr_sig_source_c.cc
-/gr_sig_source_c.h
-/gr_sig_source_c.i
-/gr_sig_source_f.cc
-/gr_sig_source_f.h
-/gr_sig_source_f.i
-/gr_sig_source_i.cc
-/gr_sig_source_i.h
-/gr_sig_source_i.i
-/gr_sig_source_s.cc
-/gr_sig_source_s.h
-/gr_sig_source_s.i
-/gr_sub_cc.cc
-/gr_sub_cc.h
-/gr_sub_cc.i
-/gr_sub_ff.cc
-/gr_sub_ff.h
-/gr_sub_ff.i
-/gr_sub_ii.cc
-/gr_sub_ii.h
-/gr_sub_ii.i
-/gr_sub_ss.cc
-/gr_sub_ss.h
-/gr_sub_ss.i
-/gr_vector_sink_b.cc
-/gr_vector_sink_b.h
-/gr_vector_sink_b.i
-/gr_vector_sink_c.cc
-/gr_vector_sink_c.h
-/gr_vector_sink_c.i
-/gr_vector_sink_f.cc
-/gr_vector_sink_f.h
-/gr_vector_sink_f.i
-/gr_vector_sink_i.cc
-/gr_vector_sink_i.h
-/gr_vector_sink_i.i
-/gr_vector_sink_s.cc
-/gr_vector_sink_s.h
-/gr_vector_sink_s.i
-/gr_vector_source_b.cc
-/gr_vector_source_b.h
-/gr_vector_source_b.i
-/gr_vector_source_c.cc
-/gr_vector_source_c.h
-/gr_vector_source_c.i
-/gr_vector_source_f.cc
-/gr_vector_source_f.h
-/gr_vector_source_f.i
-/gr_vector_source_i.cc
-/gr_vector_source_i.h
-/gr_vector_source_i.i
-/gr_vector_source_s.cc
-/gr_vector_source_s.h
-/gr_vector_source_s.i
-/gr_mute_cc.cc
-/gr_mute_cc.h
-/gr_mute_cc.i
-/gr_mute_ff.cc
-/gr_mute_ff.h
-/gr_mute_ff.i
-/gr_mute_ii.cc
-/gr_mute_ii.h
-/gr_mute_ii.i
-/gr_mute_ss.cc
-/gr_mute_ss.h
-/gr_mute_ss.i
-/gr_chunks_to_symbols_bc.cc
-/gr_chunks_to_symbols_bc.h
-/gr_chunks_to_symbols_bc.i
-/gr_chunks_to_symbols_bf.cc
-/gr_chunks_to_symbols_bf.h
-/gr_chunks_to_symbols_bf.i
-/gr_chunks_to_symbols_ic.cc
-/gr_chunks_to_symbols_ic.h
-/gr_chunks_to_symbols_ic.i
-/gr_chunks_to_symbols_if.cc
-/gr_chunks_to_symbols_if.h
-/gr_chunks_to_symbols_if.i
-/gr_chunks_to_symbols_sc.cc
-/gr_chunks_to_symbols_sc.h
-/gr_chunks_to_symbols_sc.i
-/gr_chunks_to_symbols_sf.cc
-/gr_chunks_to_symbols_sf.h
-/gr_chunks_to_symbols_sf.i
-/gr_packed_to_unpacked_bb.cc
-/gr_packed_to_unpacked_bb.h
-/gr_packed_to_unpacked_bb.i
-/gr_packed_to_unpacked_ii.cc
-/gr_packed_to_unpacked_ii.h
-/gr_packed_to_unpacked_ii.i
-/gr_packed_to_unpacked_ss.cc
-/gr_packed_to_unpacked_ss.h
-/gr_packed_to_unpacked_ss.i
-/gr_unpacked_to_packed_bb.cc
-/gr_unpacked_to_packed_bb.h
-/gr_unpacked_to_packed_bb.i
-/gr_unpacked_to_packed_ii.cc
-/gr_unpacked_to_packed_ii.h
-/gr_unpacked_to_packed_ii.i
-/gr_unpacked_to_packed_ss.cc
-/gr_unpacked_to_packed_ss.h
-/gr_unpacked_to_packed_ss.i
-/# --- end generated files ---
diff --git a/gnuradio-core/src/lib/general/Makefile.am b/gnuradio-core/src/lib/general/Makefile.am
deleted file mode 100644
index 0122932cf..000000000
--- a/gnuradio-core/src/lib/general/Makefile.am
+++ /dev/null
@@ -1,470 +0,0 @@
-#
-# Copyright 2001,2002,2004,2006,2007,2008,2009 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 GNU Radio; see the file COPYING.  If not, write to
-# the Free Software Foundation, Inc., 51 Franklin Street,
-# Boston, MA 02110-1301, USA.
-# 
-
-include $(top_srcdir)/Makefile.common
-
-# $(WITH_INCLUDES) must _always_ be last
-AM_CPPFLAGS = $(STD_DEFINES_AND_INCLUDES) $(CPPUNIT_INCLUDES) \
-	$(FFTW3F_CPPFLAGS) $(GSL_CPPFLAGS) $(WITH_INCLUDES)
-
-noinst_LTLIBRARIES = libgeneral.la libgeneral-qa.la
-
-BUILT_SOURCES = 
-
-# ----------------------------------------------------------------
-
-EXTRA_DIST += \
-	gen_sine_table.py		\
-	gr_constants.cc.in			
-
-libgeneral_la_SOURCES = 		\
-	complex_vec_test.cc		\
-	gr_additive_scrambler_bb.cc	\
-	gr_agc_cc.cc                	\
-	gr_agc_ff.cc                	\
-	gr_agc2_cc.cc                	\
-	gr_agc2_ff.cc                	\
-	gr_align_on_samplenumbers_ss.cc	\
-	gr_bin_statistics_f.cc		\
-	gr_bytes_to_syms.cc		\
-	gr_char_to_float.cc		\
-	gr_check_counting_s.cc		\
-	gr_check_lfsr_32k_s.cc		\
-	gr_circular_file.cc		\
-	gr_complex_to_interleaved_short.cc \
-	gr_complex_to_xxx.cc		\
-	gr_conjugate_cc.cc		\
-	gr_copy.cc			\
-	gr_count_bits.cc		\
-	gr_cpfsk_bc.cc			\
-	gr_cpm.cc			\
-	gr_ctcss_squelch_ff.cc		\
-	gr_decode_ccsds_27_fb.cc	\
-	gr_deinterleave.cc		\
-	gr_delay.cc			\
-	gr_diff_decoder_bb.cc		\
-	gr_diff_encoder_bb.cc		\
-	gr_diff_phasor_cc.cc		\
-	gr_dpll_bb.cc			\
-	gr_encode_ccsds_27_bb.cc	\
-	gr_fake_channel_coder_pp.cc	\
-	gr_fast_atan2f.cc		\
-	gr_feedforward_agc_cc.cc	\
-	gr_feval.cc			\
-	gr_fft_vcc.cc			\
-	gr_fft_vcc_fftw.cc		\
-	gr_fft_vfc.cc			\
-	gr_firdes.cc			\
-	gr_float_to_char.cc		\
-	gr_float_to_complex.cc		\
-	gr_float_to_int.cc		\
-	gr_float_to_short.cc		\
-	gr_float_to_uchar.cc		\
-	gr_fmdet_cf.cc			\
-	gr_frequency_modulator_fc.cc	\
-	gr_fxpt.cc			\
-	gr_framer_sink_1.cc		\
-	gr_glfsr_source_b.cc		\
-	gr_glfsr_source_f.cc		\
-	gr_head.cc			\
-	gr_interleave.cc		\
-	gr_interleaved_short_to_complex.cc \
-	gr_iqcomp_cc.cc			\
-	gr_keep_one_in_n.cc		\
-	gr_kludge_copy.cc		\
-	gr_lfsr_32k_source_s.cc		\
-	gr_map_bb.cc			\
-	gr_misc.cc			\
-	gr_nlog10_ff.cc			\
-	gr_nop.cc			\
-	gr_null_sink.cc			\
-	gr_null_source.cc		\
-	gr_pa_2x2_phase_combiner.cc	\
-	gr_packet_sink.cc		\
-	gr_peak_detector2_fb.cc		\
-	gr_phase_modulator_fc.cc	\
-	gr_pll_carriertracking_cc.cc	\
-	gr_pll_freqdet_cf.cc		\
-	gr_pll_refout_cc.cc		\
-	gr_pn_correlator_cc.cc		\
-	gr_constants.cc			\
-	gr_prefs.cc			\
-	gr_probe_avg_mag_sqrd_c.cc	\
-	gr_probe_avg_mag_sqrd_cf.cc	\
-	gr_probe_avg_mag_sqrd_f.cc	\
-	gr_probe_signal_f.cc		\
-	gr_pwr_squelch_cc.cc		\
-	gr_pwr_squelch_ff.cc		\
-	gr_quadrature_demod_cf.cc	\
-	gr_rail_ff.cc			\
-	gr_random.cc			\
-	gr_regenerate_bb.cc		\
-	gr_remez.cc			\
-	gr_repeat.cc			\
-	gr_reverse.cc			\
-	gr_rms_cf.cc			\
-	gr_rms_ff.cc			\
-	gr_short_to_float.cc		\
-	gr_int_to_float.cc		\
-	gr_simple_correlator.cc		\
-	gr_simple_framer.cc		\
-	gr_simple_squelch_cc.cc		\
-	gr_skiphead.cc			\
-	gr_squash_ff.cc			\
-	gr_squelch_base_cc.cc		\
-	gr_squelch_base_ff.cc		\
-	gr_stream_mux.cc		\
-	gr_stream_to_streams.cc		\
-	gr_stream_to_vector.cc		\
-	gr_streams_to_stream.cc		\
-	gr_streams_to_vector.cc		\
-	gr_stretch_ff.cc		\
-        gr_test.cc                      \
-	gr_threshold_ff.cc		\
-	gr_throttle.cc			\
-	gr_transcendental.cc		\
-	gr_uchar_to_float.cc		\
-	gr_vco_f.cc			\
-	gr_vector_to_stream.cc		\
-	gr_vector_to_streams.cc		\
-	gr_wavelet_ff.cc		\
-	gr_wvps_ff.cc			\
-	gri_add_const_ss_generic.cc	\
-	gri_char_to_float.cc		\
-	gri_control_loop.cc		\
-	gri_debugger_hook.cc		\
-	gri_fft.cc			\
-	gri_float_to_char.cc		\
-	gri_float_to_int.cc		\
-	gri_float_to_short.cc		\
-	gri_float_to_uchar.cc		\
-	gri_glfsr.cc			\
-	gri_interleaved_short_to_complex.cc \
-	gri_int_to_float.cc		\
-	gri_short_to_float.cc		\
-	gri_uchar_to_float.cc		\
-	malloc16.c			\
-	gr_unpack_k_bits_bb.cc		\
-	gr_descrambler_bb.cc		\
-	gr_scrambler_bb.cc		\
-	gr_probe_mpsk_snr_c.cc		\
-	gr_probe_density_b.cc		\
-	gr_annotator_alltoall.cc	\
-	gr_annotator_1to1.cc		\
-	gr_burst_tagger.cc \
-	gr_correlate_access_code_tag_bb.cc
-
-libgeneral_qa_la_SOURCES = 		\
-	qa_general.cc			\
-	qa_gr_circular_file.cc		\
-	qa_gr_cpm.cc			\
-	qa_gr_firdes.cc			\
-	qa_gr_fxpt.cc			\
-	qa_gr_fxpt_nco.cc		\
-	qa_gr_fxpt_vco.cc		\
-	qa_gr_math.cc			\
-	qa_gri_lfsr.cc
-
-grinclude_HEADERS = 			\
-	gr_core_api.h			\
-	complex_vec_test.h		\
-	gr_additive_scrambler_bb.h	\
-	gr_agc_cc.h                 	\
-	gr_agc_ff.h                 	\
-	gr_agc2_cc.h                	\
-	gr_agc2_ff.h                	\
-	gr_align_on_samplenumbers_ss.h	\
-	gr_bin_statistics_f.h		\
-	gr_bytes_to_syms.h		\
-	gr_char_to_float.h		\
-	gr_check_counting_s.h		\
-	gr_check_lfsr_32k_s.h		\
-	gr_circular_file.h		\
-	gr_complex_to_interleaved_short.h \
-	gr_complex_to_xxx.h		\
-	gr_conjugate_cc.h		\
-	gr_copy.h			\
-	gr_count_bits.h			\
-	gr_cpfsk_bc.h			\
-	gr_cpm.h			\
-	gr_ctcss_squelch_ff.h		\
-	gr_decode_ccsds_27_fb.h		\
-	gr_diff_decoder_bb.h		\
-	gr_diff_encoder_bb.h		\
-	gr_deinterleave.h		\
-	gr_delay.h			\
-	gr_diff_phasor_cc.h		\
-	gr_dpll_bb.h			\
-	gr_encode_ccsds_27_bb.h		\
-	gr_expj.h			\
-	gr_fake_channel_coder_pp.h	\
-	gr_feedforward_agc_cc.h		\
-	gr_feval.h			\
-	gr_fft_vcc.h			\
-	gr_fft_vcc_fftw.h		\
-	gr_fft_vfc.h			\
-	gr_firdes.h			\
-	gr_float_to_char.h		\
-	gr_float_to_complex.h		\
-	gr_float_to_int.h		\
-	gr_float_to_short.h		\
-	gr_float_to_uchar.h		\
-	gr_fmdet_cf.h			\
-	gr_framer_sink_1.h		\
-	gr_frequency_modulator_fc.h	\
-	gr_fxpt.h			\
-	gr_fxpt_nco.h			\
-	gr_fxpt_vco.h			\
-	gr_glfsr_source_b.h		\
-	gr_glfsr_source_f.h		\
-	gr_head.h			\
-	gr_interleave.h			\
-	gr_interleaved_short_to_complex.h \
-	gr_iqcomp_cc.h			\
-	gr_keep_one_in_n.h		\
-	gr_kludge_copy.h		\
-	gr_lfsr_32k_source_s.h		\
-	gr_log2_const.h			\
-	gr_map_bb.h			\
-	gr_math.h			\
-	gr_misc.h			\
-	gr_nco.h			\
-	gr_nlog10_ff.h			\
-	gr_nop.h			\
-	gr_null_sink.h			\
-	gr_null_source.h		\
-	gr_pa_2x2_phase_combiner.h	\
-	gr_packet_sink.h		\
-	gr_peak_detector2_fb.h		\
-	gr_phase_modulator_fc.h		\
-	gr_pll_carriertracking_cc.h	\
-	gr_pll_freqdet_cf.h		\
-	gr_pll_refout_cc.h		\
-	gr_pn_correlator_cc.h		\
-	gr_constants.h			\
-	gr_prefs.h			\
-	gr_probe_avg_mag_sqrd_c.h	\
-	gr_probe_avg_mag_sqrd_cf.h	\
-	gr_probe_avg_mag_sqrd_f.h	\
-	gr_probe_signal_f.h		\
-	gr_pwr_squelch_cc.h		\
-	gr_pwr_squelch_ff.h		\
-	gr_quadrature_demod_cf.h	\
-	gr_rail_ff.h			\
-	gr_random.h			\
-	gr_regenerate_bb.h		\
-	gr_remez.h			\
-	gr_repeat.h			\
-	gr_reverse.h			\
-	gr_rms_cf.h			\
-	gr_rms_ff.h			\
-	gr_short_to_float.h		\
-	gr_int_to_float.h		\
-	gr_simple_correlator.h		\
-	gr_simple_framer.h		\
-	gr_simple_framer_sync.h		\
-	gr_simple_squelch_cc.h		\
-	gr_squash_ff.h			\
-	gr_skiphead.h			\
-	gr_squelch_base_cc.h		\
-	gr_squelch_base_ff.h		\
-	gr_stream_mux.h			\
-	gr_stream_to_streams.h		\
-	gr_stream_to_vector.h		\
-	gr_streams_to_stream.h		\
-	gr_streams_to_vector.h		\
-	gr_stretch_ff.h			\
-        gr_test_types.h			\
-        gr_test.h			\
-	gr_threshold_ff.h		\
-	gr_throttle.h			\
-	gr_transcendental.h		\
-	gr_uchar_to_float.h		\
-	gr_vco.h			\
-	gr_vco_f.h			\
-	gr_vector_to_stream.h		\
-	gr_vector_to_streams.h		\
-	gr_wavelet_ff.h			\
-	gr_wvps_ff.h			\
-	gri_add_const_ss.h		\
-	gri_agc_cc.h			\
-	gri_agc_ff.h			\
-	gri_agc2_cc.h			\
-	gri_agc2_ff.h			\
-	gri_char_to_float.h		\
-	gri_control_loop.h		\
-	gri_debugger_hook.h		\
-	gri_fft.h			\
-	gri_float_to_char.h		\
-	gri_float_to_int.h		\
-	gri_float_to_short.h		\
-	gri_float_to_uchar.h		\
-	gri_lfsr.h			\
-	gri_glfsr.h			\
-	gri_interleaved_short_to_complex.h \
-	gri_int_to_float.h		\
-	gri_lfsr_15_1_0.h		\
-	gri_lfsr_32k.h			\
-	gri_short_to_float.h		\
-	gri_uchar_to_float.h		\
-	malloc16.h			\
-	random.h			\
-	gr_unpack_k_bits_bb.h		\
-	gr_descrambler_bb.h		\
-	gr_scrambler_bb.h		\
-	gr_probe_mpsk_snr_c.h		\
-	gr_probe_density_b.h		\
-	gr_annotator_alltoall.h		\
-	gr_annotator_1to1.h		\
-	gr_burst_tagger.h	\
-	gr_correlate_access_code_tag_bb.h
-
-noinst_HEADERS = 			\
-	qa_general.h			\
-	qa_gr_circular_file.h		\
-	qa_gr_cpm.h			\
-	qa_gr_firdes.h			\
-	qa_gr_fxpt.h			\
-	qa_gr_fxpt_nco.h		\
-	qa_gr_fxpt_vco.h		\
-	qa_gri_lfsr.h                   \
-	sine_table.h			\
-	qa_gr_math.h
-
-swiginclude_HEADERS =			\
-	complex_vec_test.i		\
-	general.i			\
-	gr_additive_scrambler_bb.i	\
-	gr_agc_cc.i                 	\
-	gr_agc_ff.i                 	\
-	gr_agc2_cc.i                 	\
-	gr_agc2_ff.i                 	\
-	gr_align_on_samplenumbers_ss.i	\
-	gr_bin_statistics_f.i		\
-	gr_bytes_to_syms.i		\
-	gr_char_to_float.i		\
-	gr_check_counting_s.i		\
-	gr_check_lfsr_32k_s.i		\
-	gr_complex_to_interleaved_short.i \
-	gr_complex_to_xxx.i		\
-	gr_conjugate_cc.i		\
-	gr_copy.i			\
-	gr_cpfsk_bc.i			\
-	gr_cpm.i			\
-	gr_ctcss_squelch_ff.i		\
-	gr_decode_ccsds_27_fb.i		\
-	gr_diff_decoder_bb.i		\
-	gr_diff_encoder_bb.i		\
-	gr_diff_phasor_cc.i		\
-	gr_dpll_bb.i			\
-	gr_deinterleave.i		\
-	gr_delay.i			\
-	gr_encode_ccsds_27_bb.i		\
-	gr_fake_channel_coder_pp.i	\
-	gr_feedforward_agc_cc.i		\
-	gr_feval.i			\
-	gr_fft_vcc.i			\
-	gr_fft_vfc.i			\
-	gr_firdes.i			\
-	gr_float_to_char.i		\
-	gr_float_to_complex.i		\
-	gr_float_to_int.i		\
-	gr_float_to_short.i		\
-	gr_float_to_uchar.i		\
-	gr_fmdet_cf.i			\
-	gr_frequency_modulator_fc.i	\
-	gr_framer_sink_1.i		\
-	gr_glfsr_source_b.i		\
-	gr_glfsr_source_f.i		\
-	gr_head.i			\
-	gr_int_to_float.i		\
-	gr_interleave.i 		\
-	gr_interleaved_short_to_complex.i \
-	gr_iqcomp_cc.i			\
-	gr_keep_one_in_n.i		\
-	gr_kludge_copy.i		\
-	gr_lfsr_32k_source_s.i		\
-	gr_map_bb.i			\
-	gr_nlog10_ff.i			\
-	gr_nop.i			\
-	gr_null_sink.i			\
-	gr_null_source.i		\
-	gr_pa_2x2_phase_combiner.i	\
-	gr_packet_sink.i		\
-	gr_peak_detector2_fb.i		\
-	gr_phase_modulator_fc.i		\
-	gr_pll_carriertracking_cc.i	\
-	gr_pll_freqdet_cf.i		\
-	gr_pll_refout_cc.i		\
-	gr_pn_correlator_cc.i		\
-	gr_constants.i			\
-	gr_prefs.i			\
-	gr_probe_avg_mag_sqrd_c.i	\
-	gr_probe_avg_mag_sqrd_cf.i	\
-	gr_probe_avg_mag_sqrd_f.i	\
-	gr_probe_signal_f.i		\
-	gr_pwr_squelch_cc.i		\
-	gr_pwr_squelch_ff.i		\
-	gr_quadrature_demod_cf.i	\
-	gr_rail_ff.i			\
-	gr_regenerate_bb.i		\
-	gr_remez.i			\
-	gr_rms_cf.i			\
-	gr_rms_ff.i			\
-	gr_repeat.i			\
-	gr_short_to_float.i		\
-	gr_simple_correlator.i		\
-	gr_simple_framer.i		\
-	gr_simple_squelch_cc.i		\
-	gr_skiphead.i			\
-	gr_squash_ff.i			\
-	gr_squelch_base_cc.i		\
-	gr_squelch_base_ff.i		\
-	gr_stream_mux.i			\
-	gr_stream_to_streams.i		\
-	gr_stream_to_vector.i		\
-	gr_streams_to_stream.i		\
-	gr_streams_to_vector.i		\
-	gr_stretch_ff.i			\
-        gr_test.i			\
-	gr_threshold_ff.i		\
-	gr_throttle.i			\
-	gr_transcendental.i		\
-	gr_uchar_to_float.i		\
-	gr_vco_f.i			\
-	gr_vector_to_stream.i		\
-	gr_vector_to_streams.i		\
-	gr_unpack_k_bits_bb.i		\
-	gr_wavelet_ff.i			\
-	gr_wvps_ff.i			\
-	gri_agc_cc.i			\
-	gri_agc_ff.i			\
-	gri_agc2_cc.i			\
-	gri_agc2_ff.i			\
-	gri_control_loop.i		\
-	gr_descrambler_bb.i		\
-	gr_scrambler_bb.i		\
-	gr_probe_mpsk_snr_c.i		\
-	gr_probe_density_b.i		\
-	gr_annotator_alltoall.i		\
-	gr_annotator_1to1.i		\
-	gr_burst_tagger.i	\
-	gr_correlate_access_code_tag_bb.i
diff --git a/gnuradio-core/src/lib/gengen/.gitignore b/gnuradio-core/src/lib/gengen/.gitignore
deleted file mode 100644
index ecd4cb0d5..000000000
--- a/gnuradio-core/src/lib/gengen/.gitignore
+++ /dev/null
@@ -1,418 +0,0 @@
-/Makefile
-/Makefile.in
-/.la
-/.lo
-/.deps
-/.libs
-/*.la
-/*.lo
-/*.pyc
-/generate-stamp
-/GrFIRfilterCCC.cc
-/GrFIRfilterCCC.h
-/GrFIRfilterCCF.cc
-/GrFIRfilterCCF.h
-/GrFIRfilterFCC.cc
-/GrFIRfilterFCC.h
-/GrFIRfilterFFF.cc
-/GrFIRfilterFFF.h
-/GrFIRfilterFSF.cc
-/GrFIRfilterFSF.h
-/GrFIRfilterSCC.cc
-/GrFIRfilterSCC.h
-/GrFIRfilterSIS.cc
-/GrFIRfilterSIS.h
-/GrFreqXlatingFIRfilterCCC.cc
-/GrFreqXlatingFIRfilterCCC.h
-/GrFreqXlatingFIRfilterCCF.cc
-/GrFreqXlatingFIRfilterCCF.h
-/GrFreqXlatingFIRfilterFCC.cc
-/GrFreqXlatingFIRfilterFCC.h
-/GrFreqXlatingFIRfilterFCF.cc
-/GrFreqXlatingFIRfilterFCF.h
-/GrFreqXlatingFIRfilterSCC.cc
-/GrFreqXlatingFIRfilterSCC.h
-/GrFreqXlatingFIRfilterSCF.cc
-/GrFreqXlatingFIRfilterSCF.h
-/gr_fir_CCC.cc
-/gr_fir_CCC.h
-/gr_fir_CCC_generic.cc
-/gr_fir_CCC_generic.h
-/gr_fir_CCF.cc
-/gr_fir_CCF.h
-/gr_fir_CCF_generic.cc
-/gr_fir_CCF_generic.h
-/gr_fir_FCC.cc
-/gr_fir_FCC.h
-/gr_fir_FCC_generic.cc
-/gr_fir_FCC_generic.h
-/gr_fir_FFF.cc
-/gr_fir_FFF.h
-/gr_fir_FFF_generic.cc
-/gr_fir_FFF_generic.h
-/gr_fir_FSF.cc
-/gr_fir_FSF.h
-/gr_fir_FSF_generic.cc
-/gr_fir_FSF_generic.h
-/gr_fir_SCC.cc
-/gr_fir_SCC.h
-/gr_fir_SCC_generic.cc
-/gr_fir_SCC_generic.h
-/gr_fir_SIS.cc
-/gr_fir_SIS.h
-/gr_fir_SIS_generic.cc
-/gr_fir_SIS_generic.h
-/gr_fir_sysconfig.cc
-/gr_fir_sysconfig.h
-/gr_fir_sysconfig_generic.cc
-/gr_fir_sysconfig_generic.h
-/gr_fir_util.cc
-/gr_fir_util.h
-/GrFIRfilterCCC.i
-/GrFIRfilterCCF.i
-/GrFIRfilterFCC.i
-/GrFIRfilterFFF.i
-/GrFIRfilterFSF.i
-/GrFIRfilterSCC.i
-/GrFIRfilterSIS.i
-/GrFreqXlatingFIRfilterCCC.i
-/GrFreqXlatingFIRfilterCCF.i
-/GrFreqXlatingFIRfilterFCC.i
-/GrFreqXlatingFIRfilterFCF.i
-/GrFreqXlatingFIRfilterSCC.i
-/GrFreqXlatingFIRfilterSCF.i
-/# --- generated files ---
-/gr_add_cc.cc
-/gr_add_cc.h
-/gr_add_cc.i
-/gr_add_const_c.cc
-/gr_add_const_cc.cc
-/gr_add_const_cc.h
-/gr_add_const_cc.i
-/gr_add_const_c.h
-/gr_add_const_c.i
-/gr_add_const_f.cc
-/gr_add_const_ff.cc
-/gr_add_const_ff.h
-/gr_add_const_ff.i
-/gr_add_const_f.h
-/gr_add_const_f.i
-/gr_add_const_i.cc
-/gr_add_const_i.h
-/gr_add_const_i.i
-/gr_add_const_ii.cc
-/gr_add_const_ii.h
-/gr_add_const_ii.i
-/gr_add_const_s.cc
-/gr_add_const_sf.cc
-/gr_add_const_sf.h
-/gr_add_const_sf.i
-/gr_add_const_s.h
-/gr_add_const_s.i
-/gr_add_const_ss.cc
-/gr_add_const_ss.h
-/gr_add_const_ss.i
-/gr_add_const_vcc.cc
-/gr_add_const_vcc.h
-/gr_add_const_vcc.i
-/gr_add_const_vff.cc
-/gr_add_const_vff.h
-/gr_add_const_vff.i
-/gr_add_const_vii.cc
-/gr_add_const_vii.h
-/gr_add_const_vii.i
-/gr_add_const_vss.cc
-/gr_add_const_vss.h
-/gr_add_const_vss.i
-/gr_add_ff.cc
-/gr_add_ff.h
-/gr_add_ff.i
-/gr_add_ii.cc
-/gr_add_ii.h
-/gr_add_ii.i
-/gr_add_ss.cc
-/gr_add_ss.h
-/gr_add_ss.i
-/gr_and_bb.cc
-/gr_and_bb.h
-/gr_and_bb.i
-/gr_and_ii.cc
-/gr_and_ii.h
-/gr_and_ii.i
-/gr_and_ss.cc
-/gr_and_ss.h
-/gr_and_ss.i
-/gr_argmax_fs.cc
-/gr_argmax_fs.h
-/gr_argmax_fs.i
-/gr_argmax_is.cc
-/gr_argmax_is.h
-/gr_argmax_is.i
-/gr_argmax_ss.cc
-/gr_argmax_ss.h
-/gr_argmax_ss.i
-/gr_chunks_to_symbols_bc.cc
-/gr_chunks_to_symbols_bc.h
-/gr_chunks_to_symbols_bc.i
-/gr_chunks_to_symbols_bf.cc
-/gr_chunks_to_symbols_bf.h
-/gr_chunks_to_symbols_bf.i
-/gr_chunks_to_symbols_ic.cc
-/gr_chunks_to_symbols_ic.h
-/gr_chunks_to_symbols_ic.i
-/gr_chunks_to_symbols_if.cc
-/gr_chunks_to_symbols_if.h
-/gr_chunks_to_symbols_if.i
-/gr_chunks_to_symbols_sc.cc
-/gr_chunks_to_symbols_sc.h
-/gr_chunks_to_symbols_sc.i
-/gr_chunks_to_symbols_sf.cc
-/gr_chunks_to_symbols_sf.h
-/gr_chunks_to_symbols_sf.i
-/gr_divide_cc.cc
-/gr_divide_cc.h
-/gr_divide_cc.i
-/gr_divide_ff.cc
-/gr_divide_ff.h
-/gr_divide_ff.i
-/gr_divide_ii.cc
-/gr_divide_ii.h
-/gr_divide_ii.i
-/gr_divide_ss.cc
-/gr_divide_ss.h
-/gr_divide_ss.i
-/gr_integrate_cc.cc
-/gr_integrate_cc.h
-/gr_integrate_cc.i
-/gr_integrate_ff.cc
-/gr_integrate_ff.h
-/gr_integrate_ff.i
-/gr_integrate_ii.cc
-/gr_integrate_ii.h
-/gr_integrate_ii.i
-/gr_integrate_ss.cc
-/gr_integrate_ss.h
-/gr_integrate_ss.i
-/gr_max_ff.cc
-/gr_max_ff.h
-/gr_max_ff.i
-/gr_max_ii.cc
-/gr_max_ii.h
-/gr_max_ii.i
-/gr_max_ss.cc
-/gr_max_ss.h
-/gr_max_ss.i
-/gr_multiply_cc.cc
-/gr_multiply_cc.h
-/gr_multiply_cc.i
-/gr_multiply_const_cc.cc
-/gr_multiply_const_cc.h
-/gr_multiply_const_cc.i
-/gr_multiply_const_ff.cc
-/gr_multiply_const_ff.h
-/gr_multiply_const_ff.i
-/gr_multiply_const_ii.cc
-/gr_multiply_const_ii.h
-/gr_multiply_const_ii.i
-/gr_multiply_const_ss.cc
-/gr_multiply_const_ss.h
-/gr_multiply_const_ss.i
-/gr_multiply_const_vcc.cc
-/gr_multiply_const_vcc.h
-/gr_multiply_const_vcc.i
-/gr_multiply_const_vff.cc
-/gr_multiply_const_vff.h
-/gr_multiply_const_vff.i
-/gr_multiply_const_vii.cc
-/gr_multiply_const_vii.h
-/gr_multiply_const_vii.i
-/gr_multiply_const_vss.cc
-/gr_multiply_const_vss.h
-/gr_multiply_const_vss.i
-/gr_multiply_ff.cc
-/gr_multiply_ff.h
-/gr_multiply_ff.i
-/gr_multiply_ii.cc
-/gr_multiply_ii.h
-/gr_multiply_ii.i
-/gr_multiply_ss.cc
-/gr_multiply_ss.h
-/gr_multiply_ss.i
-/gr_mute_cc.cc
-/gr_mute_cc.h
-/gr_mute_cc.i
-/gr_mute_ff.cc
-/gr_mute_ff.h
-/gr_mute_ff.i
-/gr_mute_ii.cc
-/gr_mute_ii.h
-/gr_mute_ii.i
-/gr_mute_ss.cc
-/gr_mute_ss.h
-/gr_mute_ss.i
-/gr_noise_source_c.cc
-/gr_noise_source_c.h
-/gr_noise_source_c.i
-/gr_noise_source_f.cc
-/gr_noise_source_f.h
-/gr_noise_source_f.i
-/gr_noise_source_i.cc
-/gr_noise_source_i.h
-/gr_noise_source_i.i
-/gr_noise_source_s.cc
-/gr_noise_source_s.h
-/gr_noise_source_s.i
-/gr_not_bb.cc
-/gr_not_bb.h
-/gr_not_bb.i
-/gr_not_ii.cc
-/gr_not_ii.h
-/gr_not_ii.i
-/gr_not_ss.cc
-/gr_not_ss.h
-/gr_not_ss.i
-/gr_or_bb.cc
-/gr_or_bb.h
-/gr_or_bb.i
-/gr_or_ii.cc
-/gr_or_ii.h
-/gr_or_ii.i
-/gr_or_ss.cc
-/gr_or_ss.h
-/gr_or_ss.i
-/gr_packed_to_unpacked_bb.cc
-/gr_packed_to_unpacked_bb.h
-/gr_packed_to_unpacked_bb.i
-/gr_packed_to_unpacked_ii.cc
-/gr_packed_to_unpacked_ii.h
-/gr_packed_to_unpacked_ii.i
-/gr_packed_to_unpacked_ss.cc
-/gr_packed_to_unpacked_ss.h
-/gr_packed_to_unpacked_ss.i
-/gr_peak_detector_fb.cc
-/gr_peak_detector_fb.h
-/gr_peak_detector_fb.i
-/gr_peak_detector_ff.cc
-/gr_peak_detector_ff.h
-/gr_peak_detector_ff.i
-/gr_peak_detector_ib.cc
-/gr_peak_detector_ib.h
-/gr_peak_detector_ib.i
-/gr_peak_detector_ii.cc
-/gr_peak_detector_ii.h
-/gr_peak_detector_ii.i
-/gr_peak_detector_sb.cc
-/gr_peak_detector_sb.h
-/gr_peak_detector_sb.i
-/gr_peak_detector_ss.cc
-/gr_peak_detector_ss.h
-/gr_peak_detector_ss.i
-/gr_prefix.cc
-/gr_sample_and_hold_bb.cc
-/gr_sample_and_hold_bb.h
-/gr_sample_and_hold_bb.i
-/gr_sample_and_hold_ff.cc
-/gr_sample_and_hold_ff.h
-/gr_sample_and_hold_ff.i
-/gr_sample_and_hold_ii.cc
-/gr_sample_and_hold_ii.h
-/gr_sample_and_hold_ii.i
-/gr_sample_and_hold_ss.cc
-/gr_sample_and_hold_ss.h
-/gr_sample_and_hold_ss.i
-/gr_sig_source_c.cc
-/gr_sig_source_c.h
-/gr_sig_source_c.i
-/gr_sig_source_f.cc
-/gr_sig_source_f.h
-/gr_sig_source_f.i
-/gr_sig_source_i.cc
-/gr_sig_source_i.h
-/gr_sig_source_i.i
-/gr_sig_source_s.cc
-/gr_sig_source_s.h
-/gr_sig_source_s.i
-/gr_sub_cc.cc
-/gr_sub_cc.h
-/gr_sub_cc.i
-/gr_sub_ff.cc
-/gr_sub_ff.h
-/gr_sub_ff.i
-/gr_sub_ii.cc
-/gr_sub_ii.h
-/gr_sub_ii.i
-/gr_sub_ss.cc
-/gr_sub_ss.h
-/gr_sub_ss.i
-/gr_unpacked_to_packed_bb.cc
-/gr_unpacked_to_packed_bb.h
-/gr_unpacked_to_packed_bb.i
-/gr_unpacked_to_packed_ii.cc
-/gr_unpacked_to_packed_ii.h
-/gr_unpacked_to_packed_ii.i
-/gr_unpacked_to_packed_ss.cc
-/gr_unpacked_to_packed_ss.h
-/gr_unpacked_to_packed_ss.i
-/gr_vector_sink_b.cc
-/gr_vector_sink_b.h
-/gr_vector_sink_b.i
-/gr_vector_sink_c.cc
-/gr_vector_sink_c.h
-/gr_vector_sink_c.i
-/gr_vector_sink_f.cc
-/gr_vector_sink_f.h
-/gr_vector_sink_f.i
-/gr_vector_sink_i.cc
-/gr_vector_sink_i.h
-/gr_vector_sink_i.i
-/gr_vector_sink_s.cc
-/gr_vector_sink_s.h
-/gr_vector_sink_s.i
-/gr_vector_source_b.cc
-/gr_vector_source_b.h
-/gr_vector_source_b.i
-/gr_vector_source_c.cc
-/gr_vector_source_c.h
-/gr_vector_source_c.i
-/gr_vector_source_f.cc
-/gr_vector_source_f.h
-/gr_vector_source_f.i
-/gr_vector_source_i.cc
-/gr_vector_source_i.h
-/gr_vector_source_i.i
-/gr_vector_source_s.cc
-/gr_vector_source_s.h
-/gr_vector_source_s.i
-/gr_xor_bb.cc
-/gr_xor_bb.h
-/gr_xor_bb.i
-/gr_xor_ii.cc
-/gr_xor_ii.h
-/gr_xor_ii.i
-/gr_xor_ss.cc
-/gr_xor_ss.h
-/gr_xor_ss.i
-/gr_moving_average_cc.cc
-/gr_moving_average_cc.h
-/gr_moving_average_cc.i
-/gr_moving_average_ff.cc
-/gr_moving_average_ff.h
-/gr_moving_average_ff.i
-/gr_moving_average_ss.cc
-/gr_moving_average_ss.h
-/gr_moving_average_ss.i
-/gr_moving_average_ii.cc
-/gr_moving_average_ii.h
-/gr_moving_average_ii.i
-/gr_and_const_bb.cc
-/gr_and_const_ss.h
-/gr_and_const_ss.i
-/gr_and_const_ii.cc
-/gr_and_const_bb.h
-/gr_and_const_ss.cc
-/gr_and_const_bb.i
-/gr_and_const_ii.h
-/gr_and_const_ii.i
-/# --- end generated files ---
-/stamp-*
-/gengen_generated.i
diff --git a/gnuradio-core/src/lib/gengen/Makefile.am b/gnuradio-core/src/lib/gengen/Makefile.am
deleted file mode 100644
index 5fbb6f52c..000000000
--- a/gnuradio-core/src/lib/gengen/Makefile.am
+++ /dev/null
@@ -1,159 +0,0 @@
-#
-# Copyright 2001,2002,2004,2006,2007,2008,2009 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 GNU Radio; see the file COPYING.  If not, write to
-# the Free Software Foundation, Inc., 51 Franklin Street,
-# Boston, MA 02110-1301, USA.
-# 
-
-include $(top_srcdir)/Makefile.common
-
-AM_CPPFLAGS = $(STD_DEFINES_AND_INCLUDES) $(CPPUNIT_INCLUDES) $(WITH_INCLUDES)
-
-#noinst_LTLIBRARIES = libgengen.la libgengen-qa.la
-noinst_LTLIBRARIES = libgengen.la
-
-# ----------------------------------------------------------------
-# these scripts generate code
-
-core_generator = 			\
-	generate_all.py			\
-	generate_common.py		\
-	gr_add_XX.cc.t			\
-	gr_add_XX.h.t			\
-	gr_add_XX.i.t			\
-	gr_add_const_XX.cc.t		\
-	gr_add_const_XX.h.t		\
-	gr_add_const_XX.i.t		\
-	gr_add_const_vXX.cc.t		\
-	gr_add_const_vXX.h.t		\
-	gr_add_const_vXX.i.t		\
-	gr_argmax_XX.cc.t		\
-	gr_argmax_XX.h.t		\
-	gr_argmax_XX.i.t		\
-	gr_chunks_to_symbols_XX.cc.t	\
-	gr_chunks_to_symbols_XX.h.t	\
-	gr_chunks_to_symbols_XX.i.t	\
-	gr_divide_XX.cc.t		\
-	gr_divide_XX.h.t		\
-	gr_divide_XX.i.t		\
-	gr_integrate_XX.cc.t		\
-	gr_integrate_XX.h.t		\
-	gr_integrate_XX.i.t		\
-	gr_max_XX.cc.t			\
-	gr_max_XX.h.t			\
-	gr_max_XX.i.t			\
-	gr_multiply_XX.cc.t		\
-	gr_multiply_XX.h.t		\
-	gr_multiply_XX.i.t		\
-	gr_multiply_const_XX.cc.t	\
-	gr_multiply_const_XX.h.t	\
-	gr_multiply_const_XX.i.t	\
-	gr_multiply_const_vXX.cc.t	\
-	gr_multiply_const_vXX.h.t	\
-	gr_multiply_const_vXX.i.t	\
-	gr_mute_XX.cc.t			\
-	gr_mute_XX.h.t			\
-	gr_mute_XX.i.t			\
-	gr_noise_source_X.cc.t		\
-	gr_noise_source_X.h.t		\
-	gr_noise_source_X.i.t		\
-	gr_packed_to_unpacked_XX.cc.t	\
-	gr_packed_to_unpacked_XX.h.t	\
-	gr_packed_to_unpacked_XX.i.t	\
-	gr_peak_detector_XX.cc.t	\
-	gr_peak_detector_XX.h.t		\
-	gr_peak_detector_XX.i.t		\
-	gr_sample_and_hold_XX.cc.t	\
-	gr_sample_and_hold_XX.h.t	\
-	gr_sample_and_hold_XX.i.t	\
-	gr_sig_source_X.cc.t		\
-	gr_sig_source_X.h.t		\
-	gr_sig_source_X.i.t		\
-	gr_sub_XX.cc.t			\
-	gr_sub_XX.h.t			\
-	gr_sub_XX.i.t			\
-	gr_unpacked_to_packed_XX.cc.t	\
-	gr_unpacked_to_packed_XX.h.t	\
-	gr_unpacked_to_packed_XX.i.t	\
-	gr_vector_source_X.cc.t		\
-	gr_vector_source_X.h.t		\
-	gr_vector_source_X.i.t		\
-	gr_vector_sink_X.cc.t		\
-	gr_vector_sink_X.h.t		\
-	gr_vector_sink_X.i.t		\
-	gr_xor_XX.cc.t			\
-	gr_xor_XX.h.t			\
-	gr_xor_XX.i.t     		\
-	gr_and_XX.cc.t			\
-	gr_and_XX.h.t			\
-	gr_and_XX.i.t     		\
-	gr_and_const_XX.cc.t		\
-	gr_and_const_XX.h.t		\
-	gr_and_const_XX.i.t     	\
-	gr_or_XX.cc.t			\
-	gr_or_XX.h.t			\
-	gr_or_XX.i.t      		\
-	gr_not_XX.cc.t			\
-	gr_not_XX.h.t			\
-	gr_not_XX.i.t			\
-	gr_moving_average_XX.cc.t	\
-	gr_moving_average_XX.h.t	\
-	gr_moving_average_XX.i.t
-
-# Source built by Python into $(builddir)
-BUILT_SOURCES +=		\
-	$(GENERATED_H)		\
-	$(GENERATED_I)		\
-	$(GENERATED_CC)		\
-	gengen_generated.i
-
-# ----------------------------------------------------------------
-
-EXTRA_DIST += \
-	$(core_generator)
-
-libgengen_la_SOURCES = 			\
-	$(GENERATED_CC)			
-
-grinclude_HEADERS = 			\
-	$(GENERATED_H)			\
-	gr_endianness.h			\
-	gr_noise_type.h			\
-	gr_sig_source_waveform.h	
-
-swiginclude_HEADERS =			\
-	$(GENERATED_I)			\
-	gr_endianness.i			\
-	gengen.i			\
-	gengen_generated.i		
-
-# Do creation and inclusion of other Makefiles last
-
-# include the srcdir's Makefile.gen; doing this creates an implicit
-# dependency between $(srcdir)/Makefile.in and $(srcdir)/Makefile.gen.
-include $(srcdir)/Makefile.gen
-
-# common way for generating local Makefile.gen
-makefile_gen_gen_command = PYTHONPATH=$(top_srcdir)/gnuradio-core/src/python srcdir=$(srcdir) do_makefile=1 do_sources=0 $(PYTHON) $(srcdir)/generate_all.py
-include $(top_srcdir)/Makefile.gen.gen
-
-# common way for generating sources from templates when using
-# BUILT_SOURCES, using parallel build protection.
-gen_sources = $(BUILT_SOURCES)
-gen_sources_deps = $(core_generator)
-par_gen_command = PYTHONPATH=$(top_srcdir)/gnuradio-core/src/python srcdir=$(srcdir) $(PYTHON) $(srcdir)/generate_all.py
-include $(top_srcdir)/Makefile.par.gen
diff --git a/gnuradio-core/src/lib/hier/.gitignore b/gnuradio-core/src/lib/hier/.gitignore
deleted file mode 100644
index 89a768d46..000000000
--- a/gnuradio-core/src/lib/hier/.gitignore
+++ /dev/null
@@ -1,4 +0,0 @@
-/Makefile
-/Makefile.in
-/.libs
-/.deps
diff --git a/gnuradio-core/src/lib/hier/Makefile.am b/gnuradio-core/src/lib/hier/Makefile.am
deleted file mode 100644
index 369feef75..000000000
--- a/gnuradio-core/src/lib/hier/Makefile.am
+++ /dev/null
@@ -1,37 +0,0 @@
-#
-# Copyright 2009,2010 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 GNU Radio; see the file COPYING.  If not, write to
-# the Free Software Foundation, Inc., 51 Franklin Street,
-# Boston, MA 02110-1301, USA.
-# 
-
-include $(top_srcdir)/Makefile.common
-
-
-AM_CPPFLAGS = $(STD_DEFINES_AND_INCLUDES) $(WITH_INCLUDES)
-
-noinst_LTLIBRARIES = libhier.la
-
-libhier_la_SOURCES = \
-	gr_channel_model.cc
-
-grinclude_HEADERS = \
-	gr_channel_model.h
-
-swiginclude_HEADERS = \
-	hier.i \
-	gr_channel_model.i
diff --git a/gnuradio-core/src/lib/io/.gitignore b/gnuradio-core/src/lib/io/.gitignore
deleted file mode 100644
index a02b6ff73..000000000
--- a/gnuradio-core/src/lib/io/.gitignore
+++ /dev/null
@@ -1,8 +0,0 @@
-/Makefile
-/Makefile.in
-/.la
-/.lo
-/.deps
-/.libs
-/*.la
-/*.lo
diff --git a/gnuradio-core/src/lib/io/Makefile.am b/gnuradio-core/src/lib/io/Makefile.am
deleted file mode 100644
index 442d5e3a9..000000000
--- a/gnuradio-core/src/lib/io/Makefile.am
+++ /dev/null
@@ -1,116 +0,0 @@
-#
-# Copyright 2001,2003,2004,2006,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 GNU Radio; see the file COPYING.  If not, write to
-# the Free Software Foundation, Inc., 51 Franklin Street,
-# Boston, MA 02110-1301, USA.
-# 
-
-include $(top_srcdir)/Makefile.common
-
-
-AM_CPPFLAGS = $(STD_DEFINES_AND_INCLUDES) $(WITH_INCLUDES)
-
-noinst_LTLIBRARIES = libio.la
-
-
-libio_la_SOURCES = 			\
-	gr_file_sink.cc			\
-	gr_file_sink_base.cc		\
-	gr_file_source.cc		\
-	gr_file_descriptor_sink.cc	\
-	gr_file_descriptor_source.cc	\
-	gr_histo_sink_f.cc		\
-	gr_message_sink.cc		\
-	gr_message_source.cc		\
-	gr_oscope_guts.cc		\
-	gr_oscope_sink_f.cc		\
-	gr_oscope_sink_x.cc		\
-	i2c.cc				\
-	i2c_bitbang.cc			\
-	i2c_bbio.cc			\
-	i2c_bbio_pp.cc			\
-	microtune_4702.cc		\
-	microtune_4937.cc		\
-	microtune_4702_eval_board.cc	\
-	microtune_4937_eval_board.cc	\
-	microtune_xxxx.cc		\
-	microtune_xxxx_eval_board.cc	\
-	ppio.cc				\
-	ppio_ppdev.cc			\
-	sdr_1000.cc			\
-	gr_udp_sink.cc			\
-	gr_udp_source.cc                \
-	gr_wavfile_sink.cc              \
-	gr_wavfile_source.cc            \
-	gri_wavfile.cc			\
-	gr_tagged_file_sink.cc
-
-grinclude_HEADERS = 			\
-	gr_file_sink.h			\
-	gr_file_sink_base.h		\
-	gr_file_source.h		\
-	gr_file_descriptor_sink.h	\
-	gr_file_descriptor_source.h	\
-	gr_histo_sink_f.h		\
-	gr_message_sink.h		\
-	gr_message_source.h		\
-	gr_oscope_guts.h		\
-	gr_oscope_sink_f.h		\
-	gr_oscope_sink_x.h		\
-	gr_trigger_mode.h		\
-	i2c.h				\
-	i2c_bitbang.h			\
-	i2c_bbio.h			\
-	i2c_bbio_pp.h			\
-	microtune_4702.h		\
-	microtune_4937.h		\
-	microtune_4702_eval_board.h	\
-	microtune_4937_eval_board.h	\
-	microtune_eval_board_defs.h 	\
-	microtune_xxxx.h		\
-	microtune_xxxx_eval_board.h	\
-	ppio.h				\
-	ppio_ppdev.h			\
-	sdr_1000.h			\
-	gr_udp_sink.h			\
-	gr_udp_source.h                 \
-	gr_wavfile_source.h	        \
-	gr_wavfile_sink.h               \
-	gri_wavfile.h			\
-	gr_tagged_file_sink.h
-
-swiginclude_HEADERS =			\
-	io.i				\
-	gr_file_sink.i			\
-	gr_file_sink_base.i		\
-	gr_file_source.i		\
-	gr_file_descriptor_sink.i	\
-	gr_file_descriptor_source.i	\
-	gr_histo_sink.i			\
-	gr_message_sink.i		\
-	gr_message_source.i		\
-	gr_oscope_sink.i		\
-	microtune_xxxx_eval_board.i	\
-	microtune_4702_eval_board.i	\
-	microtune_4937_eval_board.i	\
-	ppio.i				\
-	sdr_1000.i			\
-	gr_udp_sink.i			\
-	gr_udp_source.i                 \
-	gr_wavfile_source.i             \
-	gr_wavfile_sink.i		\
-	gr_tagged_file_sink.i
diff --git a/gnuradio-core/src/lib/missing/.gitignore b/gnuradio-core/src/lib/missing/.gitignore
deleted file mode 100644
index a02b6ff73..000000000
--- a/gnuradio-core/src/lib/missing/.gitignore
+++ /dev/null
@@ -1,8 +0,0 @@
-/Makefile
-/Makefile.in
-/.la
-/.lo
-/.deps
-/.libs
-/*.la
-/*.lo
diff --git a/gnuradio-core/src/lib/missing/Makefile.am b/gnuradio-core/src/lib/missing/Makefile.am
deleted file mode 100644
index 1cc6014a1..000000000
--- a/gnuradio-core/src/lib/missing/Makefile.am
+++ /dev/null
@@ -1,46 +0,0 @@
-#
-# Copyright 2003,2004,2008,2009,2011 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 GNU Radio; see the file COPYING.  If not, write to
-# the Free Software Foundation, Inc., 51 Franklin Street,
-# Boston, MA 02110-1301, USA.
-# 
-
-include $(top_srcdir)/Makefile.common
-
-AM_CPPFLAGS = $(GRUEL_INCLUDES) $(GNURADIO_INCLUDES) $(WITH_INCLUDES)
-
-EXTRA_DIST += 			\
-	getopt.h 		\
-	getopt.c 		\
-	gettimeofday.c 		\
-	posix_memalign.cc	\
-	posix_memalign.h	\
-	usleep.c		
-
-noinst_LTLIBRARIES = libmissing.la
-
-libmissing_la_common_SOURCES =	\
-	bug_work_around_8.cc
-
-powerpc_CODE = \
-	posix_memalign.cc	
-
-if MD_CPU_powerpc
-libmissing_la_SOURCES = $(libmissing_la_common_SOURCES) $(powerpc_CODE)
-else
-libmissing_la_SOURCES = $(libmissing_la_common_SOURCES)
-endif
diff --git a/gnuradio-core/src/lib/reed-solomon/.gitignore b/gnuradio-core/src/lib/reed-solomon/.gitignore
deleted file mode 100644
index f137f5c67..000000000
--- a/gnuradio-core/src/lib/reed-solomon/.gitignore
+++ /dev/null
@@ -1,9 +0,0 @@
-/Makefile
-/Makefile.in
-/.la
-/.lo
-/.deps
-/.libs
-/*.la
-/*.lo
-/rstest
diff --git a/gnuradio-core/src/lib/reed-solomon/Makefile.am b/gnuradio-core/src/lib/reed-solomon/Makefile.am
deleted file mode 100644
index 5548f4280..000000000
--- a/gnuradio-core/src/lib/reed-solomon/Makefile.am
+++ /dev/null
@@ -1,55 +0,0 @@
-#
-# Copyright 2002,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 GNU Radio; see the file COPYING.  If not, write to
-# the Free Software Foundation, Inc., 51 Franklin Street,
-# Boston, MA 02110-1301, USA.
-# 
-
-include $(top_srcdir)/Makefile.common
-
-# Note, this Makefile.am only builds the char versions of the reed soloman routines.
-# If you need the int versions too, please figure out how to add them *cleanly* to 
-# this Makefile.am.
-
-AM_CPPFLAGS = $(STD_DEFINES_AND_INCLUDES) $(CPPUNIT_INCLUDES) $(WITH_INCLUDES)
-
-TESTS = rstest
-
-EXTRA_DIST +=			\
-	README.karn
-
-noinst_LTLIBRARIES = librs.la
-
-noinst_PROGRAMS = 		\
-	rstest
-
-librs_la_SOURCES = 		\
-	encode_rs.c		\
-	decode_rs.c		\
-	init_rs.c
-
-grinclude_HEADERS = 		\
-	rs.h
-
-noinst_HEADERS = 		\
-	ccsds.h			\
-	char.h			\
-	int.h			\
-	fixed.h			
-
-rstest_SOURCES =	rstest.c exercise.c
-rstest_LDADD =		librs.la
diff --git a/gnuradio-core/src/lib/runtime/.gitignore b/gnuradio-core/src/lib/runtime/.gitignore
deleted file mode 100644
index a02b6ff73..000000000
--- a/gnuradio-core/src/lib/runtime/.gitignore
+++ /dev/null
@@ -1,8 +0,0 @@
-/Makefile
-/Makefile.in
-/.la
-/.lo
-/.deps
-/.libs
-/*.la
-/*.lo
diff --git a/gnuradio-core/src/lib/runtime/Makefile.am b/gnuradio-core/src/lib/runtime/Makefile.am
deleted file mode 100644
index 38da3d5fd..000000000
--- a/gnuradio-core/src/lib/runtime/Makefile.am
+++ /dev/null
@@ -1,165 +0,0 @@
-#
-# Copyright 2003,2004,2007,2008,2009,2010,2011 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 GNU Radio; see the file COPYING.  If not, write to
-# the Free Software Foundation, Inc., 51 Franklin Street,
-# Boston, MA 02110-1301, USA.
-# 
-
-include $(top_srcdir)/Makefile.common
-
-AM_CPPFLAGS = $(GRUEL_INCLUDES) $(STD_DEFINES_AND_INCLUDES) $(CPPUNIT_INCLUDES) $(WITH_INCLUDES)
-
-noinst_LTLIBRARIES = libruntime.la libruntime-qa.la
-
-libruntime_la_LIBADD =		\
-	$(SHM_OPEN_LIBS)
-
-
-libruntime_la_SOURCES = 			\
-	gr_basic_block.cc			\
-	gr_flowgraph.cc				\
-	gr_flat_flowgraph.cc			\
-	gr_block.cc				\
-	gr_block_detail.cc			\
-	gr_block_executor.cc			\
-	gr_hier_block2.cc			\
-	gr_hier_block2_detail.cc		\
-	gr_buffer.cc				\
-	gr_dispatcher.cc			\
-	gr_error_handler.cc			\
-	gr_io_signature.cc			\
-	gr_local_sighandler.cc			\
-	gr_message.cc				\
-	gr_msg_accepter.cc			\
-	gr_msg_handler.cc			\
-	gr_msg_queue.cc				\
-	gr_pagesize.cc				\
-	gr_preferences.cc			\
-	gr_realtime.cc				\
-	gr_scheduler.cc				\
-	gr_scheduler_sts.cc			\
-	gr_scheduler_tpb.cc			\
-	gr_single_threaded_scheduler.cc		\
-	gr_sptr_magic.cc			\
-	gr_sync_block.cc			\
-	gr_sync_decimator.cc			\
-	gr_sync_interpolator.cc			\
-	gr_sys_paths.cc				\
-	gr_top_block.cc				\
-	gr_top_block_impl.cc			\
-	gr_tpb_detail.cc			\
-	gr_tpb_thread_body.cc			\
-	gr_vmcircbuf.cc				\
-	gr_vmcircbuf_mmap_shm_open.cc		\
-	gr_vmcircbuf_mmap_tmpfile.cc		\
-	gr_vmcircbuf_createfilemapping.cc	\
-	gr_vmcircbuf_sysv_shm.cc		\
-	gr_select_handler.cc
-
-libruntime_qa_la_SOURCES = 			\
-	qa_gr_block.cc				\
-	qa_gr_hier_block2.cc			\
-	qa_gr_hier_block2_derived.cc		\
-	qa_gr_buffer.cc				\
-	qa_gr_flowgraph.cc			\
-	qa_gr_top_block.cc			\
-	qa_gr_io_signature.cc			\
-	qa_gr_vmcircbuf.cc			\
-	qa_block_tags.cc			\
-	qa_set_msg_handler.cc			\
-	qa_runtime.cc				
-
-grinclude_HEADERS = 				\
-	gr_basic_block.h			\
-	gr_flowgraph.h				\
-	gr_flat_flowgraph.h			\
-	gr_block.h				\
-	gr_block_detail.h			\
-	gr_block_executor.h			\
-	gr_hier_block2.h			\
-	gr_hier_block2_detail.h			\
-	gr_buffer.h				\
-	gr_complex.h				\
-	gr_dispatcher.h				\
-	gr_error_handler.h			\
-	gr_io_signature.h			\
-	gr_local_sighandler.h			\
-	gr_message.h				\
-	gr_msg_accepter.h			\
-	gr_msg_handler.h			\
-	gr_msg_queue.h				\
-	gr_pagesize.h				\
-	gr_preferences.h			\
-	gr_realtime.h				\
-	gr_runtime_types.h			\
-	gr_scheduler.h				\
-	gr_scheduler_sts.h			\
-	gr_scheduler_tpb.h			\
-	gr_select_handler.h			\
-	gr_single_threaded_scheduler.h		\
-	gr_sptr_magic.h				\
-	gr_sync_block.h				\
-	gr_sync_decimator.h			\
-	gr_sync_interpolator.h			\
-	gr_top_block.h				\
-	gr_top_block_impl.h			\
-	gr_tpb_detail.h				\
-	gr_tpb_thread_body.h			\
-	gr_timer.h				\
-	gr_sys_paths.h				\
-	gr_types.h				\
-	gr_unittests.h				\
-	gr_vmcircbuf.h				\
-	gr_tags.h
-
-noinst_HEADERS = 				\
-	gr_vmcircbuf_mmap_shm_open.h		\
-	gr_vmcircbuf_mmap_tmpfile.h		\
-	gr_vmcircbuf_sysv_shm.h			\
-	gr_vmcircbuf_createfilemapping.h	\
-	qa_gr_block.h				\
-	qa_gr_flowgraph.h			\
-	qa_gr_hier_block2.h			\
-	qa_gr_hier_block2_derived.h		\
-	qa_gr_buffer.h				\
-	qa_gr_io_signature.h			\
-	qa_gr_top_block.h			\
-	qa_gr_vmcircbuf.h			\
-	qa_block_tags.h				\
-	qa_set_msg_handler.h			\
-	qa_runtime.h				
-
-swiginclude_HEADERS =			\
-	gr_basic_block.i		\
-	gr_block.i			\
-	gr_block_detail.i		\
-	gr_hier_block2.i		\
-	gr_buffer.i			\
-	gr_dispatcher.i			\
-	gr_error_handler.i		\
-	gr_io_signature.i		\
-	gr_message.i			\
-	gr_msg_handler.i		\
-	gr_msg_queue.i			\
-	gr_realtime.i			\
-	gr_single_threaded_scheduler.i	\
-	gr_sync_block.i			\
-	gr_sync_decimator.i		\
-	gr_sync_interpolator.i		\
-	gr_tags.i				\
-	gr_top_block.i			\
-	runtime.i
diff --git a/gnuradio-core/src/lib/swig/.gitignore b/gnuradio-core/src/lib/swig/.gitignore
deleted file mode 100644
index a6f145618..000000000
--- a/gnuradio-core/src/lib/swig/.gitignore
+++ /dev/null
@@ -1,49 +0,0 @@
-/Makefile
-/Makefile.in
-/.la
-/.lo
-/.deps
-/.libs
-/*.la
-/*.lo
-/*.pyc
-/swigrun.py
-/swigrun_wrap.c
-/Makefile.swigdeps.new
-gnuradio_core_filter.cc
-gnuradio_core_filter.d
-gnuradio_core_filter.h
-gnuradio_core_filter.py
-gnuradio_core_filter.scm
-gnuradio_core_filter-primitive.scm
-gnuradio_core_general.cc
-gnuradio_core_general.d
-gnuradio_core_general.h
-gnuradio_core_general.py
-gnuradio_core_general.scm
-gnuradio_core_general-primitive.scm
-gnuradio_core_gengen.cc
-gnuradio_core_gengen.d
-gnuradio_core_gengen.h
-gnuradio_core_gengen.py
-gnuradio_core_gengen.scm
-gnuradio_core_gengen-primitive.scm
-gnuradio_core_hier.cc
-gnuradio_core_hier.d
-gnuradio_core_hier.h
-gnuradio_core_hier.py
-gnuradio_core_hier.scm
-gnuradio_core_hier-primitive.scm
-gnuradio_core_io.cc
-gnuradio_core_io.d
-gnuradio_core_io.h
-gnuradio_core_io.py
-gnuradio_core_io.scm
-gnuradio_core_io-primitive.scm
-gnuradio_core_runtime.cc
-gnuradio_core_runtime.d
-gnuradio_core_runtime.h
-gnuradio_core_runtime.py
-gnuradio_core_runtime.scm
-gnuradio_core_runtime-primitive.scm
-
diff --git a/gnuradio-core/src/lib/swig/Makefile.am b/gnuradio-core/src/lib/swig/Makefile.am
deleted file mode 100644
index 91c1746e6..000000000
--- a/gnuradio-core/src/lib/swig/Makefile.am
+++ /dev/null
@@ -1,109 +0,0 @@
-#
-# Copyright 2001,2003,2004,2005,2006,2007,2008,2009,2010 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 GNU Radio; see the file COPYING.  If not, write to
-# the Free Software Foundation, Inc., 51 Franklin Street,
-# Boston, MA 02110-1301, USA.
-# 
-
-include $(top_srcdir)/Makefile.common
-include $(top_srcdir)/Makefile.swig
-
-AM_CPPFLAGS = -I$(srcdir) $(STD_DEFINES_AND_INCLUDES) $(PYTHON_CPPFLAGS) \
-	 $(WITH_INCLUDES)
-
-# ----------------------------------------------------------------
-# We've split the previously monstrous gnuradio_core into 6
-# smaller pieces.  This reduces compile time coupling and creates
-# smaller pieces for the compiler to digest.  prior to this change, on
-# X86_64, g++'s resident set size was 650MB!
-# ----------------------------------------------------------------
-
-TOP_SWIG_DOC_IFILES = \
-	filter_swig_doc.i	\
-	general_swig_doc.i	\
-	gengen_swig_doc.i	\
-	hier_swig_doc.i		\
-	io_swig_doc.i		\
-	runtime_swig_doc.i
-
-TOP_SWIG_IFILES =		\
-	$(TOP_SWIG_DOC_IFILES) 	\
-	gnuradio_core_runtime.i	\
-	gnuradio_core_general.i	\
-	gnuradio_core_gengen.i	\
-	gnuradio_core_filter.i	\
-	gnuradio_core_io.i	\
-	gnuradio_core_hier.i
-
-BUILT_SOURCES += \
-	$(TOP_SWIG_DOC_IFILES)
-
-EXTRA_DIST += \
-	$(TOP_SWIG_DOC_IFILES)
-
-$(TOP_SWIG_DOC_IFILES):
-	`echo "" > $@`
-
-# SWIG headers get installed in ${prefix}/include/gnuradio/swig
-swiginclude_HEADERS =			\
-	gnuradio.i			\
-	gr_swig_block_magic.i		\
-	gr_shared_ptr.i                	\
-	$(TOP_SWIG_DOC_IFILES)
-
-# SWIG headers that get installed in ${prefix}/include/gnuradio/swig/...
-nobase_swiginclude_HEADERS = \
-	guile/std_complex.i \
-	guile/std_vector.i
-
-
-# special install for this top-level Python script which includes all
-# of the split Python libraries.
-ourpythondir = $(grpythondir)/gr
-ourpython_PYTHON = gnuradio_core.py
-
-# ----------------------------------------------------------------
-# FIXME As of swig 1.3.31, this still seems to be required...
-# gnuradio_swig_bug_workaround.h : gnuradio_core_runtime.py $(srcdir)/gen-swig-bug-fix
-#	$(PYTHON) $(srcdir)/gen-swig-bug-fix python/gnuradio_core_runtime.cc $@
-
-EXTRA_DIST += gen-swig-bug-fix
-
-# C/C++ headers get installed in ${prefix}/include/gnuradio
-grinclude_HEADERS = gnuradio_swig_bug_workaround.h
-
-
-# Install so that they end up available as:
-#   import gnuradio.gr
-# This ends up at:
-#   ${prefix}/lib/python${python_version}/site-packages/gnuradio/gr
-gnuradio_core_runtime_pythondir_category = gnuradio/gr
-gnuradio_core_general_pythondir_category = gnuradio/gr
-gnuradio_core_gengen_pythondir_category  = gnuradio/gr
-gnuradio_core_filter_pythondir_category  = gnuradio/gr
-gnuradio_core_io_pythondir_category      = gnuradio/gr
-gnuradio_core_hier_pythondir_category    = gnuradio/gr
-
-# additional libraries for linking with each SWIG-generated library
-gnuradio_core_runtime_la_swig_libadd = $(GNURADIO_CORE_LA)
-gnuradio_core_general_la_swig_libadd = $(GNURADIO_CORE_LA)
-gnuradio_core_gengen_la_swig_libadd  = $(GNURADIO_CORE_LA)
-gnuradio_core_filter_la_swig_libadd  = $(GNURADIO_CORE_LA)
-gnuradio_core_io_la_swig_libadd      = $(GNURADIO_CORE_LA)
-gnuradio_core_hier_la_swig_libadd    = $(GNURADIO_CORE_LA)
-
-SWIG_GUILE_FLAGS += -DIN_GNURADIO_CORE
diff --git a/gnuradio-core/src/lib/swig/Makefile.swig.gen b/gnuradio-core/src/lib/swig/Makefile.swig.gen
deleted file mode 100644
index cede68817..000000000
--- a/gnuradio-core/src/lib/swig/Makefile.swig.gen
+++ /dev/null
@@ -1,870 +0,0 @@
-# -*- Makefile -*-
-#
-# Copyright 2009 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 GNU Radio; see the file COPYING.  If not, write to
-# the Free Software Foundation, Inc., 51 Franklin Street,
-# Boston, MA 02110-1301, USA.
-# 
-
-# Makefile.swig.gen for gnuradio_core_runtime.i
-
-## Default install locations for these files:
-##
-## Default location for the Python directory is:
-##  ${prefix}/lib/python${python_version}/site-packages/[category]/gnuradio_core_runtime
-## Default location for the Python exec directory is:
-##  ${exec_prefix}/lib/python${python_version}/site-packages/[category]/gnuradio_core_runtime
-##
-## The following can be overloaded to change the install location, but
-## this has to be done in the including Makefile.am -before-
-## Makefile.swig is included.
-
-gnuradio_core_runtime_pythondir_category ?= gnuradio/gnuradio_core_runtime
-gnuradio_core_runtime_pylibdir_category ?= $(gnuradio_core_runtime_pythondir_category)
-gnuradio_core_runtime_pythondir = $(pythondir)/$(gnuradio_core_runtime_pythondir_category)
-gnuradio_core_runtime_pylibdir = $(pyexecdir)/$(gnuradio_core_runtime_pylibdir_category)
-
-# The .so libraries for the guile modules get installed whereever guile
-# is installed, usually /usr/lib/guile/gnuradio/
-# FIXME: determince whether these should be installed with gnuradio.
-gnuradio_core_runtime_scmlibdir = $(libdir)
-
-# The scm files for the guile modules get installed where ever guile
-# is installed, usually /usr/share/guile/site/gnuradio_core_runtime
-# FIXME: determince whether these should be installed with gnuradio.
-gnuradio_core_runtime_scmdir = $(guiledir)
-
-## SWIG headers are always installed into the same directory.
-
-gnuradio_core_runtime_swigincludedir = $(swigincludedir)
-
-## This is a template file for a "generated" Makefile addition (in
-## this case, "Makefile.swig.gen").  By including the top-level
-## Makefile.swig, this file will be used to generate the SWIG
-## dependencies.  Assign the variable TOP_SWIG_FILES to be the list of
-## SWIG .i files to generated wrappings for; there can be more than 1
-## so long as the names are unique (no sorting is done on the
-## TOP_SWIG_FILES list). This file explicitly assumes that a SWIG .i
-## file will generate .cc, .py, and possibly .h files -- meaning that
-## all of these files will have the same base name (that provided for
-## the SWIG .i file).
-##
-## This code is setup to ensure parallel MAKE ("-j" or "-jN") does the
-## right thing.  For more info, see <
-## http://sources.redhat.com/automake/automake.html#Multiple-Outputs >
-
-## Other cleaned files: dependency files generated by SWIG or this Makefile
-
-MOSTLYCLEANFILES += $(DEPDIR)/*.S*
-
-## Various SWIG variables.  These can be overloaded in the including
-## Makefile.am by setting the variable value there, then including
-## Makefile.swig .
-
-gnuradio_core_runtime_swiginclude_HEADERS =		\
-	gnuradio_core_runtime.i			\
-	$(gnuradio_core_runtime_swiginclude_headers)
-
-if PYTHON
-gnuradio_core_runtime_pylib_LTLIBRARIES =		\
-	_gnuradio_core_runtime.la
-
-_gnuradio_core_runtime_la_SOURCES = 			\
-	python/gnuradio_core_runtime.cc		\
-	$(gnuradio_core_runtime_la_swig_sources)
-
-gnuradio_core_runtime_python_PYTHON =			\
-	gnuradio_core_runtime.py			\
-	$(gnuradio_core_runtime_python)
-
-_gnuradio_core_runtime_la_LIBADD =			\
-	$(STD_SWIG_LA_LIB_ADD)		\
-	$(gnuradio_core_runtime_la_swig_libadd)
-
-_gnuradio_core_runtime_la_LDFLAGS =			\
-	$(STD_SWIG_LA_LD_FLAGS)		\
-	$(gnuradio_core_runtime_la_swig_ldflags)
-
-_gnuradio_core_runtime_la_CXXFLAGS =			\
-	$(STD_SWIG_CXX_FLAGS)		\
-	-I$(top_builddir) 		\
-	$(gnuradio_core_runtime_la_swig_cxxflags)
-
-python/gnuradio_core_runtime.cc: gnuradio_core_runtime.py
-gnuradio_core_runtime.py: gnuradio_core_runtime.i 
-
-# Include the python dependencies for this file
--include python/gnuradio_core_runtime.d
-
-endif		# end of if python
-
-if GUILE
-
-gnuradio_core_runtime_scmlib_LTLIBRARIES = 		\
-	libguile-gnuradio-gnuradio_core_runtime.la
-libguile_gnuradio_gnuradio_core_runtime_la_SOURCES =	\
-	guile/gnuradio_core_runtime.cc			\
-	$(gnuradio_core_runtime_la_swig_sources)
-nobase_gnuradio_core_runtime_scm_DATA = 		\
-	gnuradio/gnuradio_core_runtime.scm 		\
-	gnuradio/gnuradio_core_runtime-primitive.scm
-libguile_gnuradio_gnuradio_core_runtime_la_LIBADD = 	\
-	$(STD_SWIG_LA_LIB_ADD)		\
-	$(gnuradio_core_runtime_la_swig_libadd)
-libguile_gnuradio_gnuradio_core_runtime_la_LDFLAGS = 	\
-	$(STD_SWIG_LA_LD_FLAGS)		\
-	$(gnuradio_core_runtime_la_swig_ldflags)
-libguile_gnuradio_gnuradio_core_runtime_la_CXXFLAGS = 	\
-	$(STD_SWIG_CXX_FLAGS)		\
-	-I$(top_builddir) 		\
-	$(gnuradio_core_runtime_la_swig_cxxflags)
-
-guile/gnuradio_core_runtime.cc: gnuradio/gnuradio_core_runtime.scm
-gnuradio/gnuradio_core_runtime.scm: gnuradio_core_runtime.i
-gnuradio/gnuradio_core_runtime-primitive.scm: gnuradio/gnuradio_core_runtime.scm
-
-# Include the guile dependencies for this file
--include guile/gnuradio_core_runtime.d
-
-endif				# end of GUILE
-
-
-# -*- Makefile -*-
-#
-# Copyright 2009 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 GNU Radio; see the file COPYING.  If not, write to
-# the Free Software Foundation, Inc., 51 Franklin Street,
-# Boston, MA 02110-1301, USA.
-# 
-
-# Makefile.swig.gen for gnuradio_core_general.i
-
-## Default install locations for these files:
-##
-## Default location for the Python directory is:
-##  ${prefix}/lib/python${python_version}/site-packages/[category]/gnuradio_core_general
-## Default location for the Python exec directory is:
-##  ${exec_prefix}/lib/python${python_version}/site-packages/[category]/gnuradio_core_general
-##
-## The following can be overloaded to change the install location, but
-## this has to be done in the including Makefile.am -before-
-## Makefile.swig is included.
-
-gnuradio_core_general_pythondir_category ?= gnuradio/gnuradio_core_general
-gnuradio_core_general_pylibdir_category ?= $(gnuradio_core_general_pythondir_category)
-gnuradio_core_general_pythondir = $(pythondir)/$(gnuradio_core_general_pythondir_category)
-gnuradio_core_general_pylibdir = $(pyexecdir)/$(gnuradio_core_general_pylibdir_category)
-
-# The .so libraries for the guile modules get installed whereever guile
-# is installed, usually /usr/lib/guile/gnuradio/
-# FIXME: determince whether these should be installed with gnuradio.
-gnuradio_core_general_scmlibdir = $(libdir)
-
-# The scm files for the guile modules get installed where ever guile
-# is installed, usually /usr/share/guile/site/gnuradio_core_general
-# FIXME: determince whether these should be installed with gnuradio.
-gnuradio_core_general_scmdir = $(guiledir)
-
-## SWIG headers are always installed into the same directory.
-
-gnuradio_core_general_swigincludedir = $(swigincludedir)
-
-## This is a template file for a "generated" Makefile addition (in
-## this case, "Makefile.swig.gen").  By including the top-level
-## Makefile.swig, this file will be used to generate the SWIG
-## dependencies.  Assign the variable TOP_SWIG_FILES to be the list of
-## SWIG .i files to generated wrappings for; there can be more than 1
-## so long as the names are unique (no sorting is done on the
-## TOP_SWIG_FILES list). This file explicitly assumes that a SWIG .i
-## file will generate .cc, .py, and possibly .h files -- meaning that
-## all of these files will have the same base name (that provided for
-## the SWIG .i file).
-##
-## This code is setup to ensure parallel MAKE ("-j" or "-jN") does the
-## right thing.  For more info, see <
-## http://sources.redhat.com/automake/automake.html#Multiple-Outputs >
-
-## Other cleaned files: dependency files generated by SWIG or this Makefile
-
-MOSTLYCLEANFILES += $(DEPDIR)/*.S*
-
-## Various SWIG variables.  These can be overloaded in the including
-## Makefile.am by setting the variable value there, then including
-## Makefile.swig .
-
-gnuradio_core_general_swiginclude_HEADERS =		\
-	gnuradio_core_general.i			\
-	$(gnuradio_core_general_swiginclude_headers)
-
-if PYTHON
-gnuradio_core_general_pylib_LTLIBRARIES =		\
-	_gnuradio_core_general.la
-
-_gnuradio_core_general_la_SOURCES = 			\
-	python/gnuradio_core_general.cc		\
-	$(gnuradio_core_general_la_swig_sources)
-
-gnuradio_core_general_python_PYTHON =			\
-	gnuradio_core_general.py			\
-	$(gnuradio_core_general_python)
-
-_gnuradio_core_general_la_LIBADD =			\
-	$(STD_SWIG_LA_LIB_ADD)		\
-	$(gnuradio_core_general_la_swig_libadd)
-
-_gnuradio_core_general_la_LDFLAGS =			\
-	$(STD_SWIG_LA_LD_FLAGS)		\
-	$(gnuradio_core_general_la_swig_ldflags)
-
-_gnuradio_core_general_la_CXXFLAGS =			\
-	$(STD_SWIG_CXX_FLAGS)		\
-	-I$(top_builddir) 		\
-	$(gnuradio_core_general_la_swig_cxxflags)
-
-python/gnuradio_core_general.cc: gnuradio_core_general.py
-gnuradio_core_general.py: gnuradio_core_general.i 
-
-# Include the python dependencies for this file
--include python/gnuradio_core_general.d
-
-endif		# end of if python
-
-if GUILE
-
-gnuradio_core_general_scmlib_LTLIBRARIES = 		\
-	libguile-gnuradio-gnuradio_core_general.la
-libguile_gnuradio_gnuradio_core_general_la_SOURCES =	\
-	guile/gnuradio_core_general.cc			\
-	$(gnuradio_core_general_la_swig_sources)
-nobase_gnuradio_core_general_scm_DATA = 		\
-	gnuradio/gnuradio_core_general.scm 		\
-	gnuradio/gnuradio_core_general-primitive.scm
-libguile_gnuradio_gnuradio_core_general_la_LIBADD = 	\
-	$(STD_SWIG_LA_LIB_ADD)		\
-	$(gnuradio_core_general_la_swig_libadd)
-libguile_gnuradio_gnuradio_core_general_la_LDFLAGS = 	\
-	$(STD_SWIG_LA_LD_FLAGS)		\
-	$(gnuradio_core_general_la_swig_ldflags)
-libguile_gnuradio_gnuradio_core_general_la_CXXFLAGS = 	\
-	$(STD_SWIG_CXX_FLAGS)		\
-	-I$(top_builddir) 		\
-	$(gnuradio_core_general_la_swig_cxxflags)
-
-guile/gnuradio_core_general.cc: gnuradio/gnuradio_core_general.scm
-gnuradio/gnuradio_core_general.scm: gnuradio_core_general.i
-gnuradio/gnuradio_core_general-primitive.scm: gnuradio/gnuradio_core_general.scm
-
-# Include the guile dependencies for this file
--include guile/gnuradio_core_general.d
-
-endif				# end of GUILE
-
-
-# -*- Makefile -*-
-#
-# Copyright 2009 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 GNU Radio; see the file COPYING.  If not, write to
-# the Free Software Foundation, Inc., 51 Franklin Street,
-# Boston, MA 02110-1301, USA.
-# 
-
-# Makefile.swig.gen for gnuradio_core_gengen.i
-
-## Default install locations for these files:
-##
-## Default location for the Python directory is:
-##  ${prefix}/lib/python${python_version}/site-packages/[category]/gnuradio_core_gengen
-## Default location for the Python exec directory is:
-##  ${exec_prefix}/lib/python${python_version}/site-packages/[category]/gnuradio_core_gengen
-##
-## The following can be overloaded to change the install location, but
-## this has to be done in the including Makefile.am -before-
-## Makefile.swig is included.
-
-gnuradio_core_gengen_pythondir_category ?= gnuradio/gnuradio_core_gengen
-gnuradio_core_gengen_pylibdir_category ?= $(gnuradio_core_gengen_pythondir_category)
-gnuradio_core_gengen_pythondir = $(pythondir)/$(gnuradio_core_gengen_pythondir_category)
-gnuradio_core_gengen_pylibdir = $(pyexecdir)/$(gnuradio_core_gengen_pylibdir_category)
-
-# The .so libraries for the guile modules get installed whereever guile
-# is installed, usually /usr/lib/guile/gnuradio/
-# FIXME: determince whether these should be installed with gnuradio.
-gnuradio_core_gengen_scmlibdir = $(libdir)
-
-# The scm files for the guile modules get installed where ever guile
-# is installed, usually /usr/share/guile/site/gnuradio_core_gengen
-# FIXME: determince whether these should be installed with gnuradio.
-gnuradio_core_gengen_scmdir = $(guiledir)
-
-## SWIG headers are always installed into the same directory.
-
-gnuradio_core_gengen_swigincludedir = $(swigincludedir)
-
-## This is a template file for a "generated" Makefile addition (in
-## this case, "Makefile.swig.gen").  By including the top-level
-## Makefile.swig, this file will be used to generate the SWIG
-## dependencies.  Assign the variable TOP_SWIG_FILES to be the list of
-## SWIG .i files to generated wrappings for; there can be more than 1
-## so long as the names are unique (no sorting is done on the
-## TOP_SWIG_FILES list). This file explicitly assumes that a SWIG .i
-## file will generate .cc, .py, and possibly .h files -- meaning that
-## all of these files will have the same base name (that provided for
-## the SWIG .i file).
-##
-## This code is setup to ensure parallel MAKE ("-j" or "-jN") does the
-## right thing.  For more info, see <
-## http://sources.redhat.com/automake/automake.html#Multiple-Outputs >
-
-## Other cleaned files: dependency files generated by SWIG or this Makefile
-
-MOSTLYCLEANFILES += $(DEPDIR)/*.S*
-
-## Various SWIG variables.  These can be overloaded in the including
-## Makefile.am by setting the variable value there, then including
-## Makefile.swig .
-
-gnuradio_core_gengen_swiginclude_HEADERS =		\
-	gnuradio_core_gengen.i			\
-	$(gnuradio_core_gengen_swiginclude_headers)
-
-if PYTHON
-gnuradio_core_gengen_pylib_LTLIBRARIES =		\
-	_gnuradio_core_gengen.la
-
-_gnuradio_core_gengen_la_SOURCES = 			\
-	python/gnuradio_core_gengen.cc		\
-	$(gnuradio_core_gengen_la_swig_sources)
-
-gnuradio_core_gengen_python_PYTHON =			\
-	gnuradio_core_gengen.py			\
-	$(gnuradio_core_gengen_python)
-
-_gnuradio_core_gengen_la_LIBADD =			\
-	$(STD_SWIG_LA_LIB_ADD)		\
-	$(gnuradio_core_gengen_la_swig_libadd)
-
-_gnuradio_core_gengen_la_LDFLAGS =			\
-	$(STD_SWIG_LA_LD_FLAGS)		\
-	$(gnuradio_core_gengen_la_swig_ldflags)
-
-_gnuradio_core_gengen_la_CXXFLAGS =			\
-	$(STD_SWIG_CXX_FLAGS)		\
-	-I$(top_builddir) 		\
-	$(gnuradio_core_gengen_la_swig_cxxflags)
-
-python/gnuradio_core_gengen.cc: gnuradio_core_gengen.py
-gnuradio_core_gengen.py: gnuradio_core_gengen.i 
-
-# Include the python dependencies for this file
--include python/gnuradio_core_gengen.d
-
-endif		# end of if python
-
-if GUILE
-
-gnuradio_core_gengen_scmlib_LTLIBRARIES = 		\
-	libguile-gnuradio-gnuradio_core_gengen.la
-libguile_gnuradio_gnuradio_core_gengen_la_SOURCES =	\
-	guile/gnuradio_core_gengen.cc			\
-	$(gnuradio_core_gengen_la_swig_sources)
-nobase_gnuradio_core_gengen_scm_DATA = 		\
-	gnuradio/gnuradio_core_gengen.scm 		\
-	gnuradio/gnuradio_core_gengen-primitive.scm
-libguile_gnuradio_gnuradio_core_gengen_la_LIBADD = 	\
-	$(STD_SWIG_LA_LIB_ADD)		\
-	$(gnuradio_core_gengen_la_swig_libadd)
-libguile_gnuradio_gnuradio_core_gengen_la_LDFLAGS = 	\
-	$(STD_SWIG_LA_LD_FLAGS)		\
-	$(gnuradio_core_gengen_la_swig_ldflags)
-libguile_gnuradio_gnuradio_core_gengen_la_CXXFLAGS = 	\
-	$(STD_SWIG_CXX_FLAGS)		\
-	-I$(top_builddir) 		\
-	$(gnuradio_core_gengen_la_swig_cxxflags)
-
-guile/gnuradio_core_gengen.cc: gnuradio/gnuradio_core_gengen.scm
-gnuradio/gnuradio_core_gengen.scm: gnuradio_core_gengen.i
-gnuradio/gnuradio_core_gengen-primitive.scm: gnuradio/gnuradio_core_gengen.scm
-
-# Include the guile dependencies for this file
--include guile/gnuradio_core_gengen.d
-
-endif				# end of GUILE
-
-
-# -*- Makefile -*-
-#
-# Copyright 2009 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 GNU Radio; see the file COPYING.  If not, write to
-# the Free Software Foundation, Inc., 51 Franklin Street,
-# Boston, MA 02110-1301, USA.
-# 
-
-# Makefile.swig.gen for gnuradio_core_filter.i
-
-## Default install locations for these files:
-##
-## Default location for the Python directory is:
-##  ${prefix}/lib/python${python_version}/site-packages/[category]/gnuradio_core_filter
-## Default location for the Python exec directory is:
-##  ${exec_prefix}/lib/python${python_version}/site-packages/[category]/gnuradio_core_filter
-##
-## The following can be overloaded to change the install location, but
-## this has to be done in the including Makefile.am -before-
-## Makefile.swig is included.
-
-gnuradio_core_filter_pythondir_category ?= gnuradio/gnuradio_core_filter
-gnuradio_core_filter_pylibdir_category ?= $(gnuradio_core_filter_pythondir_category)
-gnuradio_core_filter_pythondir = $(pythondir)/$(gnuradio_core_filter_pythondir_category)
-gnuradio_core_filter_pylibdir = $(pyexecdir)/$(gnuradio_core_filter_pylibdir_category)
-
-# The .so libraries for the guile modules get installed whereever guile
-# is installed, usually /usr/lib/guile/gnuradio/
-# FIXME: determince whether these should be installed with gnuradio.
-gnuradio_core_filter_scmlibdir = $(libdir)
-
-# The scm files for the guile modules get installed where ever guile
-# is installed, usually /usr/share/guile/site/gnuradio_core_filter
-# FIXME: determince whether these should be installed with gnuradio.
-gnuradio_core_filter_scmdir = $(guiledir)
-
-## SWIG headers are always installed into the same directory.
-
-gnuradio_core_filter_swigincludedir = $(swigincludedir)
-
-## This is a template file for a "generated" Makefile addition (in
-## this case, "Makefile.swig.gen").  By including the top-level
-## Makefile.swig, this file will be used to generate the SWIG
-## dependencies.  Assign the variable TOP_SWIG_FILES to be the list of
-## SWIG .i files to generated wrappings for; there can be more than 1
-## so long as the names are unique (no sorting is done on the
-## TOP_SWIG_FILES list). This file explicitly assumes that a SWIG .i
-## file will generate .cc, .py, and possibly .h files -- meaning that
-## all of these files will have the same base name (that provided for
-## the SWIG .i file).
-##
-## This code is setup to ensure parallel MAKE ("-j" or "-jN") does the
-## right thing.  For more info, see <
-## http://sources.redhat.com/automake/automake.html#Multiple-Outputs >
-
-## Other cleaned files: dependency files generated by SWIG or this Makefile
-
-MOSTLYCLEANFILES += $(DEPDIR)/*.S*
-
-## Various SWIG variables.  These can be overloaded in the including
-## Makefile.am by setting the variable value there, then including
-## Makefile.swig .
-
-gnuradio_core_filter_swiginclude_HEADERS =		\
-	gnuradio_core_filter.i			\
-	$(gnuradio_core_filter_swiginclude_headers)
-
-if PYTHON
-gnuradio_core_filter_pylib_LTLIBRARIES =		\
-	_gnuradio_core_filter.la
-
-_gnuradio_core_filter_la_SOURCES = 			\
-	python/gnuradio_core_filter.cc		\
-	$(gnuradio_core_filter_la_swig_sources)
-
-gnuradio_core_filter_python_PYTHON =			\
-	gnuradio_core_filter.py			\
-	$(gnuradio_core_filter_python)
-
-_gnuradio_core_filter_la_LIBADD =			\
-	$(STD_SWIG_LA_LIB_ADD)		\
-	$(gnuradio_core_filter_la_swig_libadd)
-
-_gnuradio_core_filter_la_LDFLAGS =			\
-	$(STD_SWIG_LA_LD_FLAGS)		\
-	$(gnuradio_core_filter_la_swig_ldflags)
-
-_gnuradio_core_filter_la_CXXFLAGS =			\
-	$(STD_SWIG_CXX_FLAGS)		\
-	-I$(top_builddir) 		\
-	$(gnuradio_core_filter_la_swig_cxxflags)
-
-python/gnuradio_core_filter.cc: gnuradio_core_filter.py
-gnuradio_core_filter.py: gnuradio_core_filter.i 
-
-# Include the python dependencies for this file
--include python/gnuradio_core_filter.d
-
-endif		# end of if python
-
-if GUILE
-
-gnuradio_core_filter_scmlib_LTLIBRARIES = 		\
-	libguile-gnuradio-gnuradio_core_filter.la
-libguile_gnuradio_gnuradio_core_filter_la_SOURCES =	\
-	guile/gnuradio_core_filter.cc			\
-	$(gnuradio_core_filter_la_swig_sources)
-nobase_gnuradio_core_filter_scm_DATA = 		\
-	gnuradio/gnuradio_core_filter.scm 		\
-	gnuradio/gnuradio_core_filter-primitive.scm
-libguile_gnuradio_gnuradio_core_filter_la_LIBADD = 	\
-	$(STD_SWIG_LA_LIB_ADD)		\
-	$(gnuradio_core_filter_la_swig_libadd)
-libguile_gnuradio_gnuradio_core_filter_la_LDFLAGS = 	\
-	$(STD_SWIG_LA_LD_FLAGS)		\
-	$(gnuradio_core_filter_la_swig_ldflags)
-libguile_gnuradio_gnuradio_core_filter_la_CXXFLAGS = 	\
-	$(STD_SWIG_CXX_FLAGS)		\
-	-I$(top_builddir) 		\
-	$(gnuradio_core_filter_la_swig_cxxflags)
-
-guile/gnuradio_core_filter.cc: gnuradio/gnuradio_core_filter.scm
-gnuradio/gnuradio_core_filter.scm: gnuradio_core_filter.i
-gnuradio/gnuradio_core_filter-primitive.scm: gnuradio/gnuradio_core_filter.scm
-
-# Include the guile dependencies for this file
--include guile/gnuradio_core_filter.d
-
-endif				# end of GUILE
-
-
-# -*- Makefile -*-
-#
-# Copyright 2009 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 GNU Radio; see the file COPYING.  If not, write to
-# the Free Software Foundation, Inc., 51 Franklin Street,
-# Boston, MA 02110-1301, USA.
-# 
-
-# Makefile.swig.gen for gnuradio_core_io.i
-
-## Default install locations for these files:
-##
-## Default location for the Python directory is:
-##  ${prefix}/lib/python${python_version}/site-packages/[category]/gnuradio_core_io
-## Default location for the Python exec directory is:
-##  ${exec_prefix}/lib/python${python_version}/site-packages/[category]/gnuradio_core_io
-##
-## The following can be overloaded to change the install location, but
-## this has to be done in the including Makefile.am -before-
-## Makefile.swig is included.
-
-gnuradio_core_io_pythondir_category ?= gnuradio/gnuradio_core_io
-gnuradio_core_io_pylibdir_category ?= $(gnuradio_core_io_pythondir_category)
-gnuradio_core_io_pythondir = $(pythondir)/$(gnuradio_core_io_pythondir_category)
-gnuradio_core_io_pylibdir = $(pyexecdir)/$(gnuradio_core_io_pylibdir_category)
-
-# The .so libraries for the guile modules get installed whereever guile
-# is installed, usually /usr/lib/guile/gnuradio/
-# FIXME: determince whether these should be installed with gnuradio.
-gnuradio_core_io_scmlibdir = $(libdir)
-
-# The scm files for the guile modules get installed where ever guile
-# is installed, usually /usr/share/guile/site/gnuradio_core_io
-# FIXME: determince whether these should be installed with gnuradio.
-gnuradio_core_io_scmdir = $(guiledir)
-
-## SWIG headers are always installed into the same directory.
-
-gnuradio_core_io_swigincludedir = $(swigincludedir)
-
-## This is a template file for a "generated" Makefile addition (in
-## this case, "Makefile.swig.gen").  By including the top-level
-## Makefile.swig, this file will be used to generate the SWIG
-## dependencies.  Assign the variable TOP_SWIG_FILES to be the list of
-## SWIG .i files to generated wrappings for; there can be more than 1
-## so long as the names are unique (no sorting is done on the
-## TOP_SWIG_FILES list). This file explicitly assumes that a SWIG .i
-## file will generate .cc, .py, and possibly .h files -- meaning that
-## all of these files will have the same base name (that provided for
-## the SWIG .i file).
-##
-## This code is setup to ensure parallel MAKE ("-j" or "-jN") does the
-## right thing.  For more info, see <
-## http://sources.redhat.com/automake/automake.html#Multiple-Outputs >
-
-## Other cleaned files: dependency files generated by SWIG or this Makefile
-
-MOSTLYCLEANFILES += $(DEPDIR)/*.S*
-
-## Various SWIG variables.  These can be overloaded in the including
-## Makefile.am by setting the variable value there, then including
-## Makefile.swig .
-
-gnuradio_core_io_swiginclude_HEADERS =		\
-	gnuradio_core_io.i			\
-	$(gnuradio_core_io_swiginclude_headers)
-
-if PYTHON
-gnuradio_core_io_pylib_LTLIBRARIES =		\
-	_gnuradio_core_io.la
-
-_gnuradio_core_io_la_SOURCES = 			\
-	python/gnuradio_core_io.cc		\
-	$(gnuradio_core_io_la_swig_sources)
-
-gnuradio_core_io_python_PYTHON =			\
-	gnuradio_core_io.py			\
-	$(gnuradio_core_io_python)
-
-_gnuradio_core_io_la_LIBADD =			\
-	$(STD_SWIG_LA_LIB_ADD)		\
-	$(gnuradio_core_io_la_swig_libadd)
-
-_gnuradio_core_io_la_LDFLAGS =			\
-	$(STD_SWIG_LA_LD_FLAGS)		\
-	$(gnuradio_core_io_la_swig_ldflags)
-
-_gnuradio_core_io_la_CXXFLAGS =			\
-	$(STD_SWIG_CXX_FLAGS)		\
-	-I$(top_builddir) 		\
-	$(gnuradio_core_io_la_swig_cxxflags)
-
-python/gnuradio_core_io.cc: gnuradio_core_io.py
-gnuradio_core_io.py: gnuradio_core_io.i 
-
-# Include the python dependencies for this file
--include python/gnuradio_core_io.d
-
-endif		# end of if python
-
-if GUILE
-
-gnuradio_core_io_scmlib_LTLIBRARIES = 		\
-	libguile-gnuradio-gnuradio_core_io.la
-libguile_gnuradio_gnuradio_core_io_la_SOURCES =	\
-	guile/gnuradio_core_io.cc			\
-	$(gnuradio_core_io_la_swig_sources)
-nobase_gnuradio_core_io_scm_DATA = 		\
-	gnuradio/gnuradio_core_io.scm 		\
-	gnuradio/gnuradio_core_io-primitive.scm
-libguile_gnuradio_gnuradio_core_io_la_LIBADD = 	\
-	$(STD_SWIG_LA_LIB_ADD)		\
-	$(gnuradio_core_io_la_swig_libadd)
-libguile_gnuradio_gnuradio_core_io_la_LDFLAGS = 	\
-	$(STD_SWIG_LA_LD_FLAGS)		\
-	$(gnuradio_core_io_la_swig_ldflags)
-libguile_gnuradio_gnuradio_core_io_la_CXXFLAGS = 	\
-	$(STD_SWIG_CXX_FLAGS)		\
-	-I$(top_builddir) 		\
-	$(gnuradio_core_io_la_swig_cxxflags)
-
-guile/gnuradio_core_io.cc: gnuradio/gnuradio_core_io.scm
-gnuradio/gnuradio_core_io.scm: gnuradio_core_io.i
-gnuradio/gnuradio_core_io-primitive.scm: gnuradio/gnuradio_core_io.scm
-
-# Include the guile dependencies for this file
--include guile/gnuradio_core_io.d
-
-endif				# end of GUILE
-
-
-# -*- Makefile -*-
-#
-# Copyright 2009 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 GNU Radio; see the file COPYING.  If not, write to
-# the Free Software Foundation, Inc., 51 Franklin Street,
-# Boston, MA 02110-1301, USA.
-# 
-
-# Makefile.swig.gen for gnuradio_core_hier.i
-
-## Default install locations for these files:
-##
-## Default location for the Python directory is:
-##  ${prefix}/lib/python${python_version}/site-packages/[category]/gnuradio_core_hier
-## Default location for the Python exec directory is:
-##  ${exec_prefix}/lib/python${python_version}/site-packages/[category]/gnuradio_core_hier
-##
-## The following can be overloaded to change the install location, but
-## this has to be done in the including Makefile.am -before-
-## Makefile.swig is included.
-
-gnuradio_core_hier_pythondir_category ?= gnuradio/gnuradio_core_hier
-gnuradio_core_hier_pylibdir_category ?= $(gnuradio_core_hier_pythondir_category)
-gnuradio_core_hier_pythondir = $(pythondir)/$(gnuradio_core_hier_pythondir_category)
-gnuradio_core_hier_pylibdir = $(pyexecdir)/$(gnuradio_core_hier_pylibdir_category)
-
-# The .so libraries for the guile modules get installed whereever guile
-# is installed, usually /usr/lib/guile/gnuradio/
-# FIXME: determince whether these should be installed with gnuradio.
-gnuradio_core_hier_scmlibdir = $(libdir)
-
-# The scm files for the guile modules get installed where ever guile
-# is installed, usually /usr/share/guile/site/gnuradio_core_hier
-# FIXME: determince whether these should be installed with gnuradio.
-gnuradio_core_hier_scmdir = $(guiledir)
-
-## SWIG headers are always installed into the same directory.
-
-gnuradio_core_hier_swigincludedir = $(swigincludedir)
-
-## This is a template file for a "generated" Makefile addition (in
-## this case, "Makefile.swig.gen").  By including the top-level
-## Makefile.swig, this file will be used to generate the SWIG
-## dependencies.  Assign the variable TOP_SWIG_FILES to be the list of
-## SWIG .i files to generated wrappings for; there can be more than 1
-## so long as the names are unique (no sorting is done on the
-## TOP_SWIG_FILES list). This file explicitly assumes that a SWIG .i
-## file will generate .cc, .py, and possibly .h files -- meaning that
-## all of these files will have the same base name (that provided for
-## the SWIG .i file).
-##
-## This code is setup to ensure parallel MAKE ("-j" or "-jN") does the
-## right thing.  For more info, see <
-## http://sources.redhat.com/automake/automake.html#Multiple-Outputs >
-
-## Other cleaned files: dependency files generated by SWIG or this Makefile
-
-MOSTLYCLEANFILES += $(DEPDIR)/*.S*
-
-## Various SWIG variables.  These can be overloaded in the including
-## Makefile.am by setting the variable value there, then including
-## Makefile.swig .
-
-gnuradio_core_hier_swiginclude_HEADERS =		\
-	gnuradio_core_hier.i			\
-	$(gnuradio_core_hier_swiginclude_headers)
-
-if PYTHON
-gnuradio_core_hier_pylib_LTLIBRARIES =		\
-	_gnuradio_core_hier.la
-
-_gnuradio_core_hier_la_SOURCES = 			\
-	python/gnuradio_core_hier.cc		\
-	$(gnuradio_core_hier_la_swig_sources)
-
-gnuradio_core_hier_python_PYTHON =			\
-	gnuradio_core_hier.py			\
-	$(gnuradio_core_hier_python)
-
-_gnuradio_core_hier_la_LIBADD =			\
-	$(STD_SWIG_LA_LIB_ADD)		\
-	$(gnuradio_core_hier_la_swig_libadd)
-
-_gnuradio_core_hier_la_LDFLAGS =			\
-	$(STD_SWIG_LA_LD_FLAGS)		\
-	$(gnuradio_core_hier_la_swig_ldflags)
-
-_gnuradio_core_hier_la_CXXFLAGS =			\
-	$(STD_SWIG_CXX_FLAGS)		\
-	-I$(top_builddir) 		\
-	$(gnuradio_core_hier_la_swig_cxxflags)
-
-python/gnuradio_core_hier.cc: gnuradio_core_hier.py
-gnuradio_core_hier.py: gnuradio_core_hier.i 
-
-# Include the python dependencies for this file
--include python/gnuradio_core_hier.d
-
-endif		# end of if python
-
-if GUILE
-
-gnuradio_core_hier_scmlib_LTLIBRARIES = 		\
-	libguile-gnuradio-gnuradio_core_hier.la
-libguile_gnuradio_gnuradio_core_hier_la_SOURCES =	\
-	guile/gnuradio_core_hier.cc			\
-	$(gnuradio_core_hier_la_swig_sources)
-nobase_gnuradio_core_hier_scm_DATA = 		\
-	gnuradio/gnuradio_core_hier.scm 		\
-	gnuradio/gnuradio_core_hier-primitive.scm
-libguile_gnuradio_gnuradio_core_hier_la_LIBADD = 	\
-	$(STD_SWIG_LA_LIB_ADD)		\
-	$(gnuradio_core_hier_la_swig_libadd)
-libguile_gnuradio_gnuradio_core_hier_la_LDFLAGS = 	\
-	$(STD_SWIG_LA_LD_FLAGS)		\
-	$(gnuradio_core_hier_la_swig_ldflags)
-libguile_gnuradio_gnuradio_core_hier_la_CXXFLAGS = 	\
-	$(STD_SWIG_CXX_FLAGS)		\
-	-I$(top_builddir) 		\
-	$(gnuradio_core_hier_la_swig_cxxflags)
-
-guile/gnuradio_core_hier.cc: gnuradio/gnuradio_core_hier.scm
-gnuradio/gnuradio_core_hier.scm: gnuradio_core_hier.i
-gnuradio/gnuradio_core_hier-primitive.scm: gnuradio/gnuradio_core_hier.scm
-
-# Include the guile dependencies for this file
--include guile/gnuradio_core_hier.d
-
-endif				# end of GUILE
-
-
diff --git a/gnuradio-core/src/lib/swig/guile/std_complex.i b/gnuradio-core/src/lib/swig/guile/std_complex.i
deleted file mode 100644
index 2a5c72aa2..000000000
--- a/gnuradio-core/src/lib/swig/guile/std_complex.i
+++ /dev/null
@@ -1,37 +0,0 @@
-%{
-#include <complex> 
-%}
-
-// To the target language, complex number conversion
-%typemap(out) complex, complex<double>, std::complex<double> {
-  $result = scm_make_rectangular( gh_double2scm ($1.real ()),
-           gh_double2scm ($1.imag ()) );
-}
-
-// To the target language, complex number conversion
-%typemap(out) complex, complex<float>, std::complex<float> {
-  $result = scm_make_rectangular( gh_double2scm ($1.real ()),
-           gh_double2scm ($1.imag ()) );
-}
-
-// From the target language, complex number conversion
-%typemap(in) complex, complex<double>, std::complex<double> {
-  $1 = std::complex<double>( gh_scm2double (scm_real_part ($input)),
-           gh_scm2double (scm_imag_part ($input)) );
-}
-
-// From the target language, complex number conversion
-%typemap(in) complex, complex<float>, std::complex<float> {
-  $1 = std::complex<float>( gh_scm2double (scm_real_part ($input)),
-           gh_scm2double (scm_imag_part ($input)) );
-}
-
-%typemaps_primitive(%checkcode(CPLXDBL), std::complex<double>);
-%typemaps_primitive(%checkcode(CPLXFLT), std::complex<float>);
-
-%typecheck(SWIG_TYPECHECK_COMPLEX)
-   std::complex<float>, std::complex<double>,
-   const std::complex<float> &, const std::complex<double> &
-{
-  $1 = scm_is_complex($input) ? 1 : 0;
-}
diff --git a/gnuradio-core/src/lib/swig/guile/std_vector.i b/gnuradio-core/src/lib/swig/guile/std_vector.i
deleted file mode 100644
index ef1f20667..000000000
--- a/gnuradio-core/src/lib/swig/guile/std_vector.i
+++ /dev/null
@@ -1,437 +0,0 @@
-/* -----------------------------------------------------------------------------
- * See the LICENSE file for information on copyright, usage and redistribution
- * of SWIG, and the README file for authors - http://www.swig.org/release.html.
- *
- * std_vector.i
- *
- * SWIG typemaps for std::vector
- * ----------------------------------------------------------------------------- */
-
-%include <std_common.i>
-
-// ------------------------------------------------------------------------
-// std::vector
-// 
-// The aim of all that follows would be to integrate std::vector with 
-// Guile as much as possible, namely, to allow the user to pass and 
-// be returned Guile vectors or lists.
-// const declarations are used to guess the intent of the function being
-// exported; therefore, the following rationale is applied:
-// 
-//   -- f(std::vector<T>), f(const std::vector<T>&), f(const std::vector<T>*):
-//      the parameter being read-only, either a Guile sequence or a
-//      previously wrapped std::vector<T> can be passed.
-//   -- f(std::vector<T>&), f(std::vector<T>*):
-//      the parameter must be modified; therefore, only a wrapped std::vector
-//      can be passed.
-//   -- std::vector<T> f():
-//      the vector is returned by copy; therefore, a Guile vector of T:s 
-//      is returned which is most easily used in other Guile functions
-//   -- std::vector<T>& f(), std::vector<T>* f(), const std::vector<T>& f(),
-//      const std::vector<T>* f():
-//      the vector is returned by reference; therefore, a wrapped std::vector
-//      is returned
-// ------------------------------------------------------------------------
-
-%{
-#include <vector>
-#include <algorithm>
-#include <stdexcept>
-#include <complex>
-%}
-
-%{
-  inline std::complex<float> SWIG_scm2cmplxfloat(SCM x){
-    return std::complex<float>(scm_c_real_part(x), scm_c_imag_part(x));
-  }
-
-  inline std::complex<double> SWIG_scm2cmplxdouble(SCM x){
-    return std::complex<double>(scm_c_real_part(x), scm_c_imag_part(x));
-  }
-
-  inline SCM SWIG_cmplxfloat2scm(std::complex<float> x){
-    return scm_c_make_rectangular(x.real(), x.imag());
-  }
-
-  inline SCM SWIG_cmplxdouble2scm(std::complex<double> x){
-    return scm_c_make_rectangular(x.real(), x.imag());
-  }
-%}
-
-// exported class
-
-namespace std {
-    
-    template<class T> class vector {
-        %typemap(in) vector<T> {
-            if (gh_vector_p($input)) {
-                unsigned long size = gh_vector_length($input);
-                $1 = std::vector<T >(size);
-                for (unsigned long i=0; i<size; i++) {
-                    SCM o = gh_vector_ref($input,gh_ulong2scm(i));
-                    (($1_type &)$1)[i] =
-                        *((T*) SWIG_MustGetPtr(o,$descriptor(T *),$argnum, 0));
-                }
-            } else if (gh_null_p($input)) {
-                $1 = std::vector<T >();
-            } else if (gh_pair_p($input)) {
-                SCM head, tail;
-                $1 = std::vector<T >();
-                tail = $input;
-                while (!gh_null_p(tail)) {
-                    head = gh_car(tail);
-                    tail = gh_cdr(tail);
-                    $1.push_back(*((T*)SWIG_MustGetPtr(head,
-                                                       $descriptor(T *),
-                                                       $argnum, 0)));
-                }
-            } else {
-                $1 = *(($&1_type)
-                       SWIG_MustGetPtr($input,$&1_descriptor,$argnum, 0));
-            }
-        }
-        %typemap(in) const vector<T>& (std::vector<T> temp),
-                     const vector<T>* (std::vector<T> temp) {
-            if (gh_vector_p($input)) {
-                unsigned long size = gh_vector_length($input);
-                temp = std::vector<T >(size);
-                $1 = &temp;
-                for (unsigned long i=0; i<size; i++) {
-                    SCM o = gh_vector_ref($input,gh_ulong2scm(i));
-                    temp[i] = *((T*) SWIG_MustGetPtr(o,
-                                                     $descriptor(T *),
-                                                     $argnum, 0));
-                }
-            } else if (gh_null_p($input)) {
-                temp = std::vector<T >();
-                $1 = &temp;
-            } else if (gh_pair_p($input)) {
-                temp = std::vector<T >();
-                $1 = &temp;
-                SCM head, tail;
-                tail = $input;
-                while (!gh_null_p(tail)) {
-                    head = gh_car(tail);
-                    tail = gh_cdr(tail);
-                    temp.push_back(*((T*) SWIG_MustGetPtr(head,
-                                                          $descriptor(T *),
-                                                          $argnum, 0)));
-                }
-            } else {
-                $1 = ($1_ltype) SWIG_MustGetPtr($input,$1_descriptor,$argnum, 0);
-            }
-        }
-        %typemap(out) vector<T> {
-            $result = gh_make_vector(gh_long2scm($1.size()),SCM_UNSPECIFIED);
-            for (unsigned int i=0; i<$1.size(); i++) {
-                T* x = new T((($1_type &)$1)[i]);
-                gh_vector_set_x($result,gh_long2scm(i),
-                                SWIG_NewPointerObj(x, $descriptor(T *), 1));
-            }
-        }
-        %typecheck(SWIG_TYPECHECK_VECTOR) vector<T> {
-            /* native sequence? */
-            if (gh_vector_p($input)) {
-                unsigned int size = gh_vector_length($input);
-                if (size == 0) {
-                    /* an empty sequence can be of any type */
-                    $1 = 1;
-                } else {
-                    /* check the first element only */
-                    SCM o = gh_vector_ref($input,gh_ulong2scm(0));
-                    T* x;
-                    if (SWIG_ConvertPtr(o,(void**) &x,
-                                          $descriptor(T *), 0) != -1)
-                        $1 = 1;
-                    else
-                        $1 = 0;
-                }
-            } else if (gh_null_p($input)) {
-                /* again, an empty sequence can be of any type */
-                $1 = 1;
-            } else if (gh_pair_p($input)) {
-                /* check the first element only */
-                T* x;
-                SCM head = gh_car($input);
-                if (SWIG_ConvertPtr(head,(void**) &x,
-                                      $descriptor(T *), 0) != -1)
-                    $1 = 1;
-                else
-                    $1 = 0;
-            } else {
-                /* wrapped vector? */
-                std::vector<T >* v;
-                if (SWIG_ConvertPtr($input,(void **) &v, 
-                                      $&1_descriptor, 0) != -1)
-                    $1 = 1;
-                else
-                    $1 = 0;
-            }
-        }
-        %typecheck(SWIG_TYPECHECK_VECTOR) const vector<T>&,
-                                          const vector<T>* {
-            /* native sequence? */
-            if (gh_vector_p($input)) {
-                unsigned int size = gh_vector_length($input);
-                if (size == 0) {
-                    /* an empty sequence can be of any type */
-                    $1 = 1;
-                } else {
-                    /* check the first element only */
-                    T* x;
-                    SCM o = gh_vector_ref($input,gh_ulong2scm(0));
-                    if (SWIG_ConvertPtr(o,(void**) &x,
-                                          $descriptor(T *), 0) != -1)
-                        $1 = 1;
-                    else
-                        $1 = 0;
-                }
-            } else if (gh_null_p($input)) {
-                /* again, an empty sequence can be of any type */
-                $1 = 1;
-            } else if (gh_pair_p($input)) {
-                /* check the first element only */
-                T* x;
-                SCM head = gh_car($input);
-                if (SWIG_ConvertPtr(head,(void**) &x,
-                                      $descriptor(T *), 0) != -1)
-                    $1 = 1;
-                else
-                    $1 = 0;
-            } else {
-                /* wrapped vector? */
-                std::vector<T >* v;
-                if (SWIG_ConvertPtr($input,(void **) &v, 
-                                      $1_descriptor, 0) != -1)
-                    $1 = 1;
-                else
-                    $1 = 0;
-            }
-        }
-      public:
-        vector(unsigned int size = 0);
-        vector(unsigned int size, const T& value);
-        vector(const vector<T>&);
-        %rename(length) size;
-        unsigned int size() const;
-        %rename("empty?") empty;
-        bool empty() const;
-        %rename("clear!") clear;
-        void clear();
-        %rename("set!") set;
-        %rename("pop!") pop;
-        %rename("push!") push_back;
-        void push_back(const T& x);
-        %extend {
-            T pop() throw (std::out_of_range) {
-                if (self->size() == 0)
-                    throw std::out_of_range("pop from empty vector");
-                T x = self->back();
-                self->pop_back();
-                return x;
-            }
-            T& ref(int i) throw (std::out_of_range) {
-                int size = int(self->size());
-                if (i>=0 && i<size)
-                    return (*self)[i];
-                else
-                    throw std::out_of_range("vector index out of range");
-            }
-            void set(int i, const T& x) throw (std::out_of_range) {
-                int size = int(self->size());
-                if (i>=0 && i<size)
-                    (*self)[i] = x;
-                else
-                    throw std::out_of_range("vector index out of range");
-            }
-        }
-    };
-
-
-    // specializations for built-ins
-    %define specialize_stl_vector(T,CHECK,CONVERT_FROM,CONVERT_TO)
-    template<> class vector<T > {
-        %typemap(in) vector<T > {
-            if (gh_vector_p($input)) {
-                unsigned long size = gh_vector_length($input);
-                $1 = std::vector<T >(size);
-                for (unsigned long i=0; i<size; i++) {
-                    SCM o = gh_vector_ref($input,gh_ulong2scm(i));
-                    if (CHECK(o))
-                        (($1_type &)$1)[i] = (T)(CONVERT_FROM(o));
-                    else
-                        scm_wrong_type_arg(FUNC_NAME, $argnum, $input);
-                }
-            } else if (gh_null_p($input)) {
-                $1 = std::vector<T >();
-            } else if (gh_pair_p($input)) {
-                SCM v = gh_list_to_vector($input);
-                unsigned long size = gh_vector_length(v);
-                $1 = std::vector<T >(size);
-                for (unsigned long i=0; i<size; i++) {
-                    SCM o = gh_vector_ref(v,gh_ulong2scm(i));
-                    if (CHECK(o))
-                        (($1_type &)$1)[i] = (T)(CONVERT_FROM(o));
-                    else
-                        scm_wrong_type_arg(FUNC_NAME, $argnum, $input);
-                }
-            } else {
-                $1 = *(($&1_type)
-                       SWIG_MustGetPtr($input,$&1_descriptor,$argnum, 0));
-            }
-        }
-        %typemap(in) const vector<T >& (std::vector<T > temp),
-                     const vector<T >* (std::vector<T > temp) {
-            if (gh_vector_p($input)) {
-                unsigned long size = gh_vector_length($input);
-                temp = std::vector<T >(size);
-                $1 = &temp;
-                for (unsigned long i=0; i<size; i++) {
-                    SCM o = gh_vector_ref($input,gh_ulong2scm(i));
-                    if (CHECK(o))
-                        temp[i] = (T)(CONVERT_FROM(o));
-                    else
-                        scm_wrong_type_arg(FUNC_NAME, $argnum, $input);
-                }
-            } else if (gh_null_p($input)) {
-                temp = std::vector<T >();
-                $1 = &temp;
-            } else if (gh_pair_p($input)) {
-                SCM v = gh_list_to_vector($input);
-                unsigned long size = gh_vector_length(v);
-                temp = std::vector<T >(size);
-                $1 = &temp;
-                for (unsigned long i=0; i<size; i++) {
-                    SCM o = gh_vector_ref(v,gh_ulong2scm(i));
-                    if (CHECK(o))
-                        temp[i] = (T)(CONVERT_FROM(o));
-                    else
-                        scm_wrong_type_arg(FUNC_NAME, $argnum, $input);
-                }
-            } else {
-                $1 = ($1_ltype) SWIG_MustGetPtr($input,$1_descriptor,$argnum, 0);
-            }
-        }
-        %typemap(out) vector<T > {
-            $result = gh_make_vector(gh_long2scm($1.size()),SCM_UNSPECIFIED);
-            for (unsigned int i=0; i<$1.size(); i++) {
-                SCM x = CONVERT_TO((($1_type &)$1)[i]);
-                gh_vector_set_x($result,gh_long2scm(i),x);
-            }
-        }
-        %typecheck(SWIG_TYPECHECK_VECTOR) vector<T > {
-            /* native sequence? */
-            if (gh_vector_p($input)) {
-                unsigned int size = gh_vector_length($input);
-                if (size == 0) {
-                    /* an empty sequence can be of any type */
-                    $1 = 1;
-                } else {
-                    /* check the first element only */
-                    T* x;
-                    SCM o = gh_vector_ref($input,gh_ulong2scm(0));
-                    $1 = CHECK(o) ? 1 : 0;
-                }
-            } else if (gh_null_p($input)) {
-                /* again, an empty sequence can be of any type */
-                $1 = 1;
-            } else if (gh_pair_p($input)) {
-                /* check the first element only */
-                T* x;
-                SCM head = gh_car($input);
-                $1 = CHECK(head) ? 1 : 0;
-            } else {
-                /* wrapped vector? */
-                std::vector<T >* v;
-                $1 = (SWIG_ConvertPtr($input,(void **) &v, 
-                                        $&1_descriptor, 0) != -1) ? 1 : 0;
-            }
-        }
-        %typecheck(SWIG_TYPECHECK_VECTOR) const vector<T >&,
-                                          const vector<T >* {
-            /* native sequence? */
-            if (gh_vector_p($input)) {
-                unsigned int size = gh_vector_length($input);
-                if (size == 0) {
-                    /* an empty sequence can be of any type */
-                    $1 = 1;
-                } else {
-                    /* check the first element only */
-                    T* x;
-                    SCM o = gh_vector_ref($input,gh_ulong2scm(0));
-                    $1 = CHECK(o) ? 1 : 0;
-                }
-            } else if (gh_null_p($input)) {
-                /* again, an empty sequence can be of any type */
-                $1 = 1;
-            } else if (gh_pair_p($input)) {
-                /* check the first element only */
-                T* x;
-                SCM head = gh_car($input);
-                $1 = CHECK(head) ? 1 : 0;
-            } else {
-                /* wrapped vector? */
-                std::vector<T >* v;
-                $1 = (SWIG_ConvertPtr($input,(void **) &v, 
-                                        $1_descriptor, 0) != -1) ? 1 : 0;
-            }
-        }
-      public:
-        vector(unsigned int size = 0);
-        vector(unsigned int size, const T& value);
-        vector(const vector<T >&);
-        %rename(length) size;
-        unsigned int size() const;
-        %rename("empty?") empty;
-        bool empty() const;
-        %rename("clear!") clear;
-        void clear();
-        %rename("set!") set;
-        %rename("pop!") pop;
-        %rename("push!") push_back;
-        void push_back(T x);
-        %extend {
-            T pop() throw (std::out_of_range) {
-                if (self->size() == 0)
-                    throw std::out_of_range("pop from empty vector");
-                T x = self->back();
-                self->pop_back();
-                return x;
-            }
-            T ref(int i) throw (std::out_of_range) {
-                int size = int(self->size());
-                if (i>=0 && i<size)
-                    return (*self)[i];
-                else
-                    throw std::out_of_range("vector index out of range");
-            }
-            void set(int i, T x) throw (std::out_of_range) {
-                int size = int(self->size());
-                if (i>=0 && i<size)
-                    (*self)[i] = x;
-                else
-                    throw std::out_of_range("vector index out of range");
-            }
-        }
-    };
-    %enddef
-
-    specialize_stl_vector(bool,gh_boolean_p,gh_scm2bool,SWIG_bool2scm);
-    specialize_stl_vector(char,gh_number_p,gh_scm2long,gh_long2scm);
-    specialize_stl_vector(int,gh_number_p,gh_scm2long,gh_long2scm);
-    specialize_stl_vector(long,gh_number_p,gh_scm2long,gh_long2scm);
-    specialize_stl_vector(short,gh_number_p,gh_scm2long,gh_long2scm);
-    specialize_stl_vector(unsigned char,gh_number_p,gh_scm2ulong,gh_ulong2scm);
-    specialize_stl_vector(unsigned int,gh_number_p,gh_scm2ulong,gh_ulong2scm);
-    specialize_stl_vector(unsigned long,gh_number_p,gh_scm2ulong,gh_ulong2scm);
-    specialize_stl_vector(unsigned short,gh_number_p,gh_scm2ulong,gh_ulong2scm);
-    specialize_stl_vector(float,gh_number_p,gh_scm2double,gh_double2scm);
-    specialize_stl_vector(double,gh_number_p,gh_scm2double,gh_double2scm);
-    specialize_stl_vector(std::string,gh_string_p,SWIG_scm2string,SWIG_string2scm);
-    specialize_stl_vector(std::complex<float>, scm_is_complex,
-			  SWIG_scm2cmplxfloat, SWIG_cmplxfloat2scm);
-    specialize_stl_vector(std::complex<double>, scm_is_complex,
-			  SWIG_scm2cmplxdouble,SWIG_cmplxdouble2scm);
-
-}
-
diff --git a/gnuradio-core/src/lib/viterbi/.gitignore b/gnuradio-core/src/lib/viterbi/.gitignore
deleted file mode 100644
index 85bb5cc04..000000000
--- a/gnuradio-core/src/lib/viterbi/.gitignore
+++ /dev/null
@@ -1,6 +0,0 @@
-/Makefile
-/Makefile.in
-/.libs
-/.deps
-/encode
-/decode
diff --git a/gnuradio-core/src/lib/viterbi/Makefile.am b/gnuradio-core/src/lib/viterbi/Makefile.am
deleted file mode 100644
index 7e65880b3..000000000
--- a/gnuradio-core/src/lib/viterbi/Makefile.am
+++ /dev/null
@@ -1,46 +0,0 @@
-#
-# Copyright 2008 Free Software Foundation, Inc.
-# 
-# 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 GNU Radio; see the file COPYING.  If not, write to
-# the Free Software Foundation, Inc., 51 Franklin Street,
-# Boston, MA 02110-1301, USA.
-# 
-
-include $(top_srcdir)/Makefile.common
-
-LIBS = -lm
-
-AM_CPPFLAGS = $(STD_DEFINES_AND_INCLUDES) $(GRUEL_INCLUDES) \
-	-I$(top_srcdir)/gnuradio-core/src/lib/general \
-	$(WITH_INCLUDES)
-
-noinst_LTLIBRARIES = libviterbi.la
-
-libviterbi_la_SOURCES = \
-    metrics.c		\
-    tab.c		\
-    viterbi.c
-
-noinst_HEADERS =	\
-    viterbi.h
-
-noinst_PROGRAMS = encode decode
-
-encode_SOURCES = encode.cc
-
-encode_LDADD = libviterbi.la
-
-decode_SOURCES = decode.cc
-
-decode_LDADD = libviterbi.la
diff --git a/gnuradio-core/src/python/.gitignore b/gnuradio-core/src/python/.gitignore
deleted file mode 100644
index f9c5da0db..000000000
--- a/gnuradio-core/src/python/.gitignore
+++ /dev/null
@@ -1,8 +0,0 @@
-/Makefile
-/Makefile.in
-/.deps
-/.libs
-/*.la
-/*.lo
-/*.pyc
-/*.pyo
diff --git a/gnuradio-core/src/python/Makefile.am b/gnuradio-core/src/python/Makefile.am
deleted file mode 100644
index a90aaba5c..000000000
--- a/gnuradio-core/src/python/Makefile.am
+++ /dev/null
@@ -1,30 +0,0 @@
-#
-# Copyright 2004 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 GNU Radio; see the file COPYING.  If not, write to
-# the Free Software Foundation, Inc., 51 Franklin Street,
-# Boston, MA 02110-1301, USA.
-# 
-
-include $(top_srcdir)/Makefile.common
-
-if PYTHON
-SUBDIRS = gnuradio bin
-
-noinst_PYTHON =			\
-	build_utils.py		\
-	build_utils_codes.py	
-endif
diff --git a/gnuradio-core/src/python/bin/.gitignore b/gnuradio-core/src/python/bin/.gitignore
deleted file mode 100644
index f9c5da0db..000000000
--- a/gnuradio-core/src/python/bin/.gitignore
+++ /dev/null
@@ -1,8 +0,0 @@
-/Makefile
-/Makefile.in
-/.deps
-/.libs
-/*.la
-/*.lo
-/*.pyc
-/*.pyo
diff --git a/gnuradio-core/src/python/bin/Makefile.am b/gnuradio-core/src/python/bin/Makefile.am
deleted file mode 100644
index 6f9f162f1..000000000
--- a/gnuradio-core/src/python/bin/Makefile.am
+++ /dev/null
@@ -1,28 +0,0 @@
-#
-# Copyright 2005,2009,2010 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 GNU Radio; see the file COPYING.  If not, write to
-# the Free Software Foundation, Inc., 51 Franklin Street,
-# Boston, MA 02110-1301, USA.
-# 
-
-include $(top_srcdir)/Makefile.common
-
-
-EXTRA_DIST += microtune.py
-
-noinst_SCRIPTS = 		\
-	microtune.py		
diff --git a/gnuradio-core/src/python/gnuradio/.gitignore b/gnuradio-core/src/python/gnuradio/.gitignore
deleted file mode 100644
index f9c5da0db..000000000
--- a/gnuradio-core/src/python/gnuradio/.gitignore
+++ /dev/null
@@ -1,8 +0,0 @@
-/Makefile
-/Makefile.in
-/.deps
-/.libs
-/*.la
-/*.lo
-/*.pyc
-/*.pyo
diff --git a/gnuradio-core/src/python/gnuradio/Makefile.am b/gnuradio-core/src/python/gnuradio/Makefile.am
deleted file mode 100644
index ffc171b2d..000000000
--- a/gnuradio-core/src/python/gnuradio/Makefile.am
+++ /dev/null
@@ -1,35 +0,0 @@
-#
-# Copyright 2004-2011 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 GNU Radio; see the file COPYING.  If not, write to
-# the Free Software Foundation, Inc., 51 Franklin Street,
-# Boston, MA 02110-1301, USA.
-# 
-
-include $(top_srcdir)/Makefile.common
-
-if PYTHON
-SUBDIRS = gr gru gruimpl blks2 blks2impl
-
-grpython_PYTHON = 			\
-	__init__.py			\
-	eng_notation.py			\
-	eng_option.py			\
-	gr_unittest.py			\
-	gr_xmlrunner.py			\
-	optfir.py			\
-	window.py
-endif
diff --git a/gnuradio-core/src/python/gnuradio/blks2/.gitignore b/gnuradio-core/src/python/gnuradio/blks2/.gitignore
deleted file mode 100644
index b6950912c..000000000
--- a/gnuradio-core/src/python/gnuradio/blks2/.gitignore
+++ /dev/null
@@ -1,3 +0,0 @@
-/Makefile
-/Makefile.in
-/*.pyc
diff --git a/gnuradio-core/src/python/gnuradio/blks2/Makefile.am b/gnuradio-core/src/python/gnuradio/blks2/Makefile.am
deleted file mode 100644
index 04b7c6500..000000000
--- a/gnuradio-core/src/python/gnuradio/blks2/Makefile.am
+++ /dev/null
@@ -1,30 +0,0 @@
-#
-# Copyright 2005,2009 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 GNU Radio; see the file COPYING.  If not, write to
-# the Free Software Foundation, Inc., 51 Franklin Street,
-# Boston, MA 02110-1301, USA.
-# 
-
-include $(top_srcdir)/Makefile.common
-
-# EXTRA_DIST = run_tests.in
-# TESTS = run_tests
-
-grblks2pythondir = $(grpythondir)/blks2
-
-grblks2python_PYTHON =		\
-	__init__.py		
diff --git a/gnuradio-core/src/python/gnuradio/blks2impl/.gitignore b/gnuradio-core/src/python/gnuradio/blks2impl/.gitignore
deleted file mode 100644
index f9c5da0db..000000000
--- a/gnuradio-core/src/python/gnuradio/blks2impl/.gitignore
+++ /dev/null
@@ -1,8 +0,0 @@
-/Makefile
-/Makefile.in
-/.deps
-/.libs
-/*.la
-/*.lo
-/*.pyc
-/*.pyo
diff --git a/gnuradio-core/src/python/gnuradio/blks2impl/Makefile.am b/gnuradio-core/src/python/gnuradio/blks2impl/Makefile.am
deleted file mode 100644
index eb031cd20..000000000
--- a/gnuradio-core/src/python/gnuradio/blks2impl/Makefile.am
+++ /dev/null
@@ -1,49 +0,0 @@
-#
-# Copyright 2005,2007,2009,2010 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 GNU Radio; see the file COPYING.  If not, write to
-# the Free Software Foundation, Inc., 51 Franklin Street,
-# Boston, MA 02110-1301, USA.
-# 
-
-include $(top_srcdir)/Makefile.common
-
-# EXTRA_DIST = run_tests.in
-# TESTS = run_tests
-
-grblkspythondir = $(grpythondir)/blks2impl
-
-grblkspython_PYTHON =		\
-	__init__.py		\
-	am_demod.py		\
-	channel_model.py	\
-	filterbank.py		\
-	fm_demod.py		\
-	fm_emph.py		\
-	logpwrfft.py		\
-	nbfm_rx.py		\
-	nbfm_tx.py		\
-	pfb_arb_resampler.py	\
-	pfb_channelizer.py	\
-	pfb_decimator.py	\
-	pfb_interpolator.py	\
-	rational_resampler.py	\
-	standard_squelch.py	\
-	stream_to_vector_decimator.py \
-	wfm_rcv.py		\
-	wfm_rcv_fmdet.py	\
-	wfm_rcv_pll.py		\
-	wfm_tx.py		
diff --git a/gnuradio-core/src/python/gnuradio/gr/.gitignore b/gnuradio-core/src/python/gnuradio/gr/.gitignore
deleted file mode 100644
index bf03975bb..000000000
--- a/gnuradio-core/src/python/gnuradio/gr/.gitignore
+++ /dev/null
@@ -1,9 +0,0 @@
-/Makefile
-/Makefile.in
-/.deps
-/.libs
-/*.la
-/*.lo
-/*.pyc
-/*.pyo
-/run_tests
diff --git a/gnuradio-core/src/python/gnuradio/gr/Makefile.am b/gnuradio-core/src/python/gnuradio/gr/Makefile.am
deleted file mode 100644
index f5af80c78..000000000
--- a/gnuradio-core/src/python/gnuradio/gr/Makefile.am
+++ /dev/null
@@ -1,98 +0,0 @@
-#
-# Copyright 2004,2005,2006,2008,2010 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 GNU Radio; see the file COPYING.  If not, write to
-# the Free Software Foundation, Inc., 51 Franklin Street,
-# Boston, MA 02110-1301, USA.
-# 
-
-include $(top_srcdir)/Makefile.common
-
-EXTRA_DIST += 			\
-	run_tests.in		\
-	test_16bit_1chunk.wav
-
-TESTS = run_tests
-
-
-grgrpythondir = $(grpythondir)/gr
-
-grgrpython_PYTHON = 		\
-	__init__.py		\
-	exceptions.py		\
-	gr_threading.py		\
-	gr_threading_23.py	\
-	gr_threading_24.py	\
-	hier_block2.py		\
-	prefs.py		\
-	top_block.py		\
-	pubsub.py
-
-noinst_PYTHON = 			\
-	benchmark_filters.py		\
-	qa_add_and_friends.py		\
-	qa_add_v_and_friends.py		\
-	qa_agc.py			\
-	qa_argmax.py			\
-	qa_bin_statistics.py		\
-	qa_classify.py			\
-	qa_complex_to_xxx.py		\
-	qa_copy.py			\
-	qa_delay.py			\
-	qa_dc_blocker.py		\
-	qa_diff_encoder.py		\
-	qa_diff_phasor_cc.py		\
-	qa_ecc_ccsds_27.py		\
-	qa_feval.py			\
-	qa_fft.py			\
-	qa_fft_filter.py		\
-	qa_filter_delay_fc.py		\
-	qa_float_to_int.py		\
-	qa_fractional_interpolator.py   \
-	qa_frequency_modulator.py	\
-	qa_fsk_stuff.py			\
-	qa_glfsr_source.py		\
-	qa_goertzel.py			\
-	qa_head.py			\
-	qa_hier_block2.py		\
-	qa_hilbert.py			\
-	qa_iir.py			\
-	qa_int_to_float.py		\
-	qa_interleave.py		\
-	qa_interp_fir_filter.py		\
-	qa_kludge_copy.py		\
-	qa_kludged_imports.py		\
-	qa_max.py			\
-	qa_message.py			\
-	qa_mute.py			\
-	qa_nlog10.py			\
-	qa_noise.py			\
-	qa_packed_to_unpacked.py	\
-	qa_pipe_fittings.py		\
-	qa_pll_carriertracking.py	\
-	qa_pll_freqdet.py		\
-	qa_pll_refout.py		\
-	qa_pn_correlator_cc.py		\
-	qa_rational_resampler.py	\
-	qa_sig_source.py		\
-	qa_single_pole_iir.py		\
-	qa_single_pole_iir_cc.py	\
-	qa_skiphead.py			\
-	qa_unpack_k_bits.py		\
-	qa_repeat.py                    \
-	qa_scrambler.py			\
-	qa_udp_sink_source.py		\
-	qa_vector_sink_source.py	
diff --git a/gnuradio-core/src/python/gnuradio/gr/run_tests.in b/gnuradio-core/src/python/gnuradio/gr/run_tests.in
deleted file mode 100755
index 107efe728..000000000
--- a/gnuradio-core/src/python/gnuradio/gr/run_tests.in
+++ /dev/null
@@ -1,14 +0,0 @@
-#!/bin/sh
-
-# 1st parameter is absolute path to component source directory
-# 2nd parameter is absolute path to component build directory
-# 3rd parameter is path to Python QA directory
-
-# Note: calling master run_tests.sh in gnuradio core is not strictly
-# correct, as it will result in a partially bogus PYTHONPATH, but it
-# does make the correct paths in the second half so all is well.
-
-@top_builddir@/run_tests.sh \
-    @abs_top_srcdir@/gnuradio-core \
-    @abs_top_builddir@/gnuradio-core \
-    @srcdir@
diff --git a/gnuradio-core/src/python/gnuradio/gru/.gitignore b/gnuradio-core/src/python/gnuradio/gru/.gitignore
deleted file mode 100644
index f9c5da0db..000000000
--- a/gnuradio-core/src/python/gnuradio/gru/.gitignore
+++ /dev/null
@@ -1,8 +0,0 @@
-/Makefile
-/Makefile.in
-/.deps
-/.libs
-/*.la
-/*.lo
-/*.pyc
-/*.pyo
diff --git a/gnuradio-core/src/python/gnuradio/gru/Makefile.am b/gnuradio-core/src/python/gnuradio/gru/Makefile.am
deleted file mode 100644
index 9b311d81f..000000000
--- a/gnuradio-core/src/python/gnuradio/gru/Makefile.am
+++ /dev/null
@@ -1,30 +0,0 @@
-#
-# Copyright 2005,2009 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 GNU Radio; see the file COPYING.  If not, write to
-# the Free Software Foundation, Inc., 51 Franklin Street,
-# Boston, MA 02110-1301, USA.
-# 
-
-include $(top_srcdir)/Makefile.common
-
-# EXTRA_DIST = run_tests.in
-# TESTS = run_tests
-
-grblkspythondir = $(grpythondir)/gru
-
-grblkspython_PYTHON =		\
-	__init__.py		
diff --git a/gnuradio-core/src/python/gnuradio/gruimpl/.gitignore b/gnuradio-core/src/python/gnuradio/gruimpl/.gitignore
deleted file mode 100644
index f9c5da0db..000000000
--- a/gnuradio-core/src/python/gnuradio/gruimpl/.gitignore
+++ /dev/null
@@ -1,8 +0,0 @@
-/Makefile
-/Makefile.in
-/.deps
-/.libs
-/*.la
-/*.lo
-/*.pyc
-/*.pyo
diff --git a/gnuradio-core/src/python/gnuradio/gruimpl/Makefile.am b/gnuradio-core/src/python/gnuradio/gruimpl/Makefile.am
deleted file mode 100644
index 903bc2695..000000000
--- a/gnuradio-core/src/python/gnuradio/gruimpl/Makefile.am
+++ /dev/null
@@ -1,39 +0,0 @@
-#
-# Copyright 2005,2009 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 GNU Radio; see the file COPYING.  If not, write to
-# the Free Software Foundation, Inc., 51 Franklin Street,
-# Boston, MA 02110-1301, USA.
-# 
-
-include $(top_srcdir)/Makefile.common
-
-grupythondir = $(grpythondir)/gruimpl
-
-grupython_PYTHON = 			\
-	__init__.py			\
-	freqz.py			\
-	gnuplot_freqz.py		\
-	hexint.py			\
-	listmisc.py			\
-	mathmisc.py			\
-	lmx2306.py			\
-	msgq_runner.py			\
-	os_read_exactly.py		\
-	sdr_1000.py			\
-	seq_with_cursor.py		\
-	socket_stuff.py			\
-	daemon.py
diff --git a/gnuradio-core/src/python/gnuradio/vocoder/.gitignore b/gnuradio-core/src/python/gnuradio/vocoder/.gitignore
deleted file mode 100644
index b336cc7ce..000000000
--- a/gnuradio-core/src/python/gnuradio/vocoder/.gitignore
+++ /dev/null
@@ -1,2 +0,0 @@
-/Makefile
-/Makefile.in
diff --git a/gnuradio-core/src/tests/.gitignore b/gnuradio-core/src/tests/.gitignore
deleted file mode 100644
index 8687003d4..000000000
--- a/gnuradio-core/src/tests/.gitignore
+++ /dev/null
@@ -1,28 +0,0 @@
-/Makefile
-/Makefile.in
-/.la
-/.lo
-/.deps
-/.libs
-/*.la
-/*.lo
-/t1
-/test_dtv
-/check_dups
-/test_gr
-/test_all
-/exercise_correlator
-/test_grbase
-/test_vmcircbuf
-/test_atsc
-/test_general
-/test_runtime
-/test_filter
-/benchmark_dotprod_fff
-/benchmark_dotprod_ccc
-/benchmark_dotprod_fcc
-/benchmark_dotprod_scc
-/benchmark_nco
-/benchmark_dotprod_ccf
-/benchmark_dotprod_fsf
-/benchmark_vco
diff --git a/gnuradio-core/src/tests/Makefile.am b/gnuradio-core/src/tests/Makefile.am
deleted file mode 100644
index 5879a13d8..000000000
--- a/gnuradio-core/src/tests/Makefile.am
+++ /dev/null
@@ -1,105 +0,0 @@
-#
-# Copyright 2001,2008,2010 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 GNU Radio; see the file COPYING.  If not, write to
-# the Free Software Foundation, Inc., 51 Franklin Street,
-# Boston, MA 02110-1301, USA.
-# 
-
-include $(top_srcdir)/Makefile.common
-
-AM_CPPFLAGS = $(STD_DEFINES_AND_INCLUDES) $(CPPUNIT_INCLUDES) $(WITH_INCLUDES)
-
-# list of programs run by "make check" and "make distcheck"
-
-TESTS = test_all
-
-
-#	test_atsc		
-
-#Test program to test setting up buffers using gr_test which can be run manually
-EXTRA_DIST += \
-	test_buffers.py \
-	benchmark_dotprod
-
-
-noinst_PROGRAMS		= 	\
-	benchmark_dotprod_fff	\
-	benchmark_dotprod_fsf	\
-	benchmark_dotprod_fcc	\
-	benchmark_dotprod_scc	\
-	benchmark_dotprod_ccc	\
-	benchmark_dotprod_ccf	\
-	benchmark_nco		\
-	benchmark_vco		\
-	test_all		\
-	test_runtime		\
-	test_general		\
-	test_filter		\
-	test_vmcircbuf
-
-#bin_PROGRAMS = \
-#	test_all
-
-
-noinst_SCRIPTS = \
-	benchmark_dotprod
-
-
-LIBGNURADIO = 	$(GNURADIO_CORE_LA) $(BOOST_FILESYSTEM_LIB)
-LIBGNURADIOQA = $(top_builddir)/gnuradio-core/src/lib/libgnuradio-core-qa.la $(LIBGNURADIO)
-
-benchmark_dotprod_fff_SOURCES = benchmark_dotprod_fff.cc
-benchmark_dotprod_fff_LDADD   = $(LIBGNURADIO)
-
-benchmark_dotprod_fsf_SOURCES = benchmark_dotprod_fsf.cc
-benchmark_dotprod_fsf_LDADD   = $(LIBGNURADIO)
-
-benchmark_dotprod_ccf_SOURCES = benchmark_dotprod_ccf.cc
-benchmark_dotprod_ccf_LDADD   = $(LIBGNURADIO)
-
-benchmark_dotprod_fcc_SOURCES = benchmark_dotprod_fcc.cc
-benchmark_dotprod_fcc_LDADD   = $(LIBGNURADIO)
-
-benchmark_dotprod_scc_SOURCES = benchmark_dotprod_scc.cc
-benchmark_dotprod_scc_LDADD   = $(LIBGNURADIO)
-
-benchmark_dotprod_ccc_SOURCES = benchmark_dotprod_ccc.cc
-benchmark_dotprod_ccc_LDADD   = $(LIBGNURADIO)
-
-benchmark_nco_SOURCES 	= benchmark_nco.cc
-benchmark_nco_LDADD   	= $(LIBGNURADIO)
-
-benchmark_vco_SOURCES 	= benchmark_vco.cc
-benchmark_vco_LDADD   	= $(LIBGNURADIO)
-
-test_runtime_SOURCES	= test_runtime.cc
-test_runtime_LDADD 	= $(LIBGNURADIOQA)
-
-test_general_SOURCES	= test_general.cc
-test_general_LDADD 	= $(LIBGNURADIOQA)
-
-test_filter_SOURCES	= test_filter.cc
-test_filter_LDADD 	= $(LIBGNURADIOQA)
-
-# test_atsc_SOURCES	= test_atsc.cc
-#test_atsc_LDADD 	= $(LIBGNURADIOQA)
-
-test_vmcircbuf_SOURCES	= test_vmcircbuf.cc
-test_vmcircbuf_LDADD 	= $(LIBGNURADIOQA)
-
-test_all_SOURCES	= test_all.cc
-test_all_LDADD 		= $(LIBGNURADIOQA)
diff --git a/gnuradio-core/src/utils/.gitignore b/gnuradio-core/src/utils/.gitignore
deleted file mode 100644
index a02b6ff73..000000000
--- a/gnuradio-core/src/utils/.gitignore
+++ /dev/null
@@ -1,8 +0,0 @@
-/Makefile
-/Makefile.in
-/.la
-/.lo
-/.deps
-/.libs
-/*.la
-/*.lo
diff --git a/gnuradio-core/src/utils/Makefile.am b/gnuradio-core/src/utils/Makefile.am
deleted file mode 100644
index acf439140..000000000
--- a/gnuradio-core/src/utils/Makefile.am
+++ /dev/null
@@ -1,56 +0,0 @@
-#
-# Copyright 2001 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 GNU Radio; see the file COPYING.  If not, write to
-# the Free Software Foundation, Inc., 51 Franklin Street,
-# Boston, MA 02110-1301, USA.
-#
-
-include $(top_srcdir)/Makefile.common
-
-EXTRA_DIST += 			\
-	cic_comp_taps.m		\
-	db_width.m		\
-	filter_tools.m		\
-	plot_freq_response.m	\
-	plot_freq_response_db.m	\
-	plot_freq_response_phase.m	\
-	plotfft.m 		\
-	plotfftavgk.m		\
-	plotfftavgk_db.m	\
-	plotfftk.m 		\
-	plotfftk_db.m		\
-	put_markers.m		\
-	read_char_binary.m	\
-	read_complex_binary.m 	\
-	read_float_binary.m 	\
-	read_int_binary.m	\
-	read_short_binary.m	\
-	read_cshort_binary.m 	\
-	single_pole_iir.m	\
-	write_float_binary.m	\
-	write_short_binary.m	\
-	is_complex.m		\
-	split_vect.m		\
-	rainbow.m		\
-	lp_to_bp.m		\
-	cool.m			\
-	read_xambi.m		\
-	runsum.m		\
-	plot_cic_decimator_response.m
-
-# partition-cascaded-decimating-filters.scm
-# permute.scm