Merge branch 'next'

13 files changed, 0 insertions, 1614 deletions

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/gnuradio.i b/gnuradio-core/src/lib/swig/gnuradio.i
index 972d56c84..35dbd5359 100644
--- a/gnuradio-core/src/lib/swig/gnuradio.i
+++ b/gnuradio-core/src/lib/swig/gnuradio.i
@@ -39,30 +39,11 @@
 
 %feature("autodoc","1");
 
-#ifdef SWIGGUILE
-// Export constants and enums as scheme variables, not functions.
-%feature("constasvar");
-#endif
-
 // local file
 %include <gr_shared_ptr.i>
-
-// non-local SWIG files
-#ifdef SWIGGUILE	// Local overrides to support complex
-// It's kind of screwy, but the target language subdir isn't
-// searched automatically except for under ./swig_lib which
-// doesn't really help us since we run swig in many directories
-%include <guile/std_complex.i>
-%include <guile/std_vector.i>
-%include <std_common.i>
-%include <std_string.i>
-%include <std_map.i>
-%include <std_pair.i>
-#else
 %include <std_complex.i>
 %include <std_vector.i>
 %include <stl.i>
-#endif
 %include <std_except.i>
 
 typedef std::complex<float>		gr_complex;
diff --git a/gnuradio-core/src/lib/swig/gnuradio_core_filter.i b/gnuradio-core/src/lib/swig/gnuradio_core_filter.i
index 952bf93b4..e9a44e54b 100644
--- a/gnuradio-core/src/lib/swig/gnuradio_core_filter.i
+++ b/gnuradio-core/src/lib/swig/gnuradio_core_filter.i
@@ -30,13 +30,3 @@
 %include "gnuradio.i"				// the common stuff
 
 %include "filter.i"
-
-#if SWIGGUILE
-%scheme %{
-(load-extension-global "libguile-gnuradio-gnuradio_core_filter" "scm_init_gnuradio_gnuradio_core_filter_module")
-%}
-
-%goops %{
-  (use-modules (gnuradio gnuradio_core_runtime))
-%}
-#endif
diff --git a/gnuradio-core/src/lib/swig/gnuradio_core_general.i b/gnuradio-core/src/lib/swig/gnuradio_core_general.i
index e39a0197a..33f97815e 100644
--- a/gnuradio-core/src/lib/swig/gnuradio_core_general.i
+++ b/gnuradio-core/src/lib/swig/gnuradio_core_general.i
@@ -52,13 +52,3 @@
   }
 
 %}
-
-#if SWIGGUILE
-%scheme %{
-(load-extension-global "libguile-gnuradio-gnuradio_core_general" "scm_init_gnuradio_gnuradio_core_general_module")
-%}
-
-%goops %{
-(use-modules (gnuradio gnuradio_core_runtime))
-%}
-#endif
diff --git a/gnuradio-core/src/lib/swig/gnuradio_core_gengen.i b/gnuradio-core/src/lib/swig/gnuradio_core_gengen.i
index 8753cd36b..b90a5bab3 100644
--- a/gnuradio-core/src/lib/swig/gnuradio_core_gengen.i
+++ b/gnuradio-core/src/lib/swig/gnuradio_core_gengen.i
@@ -30,13 +30,3 @@
 %include "gnuradio.i"				// the common stuff
 
 %include "gengen.i"
-
-#if SWIGGUILE
-%scheme %{
-(load-extension-global "libguile-gnuradio-gnuradio_core_gengen" "scm_init_gnuradio_gnuradio_core_gengen_module")
-%}
-
-%goops %{
-  (use-modules (gnuradio gnuradio_core_runtime))
-%}
-#endif
diff --git a/gnuradio-core/src/lib/swig/gnuradio_core_hier.i b/gnuradio-core/src/lib/swig/gnuradio_core_hier.i
index bb9c71f53..141d9b163 100644
--- a/gnuradio-core/src/lib/swig/gnuradio_core_hier.i
+++ b/gnuradio-core/src/lib/swig/gnuradio_core_hier.i
@@ -30,13 +30,3 @@
 %include "gnuradio.i"				// the common stuff
 
 %include "hier.i"
-
-#if SWIGGUILE
-%scheme %{
-(load-extension-global "libguile-gnuradio-gnuradio_core_hier" "scm_init_gnuradio_gnuradio_core_hier_module")
-%}
-
-%goops %{
-  (use-modules (gnuradio gnuradio_core_runtime))
-%}
-#endif
diff --git a/gnuradio-core/src/lib/swig/gnuradio_core_io.i b/gnuradio-core/src/lib/swig/gnuradio_core_io.i
index d2fa0aede..522b12b34 100644
--- a/gnuradio-core/src/lib/swig/gnuradio_core_io.i
+++ b/gnuradio-core/src/lib/swig/gnuradio_core_io.i
@@ -30,13 +30,3 @@
 %include "gnuradio.i"				// the common stuff
 
 %include "io.i"
-
-#if SWIGGUILE
-%scheme %{
-(load-extension-global "libguile-gnuradio-gnuradio_core_io" "scm_init_gnuradio_gnuradio_core_io_module")
-%}
-
-%goops %{
-  (use-modules (gnuradio gnuradio_core_runtime))
-%}
-#endif
diff --git a/gnuradio-core/src/lib/swig/gnuradio_core_runtime.i b/gnuradio-core/src/lib/swig/gnuradio_core_runtime.i
index 7fcac5069..fb311d226 100644
--- a/gnuradio-core/src/lib/swig/gnuradio_core_runtime.i
+++ b/gnuradio-core/src/lib/swig/gnuradio_core_runtime.i
@@ -32,28 +32,3 @@
 %include "gnuradio.i"				// the common stuff
 
 %include "runtime.i"
-
-
-#if SWIGGUILE
-%scheme %{
-
-;; Load our gsubr that loads libraries using the RTLD_GLOBAL option
-(load-extension "libguile-gnuradio-dynl-global" "scm_init_gnuradio_dynl_global_module")
-
-;; Define load-extension-global in module '(guile)
-(module-define! (resolve-module '(guile)) 
-		'load-extension-global
-		(lambda (lib init)
-		  (dynamic-call init (dynamic-link-global lib))))
-
-;; Use load-extension-global to load our swig modules
-(load-extension-global "libguile-gnuradio-gnuradio_core_runtime" "scm_init_gnuradio_gnuradio_core_runtime_module")
-%}
-
-%goops %{
-(use-modules (gnuradio export-safely))
-(re-export export-syms-if-not-imported-gf)
-(re-export-syntax export-safely)
-(re-export re-export-all)
-%}
-#endif
diff --git a/gnuradio-core/src/lib/swig/gr_swig_block_magic.i b/gnuradio-core/src/lib/swig/gr_swig_block_magic.i
index a080c2b27..79055bd95 100644
--- a/gnuradio-core/src/lib/swig/gr_swig_block_magic.i
+++ b/gnuradio-core/src/lib/swig/gr_swig_block_magic.i
@@ -40,21 +40,3 @@ FULL_NAME ## _sptr.__repr__ = lambda self: "<gr_block %s (%d)>" % (self.name(),
 %}
 %enddef
 #endif
-
-#ifdef SWIGGUILE
-#ifdef IN_GNURADIO_CORE		// normal behavior
-%define _GR_SWIG_BLOCK_MAGIC_HELPER(PKG, BASE_NAME, FULL_NAME)
-_GR_SWIG_BLOCK_MAGIC_HELPER_COMMON(PKG, BASE_NAME, FULL_NAME)
-/* FIXME May want to add something here to get a friendlier printed representation */
-%enddef
-#else				// Don't strip PKG from name
-%define _GR_SWIG_BLOCK_MAGIC_HELPER(PKG, BASE_NAME, FULL_NAME)
-class FULL_NAME;
-typedef boost::shared_ptr<FULL_NAME> FULL_NAME ## _sptr;
-%template(FULL_NAME ## _sptr) boost::shared_ptr<FULL_NAME>;
-%ignore FULL_NAME;
-%rename(FULL_NAME) PKG ## _make_ ## BASE_NAME;
-/* FIXME May want to add something here to get a friendlier printed representation */
-%enddef
-#endif
-#endif
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);
-
-}
-