regenerated from template

14 files changed, 631 insertions, 217 deletions

diff --git a/gnuradio-core/src/lib/swig/Makefile.swig.gen b/gnuradio-core/src/lib/swig/Makefile.swig.gen
index e24ba5a96..fab8afd62 100644
--- a/gnuradio-core/src/lib/swig/Makefile.swig.gen
+++ b/gnuradio-core/src/lib/swig/Makefile.swig.gen
@@ -72,7 +72,7 @@ MOSTLYCLEANFILES += $(DEPDIR)/*.S*
 ## .h file is sometimes built, but not always ... so that one has to
 ## be added manually by the including Makefile.am .
 
-swig_built_sources += gnuradio_swig_py_runtime.py gnuradio_swig_py_runtime.cc
+swig_built_sources += gnuradio_swig_py_runtime.py gnuradio_swig_py_runtime-python.cc
 
 ## Various SWIG variables.  These can be overloaded in the including
 ## Makefile.am by setting the variable value there, then including
@@ -86,7 +86,7 @@ gnuradio_swig_py_runtime_pylib_LTLIBRARIES =		\
 	_gnuradio_swig_py_runtime.la
 
 _gnuradio_swig_py_runtime_la_SOURCES = 			\
-	gnuradio_swig_py_runtime.cc			\
+	gnuradio_swig_py_runtime-python.cc			\
 	$(gnuradio_swig_py_runtime_la_swig_sources)
 
 _gnuradio_swig_py_runtime_la_LIBADD =			\
@@ -107,7 +107,7 @@ gnuradio_swig_py_runtime_python_PYTHON =			\
 
 ## Entry rule for running SWIG
 
-gnuradio_swig_py_runtime.h gnuradio_swig_py_runtime.py gnuradio_swig_py_runtime.cc: gnuradio_swig_py_runtime.i
+gnuradio_swig_py_runtime.h gnuradio_swig_py_runtime.py gnuradio_swig_py_runtime-python.cc: gnuradio_swig_py_runtime.i
 ## This rule will get called only when MAKE decides that one of the
 ## targets needs to be created or re-created, because:
 ##
@@ -159,11 +159,12 @@ gnuradio_swig_py_runtime.h gnuradio_swig_py_runtime.py gnuradio_swig_py_runtime.
 ##
 ## Remove the stamp associated with this filename.
 ##
-		rm -f $(DEPDIR)/gnuradio_swig_py_runtime-generate-stamp; \
+		rm -f $(DEPDIR)/gnuradio_swig_py_runtime-generate-*stamp; \
 ##
 ## Tell MAKE to run the rule for creating this stamp.
 ##
-		$(MAKE) $(AM_MAKEFLAGS) $(DEPDIR)/gnuradio_swig_py_runtime-generate-stamp WHAT=$<; \
+		$(MAKE) $(AM_MAKEFLAGS) $(DEPDIR)/gnuradio_swig_py_runtime-generate-python-stamp WHAT=$<; \
+		$(MAKE) $(AM_MAKEFLAGS) $(DEPDIR)/gnuradio_swig_py_runtime-generate-guile-stamp WHAT=$<; \
 ##
 ## Now that the .cc, .h, and .py files have been (re)created from the
 ## .i file, future checking of this rule during the same MAKE
@@ -187,11 +188,27 @@ gnuradio_swig_py_runtime.h gnuradio_swig_py_runtime.py gnuradio_swig_py_runtime.
 ## Succeed if and only if the first process succeeded; exit this
 ## process returning the status of the generated stamp.
 ##
-		test -f $(DEPDIR)/gnuradio_swig_py_runtime-generate-stamp; \
+		test -f $(DEPDIR)/gnuradio_swig_py_runtime-generate-python-stamp; \
 		exit $$?; \
 	fi;
 
-$(DEPDIR)/gnuradio_swig_py_runtime-generate-stamp:
+$(DEPDIR)/gnuradio_swig_py_runtime-generate-guile-stamp:
+	if $(SWIG) $(STD_SWIG_GUILE_ARGS) $(gnuradio_swig_py_runtime_swig_args) \
+		-MD -MF $(DEPDIR)/gnuradio_swig_py_runtime.Std \
+		-module gnuradio_swig_py_runtime -o gnuradio_swig_py_runtime-guile.cc $(WHAT); then \
+	    if test $(host_os) = mingw32; then \
+		$(RM) $(DEPDIR)/gnuradio_swig_py_runtime.Sd; \
+		$(SED) 's,\\\\,/,g' < $(DEPDIR)/gnuradio_swig_py_runtime.Std \
+			> $(DEPDIR)/gnuradio_swig_py_runtime.Sd; \
+		$(RM) $(DEPDIR)/gnuradio_swig_py_runtime.Std; \
+		$(MV) $(DEPDIR)/gnuradio_swig_py_runtime.Sd $(DEPDIR)/gnuradio_swig_py_runtime.Std; \
+	    fi; \
+	else \
+	    $(RM) $(DEPDIR)/gnuradio_swig_py_runtime.S*; exit 1; \
+	fi;
+	touch $(DEPDIR)/gnuradio_swig_py_runtime-generate-guile-stamp
+
+$(DEPDIR)/gnuradio_swig_py_runtime-generate-python-stamp:
 ## This rule will be called only by the first process issuing the
 ## above rule to succeed in creating the lock directory, after
 ## removing the actual stamp file in order to guarantee that MAKE will
@@ -202,7 +219,7 @@ $(DEPDIR)/gnuradio_swig_py_runtime-generate-stamp:
 ##
 	if $(SWIG) $(STD_SWIG_PYTHON_ARGS) $(gnuradio_swig_py_runtime_swig_args) \
 		-MD -MF $(DEPDIR)/gnuradio_swig_py_runtime.Std \
-		-module gnuradio_swig_py_runtime -o gnuradio_swig_py_runtime.cc $(WHAT); then \
+		-module gnuradio_swig_py_runtime -o gnuradio_swig_py_runtime-python.cc $(WHAT); then \
 	    if test $(host_os) = mingw32; then \
 		$(RM) $(DEPDIR)/gnuradio_swig_py_runtime.Sd; \
 		$(SED) 's,\\\\,/,g' < $(DEPDIR)/gnuradio_swig_py_runtime.Std \
@@ -249,7 +266,7 @@ $(DEPDIR)/gnuradio_swig_py_runtime-generate-stamp:
 ## executing this rule; allows other threads waiting on this process
 ## to continue.
 ##
-	touch $(DEPDIR)/gnuradio_swig_py_runtime-generate-stamp
+	touch $(DEPDIR)/gnuradio_swig_py_runtime-generate-python-stamp
 
 # KLUDGE: Force runtime include of a SWIG dependency file.  This is
 # not guaranteed to be portable, but will probably work.  If it works,
@@ -331,7 +348,7 @@ MOSTLYCLEANFILES += $(DEPDIR)/*.S*
 ## .h file is sometimes built, but not always ... so that one has to
 ## be added manually by the including Makefile.am .
 
-swig_built_sources += gnuradio_swig_py_general.py gnuradio_swig_py_general.cc
+swig_built_sources += gnuradio_swig_py_general.py gnuradio_swig_py_general-python.cc
 
 ## Various SWIG variables.  These can be overloaded in the including
 ## Makefile.am by setting the variable value there, then including
@@ -345,7 +362,7 @@ gnuradio_swig_py_general_pylib_LTLIBRARIES =		\
 	_gnuradio_swig_py_general.la
 
 _gnuradio_swig_py_general_la_SOURCES = 			\
-	gnuradio_swig_py_general.cc			\
+	gnuradio_swig_py_general-python.cc			\
 	$(gnuradio_swig_py_general_la_swig_sources)
 
 _gnuradio_swig_py_general_la_LIBADD =			\
@@ -366,7 +383,7 @@ gnuradio_swig_py_general_python_PYTHON =			\
 
 ## Entry rule for running SWIG
 
-gnuradio_swig_py_general.h gnuradio_swig_py_general.py gnuradio_swig_py_general.cc: gnuradio_swig_py_general.i
+gnuradio_swig_py_general.h gnuradio_swig_py_general.py gnuradio_swig_py_general-python.cc: gnuradio_swig_py_general.i
 ## This rule will get called only when MAKE decides that one of the
 ## targets needs to be created or re-created, because:
 ##
@@ -418,11 +435,12 @@ gnuradio_swig_py_general.h gnuradio_swig_py_general.py gnuradio_swig_py_general.
 ##
 ## Remove the stamp associated with this filename.
 ##
-		rm -f $(DEPDIR)/gnuradio_swig_py_general-generate-stamp; \
+		rm -f $(DEPDIR)/gnuradio_swig_py_general-generate-*stamp; \
 ##
 ## Tell MAKE to run the rule for creating this stamp.
 ##
-		$(MAKE) $(AM_MAKEFLAGS) $(DEPDIR)/gnuradio_swig_py_general-generate-stamp WHAT=$<; \
+		$(MAKE) $(AM_MAKEFLAGS) $(DEPDIR)/gnuradio_swig_py_general-generate-python-stamp WHAT=$<; \
+		$(MAKE) $(AM_MAKEFLAGS) $(DEPDIR)/gnuradio_swig_py_general-generate-guile-stamp WHAT=$<; \
 ##
 ## Now that the .cc, .h, and .py files have been (re)created from the
 ## .i file, future checking of this rule during the same MAKE
@@ -446,11 +464,27 @@ gnuradio_swig_py_general.h gnuradio_swig_py_general.py gnuradio_swig_py_general.
 ## Succeed if and only if the first process succeeded; exit this
 ## process returning the status of the generated stamp.
 ##
-		test -f $(DEPDIR)/gnuradio_swig_py_general-generate-stamp; \
+		test -f $(DEPDIR)/gnuradio_swig_py_general-generate-python-stamp; \
 		exit $$?; \
 	fi;
 
-$(DEPDIR)/gnuradio_swig_py_general-generate-stamp:
+$(DEPDIR)/gnuradio_swig_py_general-generate-guile-stamp:
+	if $(SWIG) $(STD_SWIG_GUILE_ARGS) $(gnuradio_swig_py_general_swig_args) \
+		-MD -MF $(DEPDIR)/gnuradio_swig_py_general.Std \
+		-module gnuradio_swig_py_general -o gnuradio_swig_py_general-guile.cc $(WHAT); then \
+	    if test $(host_os) = mingw32; then \
+		$(RM) $(DEPDIR)/gnuradio_swig_py_general.Sd; \
+		$(SED) 's,\\\\,/,g' < $(DEPDIR)/gnuradio_swig_py_general.Std \
+			> $(DEPDIR)/gnuradio_swig_py_general.Sd; \
+		$(RM) $(DEPDIR)/gnuradio_swig_py_general.Std; \
+		$(MV) $(DEPDIR)/gnuradio_swig_py_general.Sd $(DEPDIR)/gnuradio_swig_py_general.Std; \
+	    fi; \
+	else \
+	    $(RM) $(DEPDIR)/gnuradio_swig_py_general.S*; exit 1; \
+	fi;
+	touch $(DEPDIR)/gnuradio_swig_py_general-generate-guile-stamp
+
+$(DEPDIR)/gnuradio_swig_py_general-generate-python-stamp:
 ## This rule will be called only by the first process issuing the
 ## above rule to succeed in creating the lock directory, after
 ## removing the actual stamp file in order to guarantee that MAKE will
@@ -461,7 +495,7 @@ $(DEPDIR)/gnuradio_swig_py_general-generate-stamp:
 ##
 	if $(SWIG) $(STD_SWIG_PYTHON_ARGS) $(gnuradio_swig_py_general_swig_args) \
 		-MD -MF $(DEPDIR)/gnuradio_swig_py_general.Std \
-		-module gnuradio_swig_py_general -o gnuradio_swig_py_general.cc $(WHAT); then \
+		-module gnuradio_swig_py_general -o gnuradio_swig_py_general-python.cc $(WHAT); then \
 	    if test $(host_os) = mingw32; then \
 		$(RM) $(DEPDIR)/gnuradio_swig_py_general.Sd; \
 		$(SED) 's,\\\\,/,g' < $(DEPDIR)/gnuradio_swig_py_general.Std \
@@ -508,7 +542,7 @@ $(DEPDIR)/gnuradio_swig_py_general-generate-stamp:
 ## executing this rule; allows other threads waiting on this process
 ## to continue.
 ##
-	touch $(DEPDIR)/gnuradio_swig_py_general-generate-stamp
+	touch $(DEPDIR)/gnuradio_swig_py_general-generate-python-stamp
 
 # KLUDGE: Force runtime include of a SWIG dependency file.  This is
 # not guaranteed to be portable, but will probably work.  If it works,
@@ -590,7 +624,7 @@ MOSTLYCLEANFILES += $(DEPDIR)/*.S*
 ## .h file is sometimes built, but not always ... so that one has to
 ## be added manually by the including Makefile.am .
 
-swig_built_sources += gnuradio_swig_py_gengen.py gnuradio_swig_py_gengen.cc
+swig_built_sources += gnuradio_swig_py_gengen.py gnuradio_swig_py_gengen-python.cc
 
 ## Various SWIG variables.  These can be overloaded in the including
 ## Makefile.am by setting the variable value there, then including
@@ -604,7 +638,7 @@ gnuradio_swig_py_gengen_pylib_LTLIBRARIES =		\
 	_gnuradio_swig_py_gengen.la
 
 _gnuradio_swig_py_gengen_la_SOURCES = 			\
-	gnuradio_swig_py_gengen.cc			\
+	gnuradio_swig_py_gengen-python.cc			\
 	$(gnuradio_swig_py_gengen_la_swig_sources)
 
 _gnuradio_swig_py_gengen_la_LIBADD =			\
@@ -625,7 +659,7 @@ gnuradio_swig_py_gengen_python_PYTHON =			\
 
 ## Entry rule for running SWIG
 
-gnuradio_swig_py_gengen.h gnuradio_swig_py_gengen.py gnuradio_swig_py_gengen.cc: gnuradio_swig_py_gengen.i
+gnuradio_swig_py_gengen.h gnuradio_swig_py_gengen.py gnuradio_swig_py_gengen-python.cc: gnuradio_swig_py_gengen.i
 ## This rule will get called only when MAKE decides that one of the
 ## targets needs to be created or re-created, because:
 ##
@@ -677,11 +711,12 @@ gnuradio_swig_py_gengen.h gnuradio_swig_py_gengen.py gnuradio_swig_py_gengen.cc:
 ##
 ## Remove the stamp associated with this filename.
 ##
-		rm -f $(DEPDIR)/gnuradio_swig_py_gengen-generate-stamp; \
+		rm -f $(DEPDIR)/gnuradio_swig_py_gengen-generate-*stamp; \
 ##
 ## Tell MAKE to run the rule for creating this stamp.
 ##
-		$(MAKE) $(AM_MAKEFLAGS) $(DEPDIR)/gnuradio_swig_py_gengen-generate-stamp WHAT=$<; \
+		$(MAKE) $(AM_MAKEFLAGS) $(DEPDIR)/gnuradio_swig_py_gengen-generate-python-stamp WHAT=$<; \
+		$(MAKE) $(AM_MAKEFLAGS) $(DEPDIR)/gnuradio_swig_py_gengen-generate-guile-stamp WHAT=$<; \
 ##
 ## Now that the .cc, .h, and .py files have been (re)created from the
 ## .i file, future checking of this rule during the same MAKE
@@ -705,11 +740,27 @@ gnuradio_swig_py_gengen.h gnuradio_swig_py_gengen.py gnuradio_swig_py_gengen.cc:
 ## Succeed if and only if the first process succeeded; exit this
 ## process returning the status of the generated stamp.
 ##
-		test -f $(DEPDIR)/gnuradio_swig_py_gengen-generate-stamp; \
+		test -f $(DEPDIR)/gnuradio_swig_py_gengen-generate-python-stamp; \
 		exit $$?; \
 	fi;
 
-$(DEPDIR)/gnuradio_swig_py_gengen-generate-stamp:
+$(DEPDIR)/gnuradio_swig_py_gengen-generate-guile-stamp:
+	if $(SWIG) $(STD_SWIG_GUILE_ARGS) $(gnuradio_swig_py_gengen_swig_args) \
+		-MD -MF $(DEPDIR)/gnuradio_swig_py_gengen.Std \
+		-module gnuradio_swig_py_gengen -o gnuradio_swig_py_gengen-guile.cc $(WHAT); then \
+	    if test $(host_os) = mingw32; then \
+		$(RM) $(DEPDIR)/gnuradio_swig_py_gengen.Sd; \
+		$(SED) 's,\\\\,/,g' < $(DEPDIR)/gnuradio_swig_py_gengen.Std \
+			> $(DEPDIR)/gnuradio_swig_py_gengen.Sd; \
+		$(RM) $(DEPDIR)/gnuradio_swig_py_gengen.Std; \
+		$(MV) $(DEPDIR)/gnuradio_swig_py_gengen.Sd $(DEPDIR)/gnuradio_swig_py_gengen.Std; \
+	    fi; \
+	else \
+	    $(RM) $(DEPDIR)/gnuradio_swig_py_gengen.S*; exit 1; \
+	fi;
+	touch $(DEPDIR)/gnuradio_swig_py_gengen-generate-guile-stamp
+
+$(DEPDIR)/gnuradio_swig_py_gengen-generate-python-stamp:
 ## This rule will be called only by the first process issuing the
 ## above rule to succeed in creating the lock directory, after
 ## removing the actual stamp file in order to guarantee that MAKE will
@@ -720,7 +771,7 @@ $(DEPDIR)/gnuradio_swig_py_gengen-generate-stamp:
 ##
 	if $(SWIG) $(STD_SWIG_PYTHON_ARGS) $(gnuradio_swig_py_gengen_swig_args) \
 		-MD -MF $(DEPDIR)/gnuradio_swig_py_gengen.Std \
-		-module gnuradio_swig_py_gengen -o gnuradio_swig_py_gengen.cc $(WHAT); then \
+		-module gnuradio_swig_py_gengen -o gnuradio_swig_py_gengen-python.cc $(WHAT); then \
 	    if test $(host_os) = mingw32; then \
 		$(RM) $(DEPDIR)/gnuradio_swig_py_gengen.Sd; \
 		$(SED) 's,\\\\,/,g' < $(DEPDIR)/gnuradio_swig_py_gengen.Std \
@@ -767,7 +818,7 @@ $(DEPDIR)/gnuradio_swig_py_gengen-generate-stamp:
 ## executing this rule; allows other threads waiting on this process
 ## to continue.
 ##
-	touch $(DEPDIR)/gnuradio_swig_py_gengen-generate-stamp
+	touch $(DEPDIR)/gnuradio_swig_py_gengen-generate-python-stamp
 
 # KLUDGE: Force runtime include of a SWIG dependency file.  This is
 # not guaranteed to be portable, but will probably work.  If it works,
@@ -849,7 +900,7 @@ MOSTLYCLEANFILES += $(DEPDIR)/*.S*
 ## .h file is sometimes built, but not always ... so that one has to
 ## be added manually by the including Makefile.am .
 
-swig_built_sources += gnuradio_swig_py_filter.py gnuradio_swig_py_filter.cc
+swig_built_sources += gnuradio_swig_py_filter.py gnuradio_swig_py_filter-python.cc
 
 ## Various SWIG variables.  These can be overloaded in the including
 ## Makefile.am by setting the variable value there, then including
@@ -863,7 +914,7 @@ gnuradio_swig_py_filter_pylib_LTLIBRARIES =		\
 	_gnuradio_swig_py_filter.la
 
 _gnuradio_swig_py_filter_la_SOURCES = 			\
-	gnuradio_swig_py_filter.cc			\
+	gnuradio_swig_py_filter-python.cc			\
 	$(gnuradio_swig_py_filter_la_swig_sources)
 
 _gnuradio_swig_py_filter_la_LIBADD =			\
@@ -884,7 +935,7 @@ gnuradio_swig_py_filter_python_PYTHON =			\
 
 ## Entry rule for running SWIG
 
-gnuradio_swig_py_filter.h gnuradio_swig_py_filter.py gnuradio_swig_py_filter.cc: gnuradio_swig_py_filter.i
+gnuradio_swig_py_filter.h gnuradio_swig_py_filter.py gnuradio_swig_py_filter-python.cc: gnuradio_swig_py_filter.i
 ## This rule will get called only when MAKE decides that one of the
 ## targets needs to be created or re-created, because:
 ##
@@ -936,11 +987,12 @@ gnuradio_swig_py_filter.h gnuradio_swig_py_filter.py gnuradio_swig_py_filter.cc:
 ##
 ## Remove the stamp associated with this filename.
 ##
-		rm -f $(DEPDIR)/gnuradio_swig_py_filter-generate-stamp; \
+		rm -f $(DEPDIR)/gnuradio_swig_py_filter-generate-*stamp; \
 ##
 ## Tell MAKE to run the rule for creating this stamp.
 ##
-		$(MAKE) $(AM_MAKEFLAGS) $(DEPDIR)/gnuradio_swig_py_filter-generate-stamp WHAT=$<; \
+		$(MAKE) $(AM_MAKEFLAGS) $(DEPDIR)/gnuradio_swig_py_filter-generate-python-stamp WHAT=$<; \
+		$(MAKE) $(AM_MAKEFLAGS) $(DEPDIR)/gnuradio_swig_py_filter-generate-guile-stamp WHAT=$<; \
 ##
 ## Now that the .cc, .h, and .py files have been (re)created from the
 ## .i file, future checking of this rule during the same MAKE
@@ -964,11 +1016,27 @@ gnuradio_swig_py_filter.h gnuradio_swig_py_filter.py gnuradio_swig_py_filter.cc:
 ## Succeed if and only if the first process succeeded; exit this
 ## process returning the status of the generated stamp.
 ##
-		test -f $(DEPDIR)/gnuradio_swig_py_filter-generate-stamp; \
+		test -f $(DEPDIR)/gnuradio_swig_py_filter-generate-python-stamp; \
 		exit $$?; \
 	fi;
 
-$(DEPDIR)/gnuradio_swig_py_filter-generate-stamp:
+$(DEPDIR)/gnuradio_swig_py_filter-generate-guile-stamp:
+	if $(SWIG) $(STD_SWIG_GUILE_ARGS) $(gnuradio_swig_py_filter_swig_args) \
+		-MD -MF $(DEPDIR)/gnuradio_swig_py_filter.Std \
+		-module gnuradio_swig_py_filter -o gnuradio_swig_py_filter-guile.cc $(WHAT); then \
+	    if test $(host_os) = mingw32; then \
+		$(RM) $(DEPDIR)/gnuradio_swig_py_filter.Sd; \
+		$(SED) 's,\\\\,/,g' < $(DEPDIR)/gnuradio_swig_py_filter.Std \
+			> $(DEPDIR)/gnuradio_swig_py_filter.Sd; \
+		$(RM) $(DEPDIR)/gnuradio_swig_py_filter.Std; \
+		$(MV) $(DEPDIR)/gnuradio_swig_py_filter.Sd $(DEPDIR)/gnuradio_swig_py_filter.Std; \
+	    fi; \
+	else \
+	    $(RM) $(DEPDIR)/gnuradio_swig_py_filter.S*; exit 1; \
+	fi;
+	touch $(DEPDIR)/gnuradio_swig_py_filter-generate-guile-stamp
+
+$(DEPDIR)/gnuradio_swig_py_filter-generate-python-stamp:
 ## This rule will be called only by the first process issuing the
 ## above rule to succeed in creating the lock directory, after
 ## removing the actual stamp file in order to guarantee that MAKE will
@@ -979,7 +1047,7 @@ $(DEPDIR)/gnuradio_swig_py_filter-generate-stamp:
 ##
 	if $(SWIG) $(STD_SWIG_PYTHON_ARGS) $(gnuradio_swig_py_filter_swig_args) \
 		-MD -MF $(DEPDIR)/gnuradio_swig_py_filter.Std \
-		-module gnuradio_swig_py_filter -o gnuradio_swig_py_filter.cc $(WHAT); then \
+		-module gnuradio_swig_py_filter -o gnuradio_swig_py_filter-python.cc $(WHAT); then \
 	    if test $(host_os) = mingw32; then \
 		$(RM) $(DEPDIR)/gnuradio_swig_py_filter.Sd; \
 		$(SED) 's,\\\\,/,g' < $(DEPDIR)/gnuradio_swig_py_filter.Std \
@@ -1026,7 +1094,7 @@ $(DEPDIR)/gnuradio_swig_py_filter-generate-stamp:
 ## executing this rule; allows other threads waiting on this process
 ## to continue.
 ##
-	touch $(DEPDIR)/gnuradio_swig_py_filter-generate-stamp
+	touch $(DEPDIR)/gnuradio_swig_py_filter-generate-python-stamp
 
 # KLUDGE: Force runtime include of a SWIG dependency file.  This is
 # not guaranteed to be portable, but will probably work.  If it works,
@@ -1108,7 +1176,7 @@ MOSTLYCLEANFILES += $(DEPDIR)/*.S*
 ## .h file is sometimes built, but not always ... so that one has to
 ## be added manually by the including Makefile.am .
 
-swig_built_sources += gnuradio_swig_py_io.py gnuradio_swig_py_io.cc
+swig_built_sources += gnuradio_swig_py_io.py gnuradio_swig_py_io-python.cc
 
 ## Various SWIG variables.  These can be overloaded in the including
 ## Makefile.am by setting the variable value there, then including
@@ -1122,7 +1190,7 @@ gnuradio_swig_py_io_pylib_LTLIBRARIES =		\
 	_gnuradio_swig_py_io.la
 
 _gnuradio_swig_py_io_la_SOURCES = 			\
-	gnuradio_swig_py_io.cc			\
+	gnuradio_swig_py_io-python.cc			\
 	$(gnuradio_swig_py_io_la_swig_sources)
 
 _gnuradio_swig_py_io_la_LIBADD =			\
@@ -1143,7 +1211,7 @@ gnuradio_swig_py_io_python_PYTHON =			\
 
 ## Entry rule for running SWIG
 
-gnuradio_swig_py_io.h gnuradio_swig_py_io.py gnuradio_swig_py_io.cc: gnuradio_swig_py_io.i
+gnuradio_swig_py_io.h gnuradio_swig_py_io.py gnuradio_swig_py_io-python.cc: gnuradio_swig_py_io.i
 ## This rule will get called only when MAKE decides that one of the
 ## targets needs to be created or re-created, because:
 ##
@@ -1195,11 +1263,12 @@ gnuradio_swig_py_io.h gnuradio_swig_py_io.py gnuradio_swig_py_io.cc: gnuradio_sw
 ##
 ## Remove the stamp associated with this filename.
 ##
-		rm -f $(DEPDIR)/gnuradio_swig_py_io-generate-stamp; \
+		rm -f $(DEPDIR)/gnuradio_swig_py_io-generate-*stamp; \
 ##
 ## Tell MAKE to run the rule for creating this stamp.
 ##
-		$(MAKE) $(AM_MAKEFLAGS) $(DEPDIR)/gnuradio_swig_py_io-generate-stamp WHAT=$<; \
+		$(MAKE) $(AM_MAKEFLAGS) $(DEPDIR)/gnuradio_swig_py_io-generate-python-stamp WHAT=$<; \
+		$(MAKE) $(AM_MAKEFLAGS) $(DEPDIR)/gnuradio_swig_py_io-generate-guile-stamp WHAT=$<; \
 ##
 ## Now that the .cc, .h, and .py files have been (re)created from the
 ## .i file, future checking of this rule during the same MAKE
@@ -1223,11 +1292,27 @@ gnuradio_swig_py_io.h gnuradio_swig_py_io.py gnuradio_swig_py_io.cc: gnuradio_sw
 ## Succeed if and only if the first process succeeded; exit this
 ## process returning the status of the generated stamp.
 ##
-		test -f $(DEPDIR)/gnuradio_swig_py_io-generate-stamp; \
+		test -f $(DEPDIR)/gnuradio_swig_py_io-generate-python-stamp; \
 		exit $$?; \
 	fi;
 
-$(DEPDIR)/gnuradio_swig_py_io-generate-stamp:
+$(DEPDIR)/gnuradio_swig_py_io-generate-guile-stamp:
+	if $(SWIG) $(STD_SWIG_GUILE_ARGS) $(gnuradio_swig_py_io_swig_args) \
+		-MD -MF $(DEPDIR)/gnuradio_swig_py_io.Std \
+		-module gnuradio_swig_py_io -o gnuradio_swig_py_io-guile.cc $(WHAT); then \
+	    if test $(host_os) = mingw32; then \
+		$(RM) $(DEPDIR)/gnuradio_swig_py_io.Sd; \
+		$(SED) 's,\\\\,/,g' < $(DEPDIR)/gnuradio_swig_py_io.Std \
+			> $(DEPDIR)/gnuradio_swig_py_io.Sd; \
+		$(RM) $(DEPDIR)/gnuradio_swig_py_io.Std; \
+		$(MV) $(DEPDIR)/gnuradio_swig_py_io.Sd $(DEPDIR)/gnuradio_swig_py_io.Std; \
+	    fi; \
+	else \
+	    $(RM) $(DEPDIR)/gnuradio_swig_py_io.S*; exit 1; \
+	fi;
+	touch $(DEPDIR)/gnuradio_swig_py_io-generate-guile-stamp
+
+$(DEPDIR)/gnuradio_swig_py_io-generate-python-stamp:
 ## This rule will be called only by the first process issuing the
 ## above rule to succeed in creating the lock directory, after
 ## removing the actual stamp file in order to guarantee that MAKE will
@@ -1238,7 +1323,7 @@ $(DEPDIR)/gnuradio_swig_py_io-generate-stamp:
 ##
 	if $(SWIG) $(STD_SWIG_PYTHON_ARGS) $(gnuradio_swig_py_io_swig_args) \
 		-MD -MF $(DEPDIR)/gnuradio_swig_py_io.Std \
-		-module gnuradio_swig_py_io -o gnuradio_swig_py_io.cc $(WHAT); then \
+		-module gnuradio_swig_py_io -o gnuradio_swig_py_io-python.cc $(WHAT); then \
 	    if test $(host_os) = mingw32; then \
 		$(RM) $(DEPDIR)/gnuradio_swig_py_io.Sd; \
 		$(SED) 's,\\\\,/,g' < $(DEPDIR)/gnuradio_swig_py_io.Std \
@@ -1285,7 +1370,7 @@ $(DEPDIR)/gnuradio_swig_py_io-generate-stamp:
 ## executing this rule; allows other threads waiting on this process
 ## to continue.
 ##
-	touch $(DEPDIR)/gnuradio_swig_py_io-generate-stamp
+	touch $(DEPDIR)/gnuradio_swig_py_io-generate-python-stamp
 
 # KLUDGE: Force runtime include of a SWIG dependency file.  This is
 # not guaranteed to be portable, but will probably work.  If it works,
@@ -1367,7 +1452,7 @@ MOSTLYCLEANFILES += $(DEPDIR)/*.S*
 ## .h file is sometimes built, but not always ... so that one has to
 ## be added manually by the including Makefile.am .
 
-swig_built_sources += gnuradio_swig_py_hier.py gnuradio_swig_py_hier.cc
+swig_built_sources += gnuradio_swig_py_hier.py gnuradio_swig_py_hier-python.cc
 
 ## Various SWIG variables.  These can be overloaded in the including
 ## Makefile.am by setting the variable value there, then including
@@ -1381,7 +1466,7 @@ gnuradio_swig_py_hier_pylib_LTLIBRARIES =		\
 	_gnuradio_swig_py_hier.la
 
 _gnuradio_swig_py_hier_la_SOURCES = 			\
-	gnuradio_swig_py_hier.cc			\
+	gnuradio_swig_py_hier-python.cc			\
 	$(gnuradio_swig_py_hier_la_swig_sources)
 
 _gnuradio_swig_py_hier_la_LIBADD =			\
@@ -1402,7 +1487,7 @@ gnuradio_swig_py_hier_python_PYTHON =			\
 
 ## Entry rule for running SWIG
 
-gnuradio_swig_py_hier.h gnuradio_swig_py_hier.py gnuradio_swig_py_hier.cc: gnuradio_swig_py_hier.i
+gnuradio_swig_py_hier.h gnuradio_swig_py_hier.py gnuradio_swig_py_hier-python.cc: gnuradio_swig_py_hier.i
 ## This rule will get called only when MAKE decides that one of the
 ## targets needs to be created or re-created, because:
 ##
@@ -1454,11 +1539,12 @@ gnuradio_swig_py_hier.h gnuradio_swig_py_hier.py gnuradio_swig_py_hier.cc: gnura
 ##
 ## Remove the stamp associated with this filename.
 ##
-		rm -f $(DEPDIR)/gnuradio_swig_py_hier-generate-stamp; \
+		rm -f $(DEPDIR)/gnuradio_swig_py_hier-generate-*stamp; \
 ##
 ## Tell MAKE to run the rule for creating this stamp.
 ##
-		$(MAKE) $(AM_MAKEFLAGS) $(DEPDIR)/gnuradio_swig_py_hier-generate-stamp WHAT=$<; \
+		$(MAKE) $(AM_MAKEFLAGS) $(DEPDIR)/gnuradio_swig_py_hier-generate-python-stamp WHAT=$<; \
+		$(MAKE) $(AM_MAKEFLAGS) $(DEPDIR)/gnuradio_swig_py_hier-generate-guile-stamp WHAT=$<; \
 ##
 ## Now that the .cc, .h, and .py files have been (re)created from the
 ## .i file, future checking of this rule during the same MAKE
@@ -1482,11 +1568,27 @@ gnuradio_swig_py_hier.h gnuradio_swig_py_hier.py gnuradio_swig_py_hier.cc: gnura
 ## Succeed if and only if the first process succeeded; exit this
 ## process returning the status of the generated stamp.
 ##
-		test -f $(DEPDIR)/gnuradio_swig_py_hier-generate-stamp; \
+		test -f $(DEPDIR)/gnuradio_swig_py_hier-generate-python-stamp; \
 		exit $$?; \
 	fi;
 
-$(DEPDIR)/gnuradio_swig_py_hier-generate-stamp:
+$(DEPDIR)/gnuradio_swig_py_hier-generate-guile-stamp:
+	if $(SWIG) $(STD_SWIG_GUILE_ARGS) $(gnuradio_swig_py_hier_swig_args) \
+		-MD -MF $(DEPDIR)/gnuradio_swig_py_hier.Std \
+		-module gnuradio_swig_py_hier -o gnuradio_swig_py_hier-guile.cc $(WHAT); then \
+	    if test $(host_os) = mingw32; then \
+		$(RM) $(DEPDIR)/gnuradio_swig_py_hier.Sd; \
+		$(SED) 's,\\\\,/,g' < $(DEPDIR)/gnuradio_swig_py_hier.Std \
+			> $(DEPDIR)/gnuradio_swig_py_hier.Sd; \
+		$(RM) $(DEPDIR)/gnuradio_swig_py_hier.Std; \
+		$(MV) $(DEPDIR)/gnuradio_swig_py_hier.Sd $(DEPDIR)/gnuradio_swig_py_hier.Std; \
+	    fi; \
+	else \
+	    $(RM) $(DEPDIR)/gnuradio_swig_py_hier.S*; exit 1; \
+	fi;
+	touch $(DEPDIR)/gnuradio_swig_py_hier-generate-guile-stamp
+
+$(DEPDIR)/gnuradio_swig_py_hier-generate-python-stamp:
 ## This rule will be called only by the first process issuing the
 ## above rule to succeed in creating the lock directory, after
 ## removing the actual stamp file in order to guarantee that MAKE will
@@ -1497,7 +1599,7 @@ $(DEPDIR)/gnuradio_swig_py_hier-generate-stamp:
 ##
 	if $(SWIG) $(STD_SWIG_PYTHON_ARGS) $(gnuradio_swig_py_hier_swig_args) \
 		-MD -MF $(DEPDIR)/gnuradio_swig_py_hier.Std \
-		-module gnuradio_swig_py_hier -o gnuradio_swig_py_hier.cc $(WHAT); then \
+		-module gnuradio_swig_py_hier -o gnuradio_swig_py_hier-python.cc $(WHAT); then \
 	    if test $(host_os) = mingw32; then \
 		$(RM) $(DEPDIR)/gnuradio_swig_py_hier.Sd; \
 		$(SED) 's,\\\\,/,g' < $(DEPDIR)/gnuradio_swig_py_hier.Std \
@@ -1544,7 +1646,7 @@ $(DEPDIR)/gnuradio_swig_py_hier-generate-stamp:
 ## executing this rule; allows other threads waiting on this process
 ## to continue.
 ##
-	touch $(DEPDIR)/gnuradio_swig_py_hier-generate-stamp
+	touch $(DEPDIR)/gnuradio_swig_py_hier-generate-python-stamp
 
 # KLUDGE: Force runtime include of a SWIG dependency file.  This is
 # not guaranteed to be portable, but will probably work.  If it works,
diff --git a/gr-atsc/src/lib/Makefile.swig.gen b/gr-atsc/src/lib/Makefile.swig.gen
index e52d65335..0fc085b60 100644
--- a/gr-atsc/src/lib/Makefile.swig.gen
+++ b/gr-atsc/src/lib/Makefile.swig.gen
@@ -72,7 +72,7 @@ MOSTLYCLEANFILES += $(DEPDIR)/*.S*
 ## .h file is sometimes built, but not always ... so that one has to
 ## be added manually by the including Makefile.am .
 
-swig_built_sources += atsc.py atsc.cc
+swig_built_sources += atsc.py atsc-python.cc
 
 ## Various SWIG variables.  These can be overloaded in the including
 ## Makefile.am by setting the variable value there, then including
@@ -86,7 +86,7 @@ atsc_pylib_LTLIBRARIES =		\
 	_atsc.la
 
 _atsc_la_SOURCES = 			\
-	atsc.cc			\
+	atsc-python.cc			\
 	$(atsc_la_swig_sources)
 
 _atsc_la_LIBADD =			\
@@ -107,7 +107,7 @@ atsc_python_PYTHON =			\
 
 ## Entry rule for running SWIG
 
-atsc.h atsc.py atsc.cc: atsc.i
+atsc.h atsc.py atsc-python.cc: atsc.i
 ## This rule will get called only when MAKE decides that one of the
 ## targets needs to be created or re-created, because:
 ##
@@ -159,11 +159,12 @@ atsc.h atsc.py atsc.cc: atsc.i
 ##
 ## Remove the stamp associated with this filename.
 ##
-		rm -f $(DEPDIR)/atsc-generate-stamp; \
+		rm -f $(DEPDIR)/atsc-generate-*stamp; \
 ##
 ## Tell MAKE to run the rule for creating this stamp.
 ##
-		$(MAKE) $(AM_MAKEFLAGS) $(DEPDIR)/atsc-generate-stamp WHAT=$<; \
+		$(MAKE) $(AM_MAKEFLAGS) $(DEPDIR)/atsc-generate-python-stamp WHAT=$<; \
+		$(MAKE) $(AM_MAKEFLAGS) $(DEPDIR)/atsc-generate-guile-stamp WHAT=$<; \
 ##
 ## Now that the .cc, .h, and .py files have been (re)created from the
 ## .i file, future checking of this rule during the same MAKE
@@ -187,11 +188,27 @@ atsc.h atsc.py atsc.cc: atsc.i
 ## Succeed if and only if the first process succeeded; exit this
 ## process returning the status of the generated stamp.
 ##
-		test -f $(DEPDIR)/atsc-generate-stamp; \
+		test -f $(DEPDIR)/atsc-generate-python-stamp; \
 		exit $$?; \
 	fi;
 
-$(DEPDIR)/atsc-generate-stamp:
+$(DEPDIR)/atsc-generate-guile-stamp:
+	if $(SWIG) $(STD_SWIG_GUILE_ARGS) $(atsc_swig_args) \
+		-MD -MF $(DEPDIR)/atsc.Std \
+		-module atsc -o atsc-guile.cc $(WHAT); then \
+	    if test $(host_os) = mingw32; then \
+		$(RM) $(DEPDIR)/atsc.Sd; \
+		$(SED) 's,\\\\,/,g' < $(DEPDIR)/atsc.Std \
+			> $(DEPDIR)/atsc.Sd; \
+		$(RM) $(DEPDIR)/atsc.Std; \
+		$(MV) $(DEPDIR)/atsc.Sd $(DEPDIR)/atsc.Std; \
+	    fi; \
+	else \
+	    $(RM) $(DEPDIR)/atsc.S*; exit 1; \
+	fi;
+	touch $(DEPDIR)/atsc-generate-guile-stamp
+
+$(DEPDIR)/atsc-generate-python-stamp:
 ## This rule will be called only by the first process issuing the
 ## above rule to succeed in creating the lock directory, after
 ## removing the actual stamp file in order to guarantee that MAKE will
@@ -202,7 +219,7 @@ $(DEPDIR)/atsc-generate-stamp:
 ##
 	if $(SWIG) $(STD_SWIG_PYTHON_ARGS) $(atsc_swig_args) \
 		-MD -MF $(DEPDIR)/atsc.Std \
-		-module atsc -o atsc.cc $(WHAT); then \
+		-module atsc -o atsc-python.cc $(WHAT); then \
 	    if test $(host_os) = mingw32; then \
 		$(RM) $(DEPDIR)/atsc.Sd; \
 		$(SED) 's,\\\\,/,g' < $(DEPDIR)/atsc.Std \
@@ -249,7 +266,7 @@ $(DEPDIR)/atsc-generate-stamp:
 ## executing this rule; allows other threads waiting on this process
 ## to continue.
 ##
-	touch $(DEPDIR)/atsc-generate-stamp
+	touch $(DEPDIR)/atsc-generate-python-stamp
 
 # KLUDGE: Force runtime include of a SWIG dependency file.  This is
 # not guaranteed to be portable, but will probably work.  If it works,
diff --git a/gr-audio-alsa/src/Makefile.swig.gen b/gr-audio-alsa/src/Makefile.swig.gen
index 3a84a02b4..16342ac27 100644
--- a/gr-audio-alsa/src/Makefile.swig.gen
+++ b/gr-audio-alsa/src/Makefile.swig.gen
@@ -72,7 +72,7 @@ MOSTLYCLEANFILES += $(DEPDIR)/*.S*
 ## .h file is sometimes built, but not always ... so that one has to
 ## be added manually by the including Makefile.am .
 
-swig_built_sources += audio_alsa.py audio_alsa.cc
+swig_built_sources += audio_alsa.py audio_alsa-python.cc
 
 ## Various SWIG variables.  These can be overloaded in the including
 ## Makefile.am by setting the variable value there, then including
@@ -86,7 +86,7 @@ audio_alsa_pylib_LTLIBRARIES =		\
 	_audio_alsa.la
 
 _audio_alsa_la_SOURCES = 			\
-	audio_alsa.cc			\
+	audio_alsa-python.cc			\
 	$(audio_alsa_la_swig_sources)
 
 _audio_alsa_la_LIBADD =			\
@@ -107,7 +107,7 @@ audio_alsa_python_PYTHON =			\
 
 ## Entry rule for running SWIG
 
-audio_alsa.h audio_alsa.py audio_alsa.cc: audio_alsa.i
+audio_alsa.h audio_alsa.py audio_alsa-python.cc: audio_alsa.i
 ## This rule will get called only when MAKE decides that one of the
 ## targets needs to be created or re-created, because:
 ##
@@ -159,11 +159,12 @@ audio_alsa.h audio_alsa.py audio_alsa.cc: audio_alsa.i
 ##
 ## Remove the stamp associated with this filename.
 ##
-		rm -f $(DEPDIR)/audio_alsa-generate-stamp; \
+		rm -f $(DEPDIR)/audio_alsa-generate-*stamp; \
 ##
 ## Tell MAKE to run the rule for creating this stamp.
 ##
-		$(MAKE) $(AM_MAKEFLAGS) $(DEPDIR)/audio_alsa-generate-stamp WHAT=$<; \
+		$(MAKE) $(AM_MAKEFLAGS) $(DEPDIR)/audio_alsa-generate-python-stamp WHAT=$<; \
+		$(MAKE) $(AM_MAKEFLAGS) $(DEPDIR)/audio_alsa-generate-guile-stamp WHAT=$<; \
 ##
 ## Now that the .cc, .h, and .py files have been (re)created from the
 ## .i file, future checking of this rule during the same MAKE
@@ -187,11 +188,27 @@ audio_alsa.h audio_alsa.py audio_alsa.cc: audio_alsa.i
 ## Succeed if and only if the first process succeeded; exit this
 ## process returning the status of the generated stamp.
 ##
-		test -f $(DEPDIR)/audio_alsa-generate-stamp; \
+		test -f $(DEPDIR)/audio_alsa-generate-python-stamp; \
 		exit $$?; \
 	fi;
 
-$(DEPDIR)/audio_alsa-generate-stamp:
+$(DEPDIR)/audio_alsa-generate-guile-stamp:
+	if $(SWIG) $(STD_SWIG_GUILE_ARGS) $(audio_alsa_swig_args) \
+		-MD -MF $(DEPDIR)/audio_alsa.Std \
+		-module audio_alsa -o audio_alsa-guile.cc $(WHAT); then \
+	    if test $(host_os) = mingw32; then \
+		$(RM) $(DEPDIR)/audio_alsa.Sd; \
+		$(SED) 's,\\\\,/,g' < $(DEPDIR)/audio_alsa.Std \
+			> $(DEPDIR)/audio_alsa.Sd; \
+		$(RM) $(DEPDIR)/audio_alsa.Std; \
+		$(MV) $(DEPDIR)/audio_alsa.Sd $(DEPDIR)/audio_alsa.Std; \
+	    fi; \
+	else \
+	    $(RM) $(DEPDIR)/audio_alsa.S*; exit 1; \
+	fi;
+	touch $(DEPDIR)/audio_alsa-generate-guile-stamp
+
+$(DEPDIR)/audio_alsa-generate-python-stamp:
 ## This rule will be called only by the first process issuing the
 ## above rule to succeed in creating the lock directory, after
 ## removing the actual stamp file in order to guarantee that MAKE will
@@ -202,7 +219,7 @@ $(DEPDIR)/audio_alsa-generate-stamp:
 ##
 	if $(SWIG) $(STD_SWIG_PYTHON_ARGS) $(audio_alsa_swig_args) \
 		-MD -MF $(DEPDIR)/audio_alsa.Std \
-		-module audio_alsa -o audio_alsa.cc $(WHAT); then \
+		-module audio_alsa -o audio_alsa-python.cc $(WHAT); then \
 	    if test $(host_os) = mingw32; then \
 		$(RM) $(DEPDIR)/audio_alsa.Sd; \
 		$(SED) 's,\\\\,/,g' < $(DEPDIR)/audio_alsa.Std \
@@ -249,7 +266,7 @@ $(DEPDIR)/audio_alsa-generate-stamp:
 ## executing this rule; allows other threads waiting on this process
 ## to continue.
 ##
-	touch $(DEPDIR)/audio_alsa-generate-stamp
+	touch $(DEPDIR)/audio_alsa-generate-python-stamp
 
 # KLUDGE: Force runtime include of a SWIG dependency file.  This is
 # not guaranteed to be portable, but will probably work.  If it works,
diff --git a/gr-audio-oss/src/Makefile.swig.gen b/gr-audio-oss/src/Makefile.swig.gen
index 6fce10c11..191983262 100644
--- a/gr-audio-oss/src/Makefile.swig.gen
+++ b/gr-audio-oss/src/Makefile.swig.gen
@@ -72,7 +72,7 @@ MOSTLYCLEANFILES += $(DEPDIR)/*.S*
 ## .h file is sometimes built, but not always ... so that one has to
 ## be added manually by the including Makefile.am .
 
-swig_built_sources += audio_oss.py audio_oss.cc
+swig_built_sources += audio_oss.py audio_oss-python.cc
 
 ## Various SWIG variables.  These can be overloaded in the including
 ## Makefile.am by setting the variable value there, then including
@@ -86,7 +86,7 @@ audio_oss_pylib_LTLIBRARIES =		\
 	_audio_oss.la
 
 _audio_oss_la_SOURCES = 			\
-	audio_oss.cc			\
+	audio_oss-python.cc			\
 	$(audio_oss_la_swig_sources)
 
 _audio_oss_la_LIBADD =			\
@@ -107,7 +107,7 @@ audio_oss_python_PYTHON =			\
 
 ## Entry rule for running SWIG
 
-audio_oss.h audio_oss.py audio_oss.cc: audio_oss.i
+audio_oss.h audio_oss.py audio_oss-python.cc: audio_oss.i
 ## This rule will get called only when MAKE decides that one of the
 ## targets needs to be created or re-created, because:
 ##
@@ -159,11 +159,12 @@ audio_oss.h audio_oss.py audio_oss.cc: audio_oss.i
 ##
 ## Remove the stamp associated with this filename.
 ##
-		rm -f $(DEPDIR)/audio_oss-generate-stamp; \
+		rm -f $(DEPDIR)/audio_oss-generate-*stamp; \
 ##
 ## Tell MAKE to run the rule for creating this stamp.
 ##
-		$(MAKE) $(AM_MAKEFLAGS) $(DEPDIR)/audio_oss-generate-stamp WHAT=$<; \
+		$(MAKE) $(AM_MAKEFLAGS) $(DEPDIR)/audio_oss-generate-python-stamp WHAT=$<; \
+		$(MAKE) $(AM_MAKEFLAGS) $(DEPDIR)/audio_oss-generate-guile-stamp WHAT=$<; \
 ##
 ## Now that the .cc, .h, and .py files have been (re)created from the
 ## .i file, future checking of this rule during the same MAKE
@@ -187,11 +188,27 @@ audio_oss.h audio_oss.py audio_oss.cc: audio_oss.i
 ## Succeed if and only if the first process succeeded; exit this
 ## process returning the status of the generated stamp.
 ##
-		test -f $(DEPDIR)/audio_oss-generate-stamp; \
+		test -f $(DEPDIR)/audio_oss-generate-python-stamp; \
 		exit $$?; \
 	fi;
 
-$(DEPDIR)/audio_oss-generate-stamp:
+$(DEPDIR)/audio_oss-generate-guile-stamp:
+	if $(SWIG) $(STD_SWIG_GUILE_ARGS) $(audio_oss_swig_args) \
+		-MD -MF $(DEPDIR)/audio_oss.Std \
+		-module audio_oss -o audio_oss-guile.cc $(WHAT); then \
+	    if test $(host_os) = mingw32; then \
+		$(RM) $(DEPDIR)/audio_oss.Sd; \
+		$(SED) 's,\\\\,/,g' < $(DEPDIR)/audio_oss.Std \
+			> $(DEPDIR)/audio_oss.Sd; \
+		$(RM) $(DEPDIR)/audio_oss.Std; \
+		$(MV) $(DEPDIR)/audio_oss.Sd $(DEPDIR)/audio_oss.Std; \
+	    fi; \
+	else \
+	    $(RM) $(DEPDIR)/audio_oss.S*; exit 1; \
+	fi;
+	touch $(DEPDIR)/audio_oss-generate-guile-stamp
+
+$(DEPDIR)/audio_oss-generate-python-stamp:
 ## This rule will be called only by the first process issuing the
 ## above rule to succeed in creating the lock directory, after
 ## removing the actual stamp file in order to guarantee that MAKE will
@@ -202,7 +219,7 @@ $(DEPDIR)/audio_oss-generate-stamp:
 ##
 	if $(SWIG) $(STD_SWIG_PYTHON_ARGS) $(audio_oss_swig_args) \
 		-MD -MF $(DEPDIR)/audio_oss.Std \
-		-module audio_oss -o audio_oss.cc $(WHAT); then \
+		-module audio_oss -o audio_oss-python.cc $(WHAT); then \
 	    if test $(host_os) = mingw32; then \
 		$(RM) $(DEPDIR)/audio_oss.Sd; \
 		$(SED) 's,\\\\,/,g' < $(DEPDIR)/audio_oss.Std \
@@ -249,7 +266,7 @@ $(DEPDIR)/audio_oss-generate-stamp:
 ## executing this rule; allows other threads waiting on this process
 ## to continue.
 ##
-	touch $(DEPDIR)/audio_oss-generate-stamp
+	touch $(DEPDIR)/audio_oss-generate-python-stamp
 
 # KLUDGE: Force runtime include of a SWIG dependency file.  This is
 # not guaranteed to be portable, but will probably work.  If it works,
diff --git a/gr-cvsd-vocoder/src/lib/Makefile.swig.gen b/gr-cvsd-vocoder/src/lib/Makefile.swig.gen
index e192abc70..e14b0b3f4 100644
--- a/gr-cvsd-vocoder/src/lib/Makefile.swig.gen
+++ b/gr-cvsd-vocoder/src/lib/Makefile.swig.gen
@@ -72,7 +72,7 @@ MOSTLYCLEANFILES += $(DEPDIR)/*.S*
 ## .h file is sometimes built, but not always ... so that one has to
 ## be added manually by the including Makefile.am .
 
-swig_built_sources += cvsd_vocoder.py cvsd_vocoder.cc
+swig_built_sources += cvsd_vocoder.py cvsd_vocoder-python.cc
 
 ## Various SWIG variables.  These can be overloaded in the including
 ## Makefile.am by setting the variable value there, then including
@@ -86,7 +86,7 @@ cvsd_vocoder_pylib_LTLIBRARIES =		\
 	_cvsd_vocoder.la
 
 _cvsd_vocoder_la_SOURCES = 			\
-	cvsd_vocoder.cc			\
+	cvsd_vocoder-python.cc			\
 	$(cvsd_vocoder_la_swig_sources)
 
 _cvsd_vocoder_la_LIBADD =			\
@@ -107,7 +107,7 @@ cvsd_vocoder_python_PYTHON =			\
 
 ## Entry rule for running SWIG
 
-cvsd_vocoder.h cvsd_vocoder.py cvsd_vocoder.cc: cvsd_vocoder.i
+cvsd_vocoder.h cvsd_vocoder.py cvsd_vocoder-python.cc: cvsd_vocoder.i
 ## This rule will get called only when MAKE decides that one of the
 ## targets needs to be created or re-created, because:
 ##
@@ -159,11 +159,12 @@ cvsd_vocoder.h cvsd_vocoder.py cvsd_vocoder.cc: cvsd_vocoder.i
 ##
 ## Remove the stamp associated with this filename.
 ##
-		rm -f $(DEPDIR)/cvsd_vocoder-generate-stamp; \
+		rm -f $(DEPDIR)/cvsd_vocoder-generate-*stamp; \
 ##
 ## Tell MAKE to run the rule for creating this stamp.
 ##
-		$(MAKE) $(AM_MAKEFLAGS) $(DEPDIR)/cvsd_vocoder-generate-stamp WHAT=$<; \
+		$(MAKE) $(AM_MAKEFLAGS) $(DEPDIR)/cvsd_vocoder-generate-python-stamp WHAT=$<; \
+		$(MAKE) $(AM_MAKEFLAGS) $(DEPDIR)/cvsd_vocoder-generate-guile-stamp WHAT=$<; \
 ##
 ## Now that the .cc, .h, and .py files have been (re)created from the
 ## .i file, future checking of this rule during the same MAKE
@@ -187,11 +188,27 @@ cvsd_vocoder.h cvsd_vocoder.py cvsd_vocoder.cc: cvsd_vocoder.i
 ## Succeed if and only if the first process succeeded; exit this
 ## process returning the status of the generated stamp.
 ##
-		test -f $(DEPDIR)/cvsd_vocoder-generate-stamp; \
+		test -f $(DEPDIR)/cvsd_vocoder-generate-python-stamp; \
 		exit $$?; \
 	fi;
 
-$(DEPDIR)/cvsd_vocoder-generate-stamp:
+$(DEPDIR)/cvsd_vocoder-generate-guile-stamp:
+	if $(SWIG) $(STD_SWIG_GUILE_ARGS) $(cvsd_vocoder_swig_args) \
+		-MD -MF $(DEPDIR)/cvsd_vocoder.Std \
+		-module cvsd_vocoder -o cvsd_vocoder-guile.cc $(WHAT); then \
+	    if test $(host_os) = mingw32; then \
+		$(RM) $(DEPDIR)/cvsd_vocoder.Sd; \
+		$(SED) 's,\\\\,/,g' < $(DEPDIR)/cvsd_vocoder.Std \
+			> $(DEPDIR)/cvsd_vocoder.Sd; \
+		$(RM) $(DEPDIR)/cvsd_vocoder.Std; \
+		$(MV) $(DEPDIR)/cvsd_vocoder.Sd $(DEPDIR)/cvsd_vocoder.Std; \
+	    fi; \
+	else \
+	    $(RM) $(DEPDIR)/cvsd_vocoder.S*; exit 1; \
+	fi;
+	touch $(DEPDIR)/cvsd_vocoder-generate-guile-stamp
+
+$(DEPDIR)/cvsd_vocoder-generate-python-stamp:
 ## This rule will be called only by the first process issuing the
 ## above rule to succeed in creating the lock directory, after
 ## removing the actual stamp file in order to guarantee that MAKE will
@@ -202,7 +219,7 @@ $(DEPDIR)/cvsd_vocoder-generate-stamp:
 ##
 	if $(SWIG) $(STD_SWIG_PYTHON_ARGS) $(cvsd_vocoder_swig_args) \
 		-MD -MF $(DEPDIR)/cvsd_vocoder.Std \
-		-module cvsd_vocoder -o cvsd_vocoder.cc $(WHAT); then \
+		-module cvsd_vocoder -o cvsd_vocoder-python.cc $(WHAT); then \
 	    if test $(host_os) = mingw32; then \
 		$(RM) $(DEPDIR)/cvsd_vocoder.Sd; \
 		$(SED) 's,\\\\,/,g' < $(DEPDIR)/cvsd_vocoder.Std \
@@ -249,7 +266,7 @@ $(DEPDIR)/cvsd_vocoder-generate-stamp:
 ## executing this rule; allows other threads waiting on this process
 ## to continue.
 ##
-	touch $(DEPDIR)/cvsd_vocoder-generate-stamp
+	touch $(DEPDIR)/cvsd_vocoder-generate-python-stamp
 
 # KLUDGE: Force runtime include of a SWIG dependency file.  This is
 # not guaranteed to be portable, but will probably work.  If it works,
diff --git a/gr-gsm-fr-vocoder/src/lib/Makefile.swig.gen b/gr-gsm-fr-vocoder/src/lib/Makefile.swig.gen
index 5446f346a..3dcb93571 100644
--- a/gr-gsm-fr-vocoder/src/lib/Makefile.swig.gen
+++ b/gr-gsm-fr-vocoder/src/lib/Makefile.swig.gen
@@ -72,7 +72,7 @@ MOSTLYCLEANFILES += $(DEPDIR)/*.S*
 ## .h file is sometimes built, but not always ... so that one has to
 ## be added manually by the including Makefile.am .
 
-swig_built_sources += gsm_full_rate.py gsm_full_rate.cc
+swig_built_sources += gsm_full_rate.py gsm_full_rate-python.cc
 
 ## Various SWIG variables.  These can be overloaded in the including
 ## Makefile.am by setting the variable value there, then including
@@ -86,7 +86,7 @@ gsm_full_rate_pylib_LTLIBRARIES =		\
 	_gsm_full_rate.la
 
 _gsm_full_rate_la_SOURCES = 			\
-	gsm_full_rate.cc			\
+	gsm_full_rate-python.cc			\
 	$(gsm_full_rate_la_swig_sources)
 
 _gsm_full_rate_la_LIBADD =			\
@@ -107,7 +107,7 @@ gsm_full_rate_python_PYTHON =			\
 
 ## Entry rule for running SWIG
 
-gsm_full_rate.h gsm_full_rate.py gsm_full_rate.cc: gsm_full_rate.i
+gsm_full_rate.h gsm_full_rate.py gsm_full_rate-python.cc: gsm_full_rate.i
 ## This rule will get called only when MAKE decides that one of the
 ## targets needs to be created or re-created, because:
 ##
@@ -159,11 +159,12 @@ gsm_full_rate.h gsm_full_rate.py gsm_full_rate.cc: gsm_full_rate.i
 ##
 ## Remove the stamp associated with this filename.
 ##
-		rm -f $(DEPDIR)/gsm_full_rate-generate-stamp; \
+		rm -f $(DEPDIR)/gsm_full_rate-generate-*stamp; \
 ##
 ## Tell MAKE to run the rule for creating this stamp.
 ##
-		$(MAKE) $(AM_MAKEFLAGS) $(DEPDIR)/gsm_full_rate-generate-stamp WHAT=$<; \
+		$(MAKE) $(AM_MAKEFLAGS) $(DEPDIR)/gsm_full_rate-generate-python-stamp WHAT=$<; \
+		$(MAKE) $(AM_MAKEFLAGS) $(DEPDIR)/gsm_full_rate-generate-guile-stamp WHAT=$<; \
 ##
 ## Now that the .cc, .h, and .py files have been (re)created from the
 ## .i file, future checking of this rule during the same MAKE
@@ -187,11 +188,27 @@ gsm_full_rate.h gsm_full_rate.py gsm_full_rate.cc: gsm_full_rate.i
 ## Succeed if and only if the first process succeeded; exit this
 ## process returning the status of the generated stamp.
 ##
-		test -f $(DEPDIR)/gsm_full_rate-generate-stamp; \
+		test -f $(DEPDIR)/gsm_full_rate-generate-python-stamp; \
 		exit $$?; \
 	fi;
 
-$(DEPDIR)/gsm_full_rate-generate-stamp:
+$(DEPDIR)/gsm_full_rate-generate-guile-stamp:
+	if $(SWIG) $(STD_SWIG_GUILE_ARGS) $(gsm_full_rate_swig_args) \
+		-MD -MF $(DEPDIR)/gsm_full_rate.Std \
+		-module gsm_full_rate -o gsm_full_rate-guile.cc $(WHAT); then \
+	    if test $(host_os) = mingw32; then \
+		$(RM) $(DEPDIR)/gsm_full_rate.Sd; \
+		$(SED) 's,\\\\,/,g' < $(DEPDIR)/gsm_full_rate.Std \
+			> $(DEPDIR)/gsm_full_rate.Sd; \
+		$(RM) $(DEPDIR)/gsm_full_rate.Std; \
+		$(MV) $(DEPDIR)/gsm_full_rate.Sd $(DEPDIR)/gsm_full_rate.Std; \
+	    fi; \
+	else \
+	    $(RM) $(DEPDIR)/gsm_full_rate.S*; exit 1; \
+	fi;
+	touch $(DEPDIR)/gsm_full_rate-generate-guile-stamp
+
+$(DEPDIR)/gsm_full_rate-generate-python-stamp:
 ## This rule will be called only by the first process issuing the
 ## above rule to succeed in creating the lock directory, after
 ## removing the actual stamp file in order to guarantee that MAKE will
@@ -202,7 +219,7 @@ $(DEPDIR)/gsm_full_rate-generate-stamp:
 ##
 	if $(SWIG) $(STD_SWIG_PYTHON_ARGS) $(gsm_full_rate_swig_args) \
 		-MD -MF $(DEPDIR)/gsm_full_rate.Std \
-		-module gsm_full_rate -o gsm_full_rate.cc $(WHAT); then \
+		-module gsm_full_rate -o gsm_full_rate-python.cc $(WHAT); then \
 	    if test $(host_os) = mingw32; then \
 		$(RM) $(DEPDIR)/gsm_full_rate.Sd; \
 		$(SED) 's,\\\\,/,g' < $(DEPDIR)/gsm_full_rate.Std \
@@ -249,7 +266,7 @@ $(DEPDIR)/gsm_full_rate-generate-stamp:
 ## executing this rule; allows other threads waiting on this process
 ## to continue.
 ##
-	touch $(DEPDIR)/gsm_full_rate-generate-stamp
+	touch $(DEPDIR)/gsm_full_rate-generate-python-stamp
 
 # KLUDGE: Force runtime include of a SWIG dependency file.  This is
 # not guaranteed to be portable, but will probably work.  If it works,
diff --git a/gr-msdd6000/src/Makefile.swig.gen b/gr-msdd6000/src/Makefile.swig.gen
index ced3979f7..0ae665129 100644
--- a/gr-msdd6000/src/Makefile.swig.gen
+++ b/gr-msdd6000/src/Makefile.swig.gen
@@ -33,21 +33,14 @@
 ## this has to be done in the including Makefile.am -before-
 ## Makefile.swig is included.
 
-
 msdd_pythondir_category ?= gnuradio/msdd
 msdd_pylibdir_category ?= $(msdd_pythondir_category)
 msdd_pythondir = $(pythondir)/$(msdd_pythondir_category)
 msdd_pylibdir = $(pyexecdir)/$(msdd_pylibdir_category)
 
-msdd_rs_pythondir_category ?= gnuradio/msdd_rs
-msdd_rs_pylibdir_category ?= $(msdd_rs_pythondir_category)
-msdd_rs_pythondir = $(pythondir)/$(msdd_rs_pythondir_category)
-msdd_rs_pylibdir = $(pyexecdir)/$(msdd_rs_pylibdir_category)
-
 ## SWIG headers are always installed into the same directory.
 
 msdd_swigincludedir = $(swigincludedir)
-msdd_rs_swigincludedir = $(swigincludedir)
 
 ## This is a template file for a "generated" Makefile addition (in
 ## this case, "Makefile.swig.gen").  By including the top-level
@@ -70,7 +63,6 @@ msdd_rs_swigincludedir = $(swigincludedir)
 ## the SWIG-generated files will be removed from the distribution.
 
 STAMPS += $(DEPDIR)/msdd-generate-*
-STAMPS += $(DEPDIR)/msdd_rs-generate-*
 
 ## Other cleaned files: dependency files generated by SWIG or this Makefile
 
@@ -80,40 +72,27 @@ MOSTLYCLEANFILES += $(DEPDIR)/*.S*
 ## .h file is sometimes built, but not always ... so that one has to
 ## be added manually by the including Makefile.am .
 
-swig_built_sources += msdd.py msdd_rs.py msdd.cc msdd_rs.cc
+swig_built_sources += msdd.py msdd-python.cc
 
 ## Various SWIG variables.  These can be overloaded in the including
 ## Makefile.am by setting the variable value there, then including
 ## Makefile.swig .
 
 msdd_swiginclude_HEADERS =		\
-	msdd.i				\
-	msdd_rs.i			\
+	msdd.i			\
 	$(msdd_swiginclude_headers)
 
 msdd_pylib_LTLIBRARIES =		\
 	_msdd.la
 
-msdd_rs_pylib_LTLIBRARIES =		\
-        _msdd_rs.la
-
 _msdd_la_SOURCES = 			\
-	msdd.cc				\
+	msdd-python.cc			\
 	$(msdd_la_swig_sources)
 
-_msdd_rs_la_SOURCES =          		\
-    msdd_rs.cc         			\
-    $(msdd_la_swig_sources)
-
-
 _msdd_la_LIBADD =			\
 	$(STD_SWIG_LA_LIB_ADD)		\
 	$(msdd_la_swig_libadd)
 
-_msdd_rs_la_LIBADD =           		\
-    $(STD_SWIG_LA_LIB_ADD)      	\
-    $(msdd_rs_la_swig_libadd)
-
 _msdd_la_LDFLAGS =			\
 	$(STD_SWIG_LA_LD_FLAGS)		\
 	$(msdd_la_swig_ldflags)
@@ -122,25 +101,13 @@ _msdd_la_CXXFLAGS =			\
 	$(STD_SWIG_CXX_FLAGS)		\
 	$(msdd_la_swig_cxxflags)
 
-_msdd_rs_la_LDFLAGS =          		\
-    $(STD_SWIG_LA_LD_FLAGS)     	\
-    $(msdd_rs_la_swig_ldflags)
-
-_msdd_rs_la_CXXFLAGS =         		\
-    $(STD_SWIG_CXX_FLAGS)       	\
-    $(msdd_rs_la_swig_cxxflags)
-
 msdd_python_PYTHON =			\
-	msdd.py				\
+	msdd.py			\
 	$(msdd_python)
 
-msdd_rs_python_PYTHON =		        \
-    msdd_rs.py         			\
-    $(msdd_rs_python)
-
 ## Entry rule for running SWIG
 
-msdd.h msdd.py msdd.cc: msdd.i
+msdd.h msdd.py msdd-python.cc: msdd.i
 ## This rule will get called only when MAKE decides that one of the
 ## targets needs to be created or re-created, because:
 ##
@@ -192,11 +159,12 @@ msdd.h msdd.py msdd.cc: msdd.i
 ##
 ## Remove the stamp associated with this filename.
 ##
-		rm -f $(DEPDIR)/msdd-generate-stamp; \
+		rm -f $(DEPDIR)/msdd-generate-*stamp; \
 ##
 ## Tell MAKE to run the rule for creating this stamp.
 ##
-		$(MAKE) $(AM_MAKEFLAGS) $(DEPDIR)/msdd-generate-stamp WHAT=$<; \
+		$(MAKE) $(AM_MAKEFLAGS) $(DEPDIR)/msdd-generate-python-stamp WHAT=$<; \
+		$(MAKE) $(AM_MAKEFLAGS) $(DEPDIR)/msdd-generate-guile-stamp WHAT=$<; \
 ##
 ## Now that the .cc, .h, and .py files have been (re)created from the
 ## .i file, future checking of this rule during the same MAKE
@@ -220,11 +188,27 @@ msdd.h msdd.py msdd.cc: msdd.i
 ## Succeed if and only if the first process succeeded; exit this
 ## process returning the status of the generated stamp.
 ##
-		test -f $(DEPDIR)/msdd-generate-stamp; \
+		test -f $(DEPDIR)/msdd-generate-python-stamp; \
 		exit $$?; \
 	fi;
 
-$(DEPDIR)/msdd-generate-stamp:
+$(DEPDIR)/msdd-generate-guile-stamp:
+	if $(SWIG) $(STD_SWIG_GUILE_ARGS) $(msdd_swig_args) \
+		-MD -MF $(DEPDIR)/msdd.Std \
+		-module msdd -o msdd-guile.cc $(WHAT); then \
+	    if test $(host_os) = mingw32; then \
+		$(RM) $(DEPDIR)/msdd.Sd; \
+		$(SED) 's,\\\\,/,g' < $(DEPDIR)/msdd.Std \
+			> $(DEPDIR)/msdd.Sd; \
+		$(RM) $(DEPDIR)/msdd.Std; \
+		$(MV) $(DEPDIR)/msdd.Sd $(DEPDIR)/msdd.Std; \
+	    fi; \
+	else \
+	    $(RM) $(DEPDIR)/msdd.S*; exit 1; \
+	fi;
+	touch $(DEPDIR)/msdd-generate-guile-stamp
+
+$(DEPDIR)/msdd-generate-python-stamp:
 ## This rule will be called only by the first process issuing the
 ## above rule to succeed in creating the lock directory, after
 ## removing the actual stamp file in order to guarantee that MAKE will
@@ -235,7 +219,7 @@ $(DEPDIR)/msdd-generate-stamp:
 ##
 	if $(SWIG) $(STD_SWIG_PYTHON_ARGS) $(msdd_swig_args) \
 		-MD -MF $(DEPDIR)/msdd.Std \
-		-module msdd -o msdd.cc $(WHAT); then \
+		-module msdd -o msdd-python.cc $(WHAT); then \
 	    if test $(host_os) = mingw32; then \
 		$(RM) $(DEPDIR)/msdd.Sd; \
 		$(SED) 's,\\\\,/,g' < $(DEPDIR)/msdd.Std \
@@ -282,14 +266,124 @@ $(DEPDIR)/msdd-generate-stamp:
 ## executing this rule; allows other threads waiting on this process
 ## to continue.
 ##
-	touch $(DEPDIR)/msdd-generate-stamp
+	touch $(DEPDIR)/msdd-generate-python-stamp
+
+# KLUDGE: Force runtime include of a SWIG dependency file.  This is
+# not guaranteed to be portable, but will probably work.  If it works,
+# we have accurate dependencies for our swig stuff, which is good.
+
+@am__include@ @am__quote@./$(DEPDIR)/msdd.d@am__quote@
+
+# -*- 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 msdd_rs.i
+
+## Default install locations for these files:
+##
+## Default location for the Python directory is:
+##  ${prefix}/lib/python${python_version}/site-packages/[category]/msdd_rs
+## Default location for the Python exec directory is:
+##  ${exec_prefix}/lib/python${python_version}/site-packages/[category]/msdd_rs
+##
+## 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.
+
+msdd_rs_pythondir_category ?= gnuradio/msdd_rs
+msdd_rs_pylibdir_category ?= $(msdd_rs_pythondir_category)
+msdd_rs_pythondir = $(pythondir)/$(msdd_rs_pythondir_category)
+msdd_rs_pylibdir = $(pyexecdir)/$(msdd_rs_pylibdir_category)
+
+## SWIG headers are always installed into the same directory.
+
+msdd_rs_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 >
+
+## Stamps used to ensure parallel make does the right thing.  These
+## are removed by "make clean", but otherwise unused except during the
+## parallel built.  These will not be included in a tarball, because
+## the SWIG-generated files will be removed from the distribution.
+
+STAMPS += $(DEPDIR)/msdd_rs-generate-*
+
+## Other cleaned files: dependency files generated by SWIG or this Makefile
+
+MOSTLYCLEANFILES += $(DEPDIR)/*.S*
 
+## Add the .py and .cc files to the list of SWIG built sources.  The
+## .h file is sometimes built, but not always ... so that one has to
+## be added manually by the including Makefile.am .
 
+swig_built_sources += msdd_rs.py msdd_rs-python.cc
+
+## Various SWIG variables.  These can be overloaded in the including
+## Makefile.am by setting the variable value there, then including
+## Makefile.swig .
+
+msdd_rs_swiginclude_HEADERS =		\
+	msdd_rs.i			\
+	$(msdd_rs_swiginclude_headers)
 
+msdd_rs_pylib_LTLIBRARIES =		\
+	_msdd_rs.la
+
+_msdd_rs_la_SOURCES = 			\
+	msdd_rs-python.cc			\
+	$(msdd_rs_la_swig_sources)
+
+_msdd_rs_la_LIBADD =			\
+	$(STD_SWIG_LA_LIB_ADD)		\
+	$(msdd_rs_la_swig_libadd)
+
+_msdd_rs_la_LDFLAGS =			\
+	$(STD_SWIG_LA_LD_FLAGS)		\
+	$(msdd_rs_la_swig_ldflags)
+
+_msdd_rs_la_CXXFLAGS =			\
+	$(STD_SWIG_CXX_FLAGS)		\
+	$(msdd_rs_la_swig_cxxflags)
 
+msdd_rs_python_PYTHON =			\
+	msdd_rs.py			\
+	$(msdd_rs_python)
 
+## Entry rule for running SWIG
 
-msdd_rs.h msdd_rs.py msdd_rs.cc: msdd_rs.i
+msdd_rs.h msdd_rs.py msdd_rs-python.cc: msdd_rs.i
 ## This rule will get called only when MAKE decides that one of the
 ## targets needs to be created or re-created, because:
 ##
@@ -316,7 +410,7 @@ msdd_rs.h msdd_rs.py msdd_rs.cc: msdd_rs.i
 ##
 ## Once execution gets to here, it should always proceed no matter the
 ## state of a stamp (as discussed in link above).  The
-## $(DEPDIR)/msdd-generate stuff is used to allow for parallel
+## $(DEPDIR)/msdd_rs-generate stuff is used to allow for parallel
 ## builds to "do the right thing".  The stamp has no relationship with
 ## either the target files or dependency file; it is used solely for
 ## the protection of multiple builds during a given call to MAKE.
@@ -341,11 +435,12 @@ msdd_rs.h msdd_rs.py msdd_rs.cc: msdd_rs.i
 ##
 ## Remove the stamp associated with this filename.
 ##
-		rm -f $(DEPDIR)/msdd_rs-generate-stamp; \
+		rm -f $(DEPDIR)/msdd_rs-generate-*stamp; \
 ##
 ## Tell MAKE to run the rule for creating this stamp.
 ##
-		$(MAKE) $(AM_MAKEFLAGS) $(DEPDIR)/msdd_rs-generate-stamp WHAT=$<; \
+		$(MAKE) $(AM_MAKEFLAGS) $(DEPDIR)/msdd_rs-generate-python-stamp WHAT=$<; \
+		$(MAKE) $(AM_MAKEFLAGS) $(DEPDIR)/msdd_rs-generate-guile-stamp WHAT=$<; \
 ##
 ## Now that the .cc, .h, and .py files have been (re)created from the
 ## .i file, future checking of this rule during the same MAKE
@@ -369,11 +464,27 @@ msdd_rs.h msdd_rs.py msdd_rs.cc: msdd_rs.i
 ## Succeed if and only if the first process succeeded; exit this
 ## process returning the status of the generated stamp.
 ##
-		test -f $(DEPDIR)/msdd_rs-generate-stamp; \
+		test -f $(DEPDIR)/msdd_rs-generate-python-stamp; \
 		exit $$?; \
 	fi;
 
-$(DEPDIR)/msdd_rs-generate-stamp:
+$(DEPDIR)/msdd_rs-generate-guile-stamp:
+	if $(SWIG) $(STD_SWIG_GUILE_ARGS) $(msdd_rs_swig_args) \
+		-MD -MF $(DEPDIR)/msdd_rs.Std \
+		-module msdd_rs -o msdd_rs-guile.cc $(WHAT); then \
+	    if test $(host_os) = mingw32; then \
+		$(RM) $(DEPDIR)/msdd_rs.Sd; \
+		$(SED) 's,\\\\,/,g' < $(DEPDIR)/msdd_rs.Std \
+			> $(DEPDIR)/msdd_rs.Sd; \
+		$(RM) $(DEPDIR)/msdd_rs.Std; \
+		$(MV) $(DEPDIR)/msdd_rs.Sd $(DEPDIR)/msdd_rs.Std; \
+	    fi; \
+	else \
+	    $(RM) $(DEPDIR)/msdd_rs.S*; exit 1; \
+	fi;
+	touch $(DEPDIR)/msdd_rs-generate-guile-stamp
+
+$(DEPDIR)/msdd_rs-generate-python-stamp:
 ## This rule will be called only by the first process issuing the
 ## above rule to succeed in creating the lock directory, after
 ## removing the actual stamp file in order to guarantee that MAKE will
@@ -384,7 +495,7 @@ $(DEPDIR)/msdd_rs-generate-stamp:
 ##
 	if $(SWIG) $(STD_SWIG_PYTHON_ARGS) $(msdd_rs_swig_args) \
 		-MD -MF $(DEPDIR)/msdd_rs.Std \
-		-module msdd_rs -o msdd_rs.cc $(WHAT); then \
+		-module msdd_rs -o msdd_rs-python.cc $(WHAT); then \
 	    if test $(host_os) = mingw32; then \
 		$(RM) $(DEPDIR)/msdd_rs.Sd; \
 		$(SED) 's,\\\\,/,g' < $(DEPDIR)/msdd_rs.Std \
@@ -431,14 +542,11 @@ $(DEPDIR)/msdd_rs-generate-stamp:
 ## executing this rule; allows other threads waiting on this process
 ## to continue.
 ##
-	touch $(DEPDIR)/msdd_rs-generate-stamp
+	touch $(DEPDIR)/msdd_rs-generate-python-stamp
 
 # KLUDGE: Force runtime include of a SWIG dependency file.  This is
 # not guaranteed to be portable, but will probably work.  If it works,
 # we have accurate dependencies for our swig stuff, which is good.
 
-
-@am__include@ @am__quote@./$(DEPDIR)/msdd.d@am__quote@
 @am__include@ @am__quote@./$(DEPDIR)/msdd_rs.d@am__quote@
 
-
diff --git a/gr-noaa/swig/Makefile.swig.gen b/gr-noaa/swig/Makefile.swig.gen
index 3d7102fe3..eb0e2db4d 100644
--- a/gr-noaa/swig/Makefile.swig.gen
+++ b/gr-noaa/swig/Makefile.swig.gen
@@ -72,7 +72,7 @@ MOSTLYCLEANFILES += $(DEPDIR)/*.S*
 ## .h file is sometimes built, but not always ... so that one has to
 ## be added manually by the including Makefile.am .
 
-swig_built_sources += noaa_swig.py noaa_swig.cc
+swig_built_sources += noaa_swig.py noaa_swig-python.cc
 
 ## Various SWIG variables.  These can be overloaded in the including
 ## Makefile.am by setting the variable value there, then including
@@ -86,7 +86,7 @@ noaa_swig_pylib_LTLIBRARIES =		\
 	_noaa_swig.la
 
 _noaa_swig_la_SOURCES = 			\
-	noaa_swig.cc			\
+	noaa_swig-python.cc			\
 	$(noaa_swig_la_swig_sources)
 
 _noaa_swig_la_LIBADD =			\
@@ -107,7 +107,7 @@ noaa_swig_python_PYTHON =			\
 
 ## Entry rule for running SWIG
 
-noaa_swig.h noaa_swig.py noaa_swig.cc: noaa_swig.i
+noaa_swig.h noaa_swig.py noaa_swig-python.cc: noaa_swig.i
 ## This rule will get called only when MAKE decides that one of the
 ## targets needs to be created or re-created, because:
 ##
@@ -159,11 +159,12 @@ noaa_swig.h noaa_swig.py noaa_swig.cc: noaa_swig.i
 ##
 ## Remove the stamp associated with this filename.
 ##
-		rm -f $(DEPDIR)/noaa_swig-generate-stamp; \
+		rm -f $(DEPDIR)/noaa_swig-generate-*stamp; \
 ##
 ## Tell MAKE to run the rule for creating this stamp.
 ##
-		$(MAKE) $(AM_MAKEFLAGS) $(DEPDIR)/noaa_swig-generate-stamp WHAT=$<; \
+		$(MAKE) $(AM_MAKEFLAGS) $(DEPDIR)/noaa_swig-generate-python-stamp WHAT=$<; \
+		$(MAKE) $(AM_MAKEFLAGS) $(DEPDIR)/noaa_swig-generate-guile-stamp WHAT=$<; \
 ##
 ## Now that the .cc, .h, and .py files have been (re)created from the
 ## .i file, future checking of this rule during the same MAKE
@@ -187,11 +188,27 @@ noaa_swig.h noaa_swig.py noaa_swig.cc: noaa_swig.i
 ## Succeed if and only if the first process succeeded; exit this
 ## process returning the status of the generated stamp.
 ##
-		test -f $(DEPDIR)/noaa_swig-generate-stamp; \
+		test -f $(DEPDIR)/noaa_swig-generate-python-stamp; \
 		exit $$?; \
 	fi;
 
-$(DEPDIR)/noaa_swig-generate-stamp:
+$(DEPDIR)/noaa_swig-generate-guile-stamp:
+	if $(SWIG) $(STD_SWIG_GUILE_ARGS) $(noaa_swig_swig_args) \
+		-MD -MF $(DEPDIR)/noaa_swig.Std \
+		-module noaa_swig -o noaa_swig-guile.cc $(WHAT); then \
+	    if test $(host_os) = mingw32; then \
+		$(RM) $(DEPDIR)/noaa_swig.Sd; \
+		$(SED) 's,\\\\,/,g' < $(DEPDIR)/noaa_swig.Std \
+			> $(DEPDIR)/noaa_swig.Sd; \
+		$(RM) $(DEPDIR)/noaa_swig.Std; \
+		$(MV) $(DEPDIR)/noaa_swig.Sd $(DEPDIR)/noaa_swig.Std; \
+	    fi; \
+	else \
+	    $(RM) $(DEPDIR)/noaa_swig.S*; exit 1; \
+	fi;
+	touch $(DEPDIR)/noaa_swig-generate-guile-stamp
+
+$(DEPDIR)/noaa_swig-generate-python-stamp:
 ## This rule will be called only by the first process issuing the
 ## above rule to succeed in creating the lock directory, after
 ## removing the actual stamp file in order to guarantee that MAKE will
@@ -202,7 +219,7 @@ $(DEPDIR)/noaa_swig-generate-stamp:
 ##
 	if $(SWIG) $(STD_SWIG_PYTHON_ARGS) $(noaa_swig_swig_args) \
 		-MD -MF $(DEPDIR)/noaa_swig.Std \
-		-module noaa_swig -o noaa_swig.cc $(WHAT); then \
+		-module noaa_swig -o noaa_swig-python.cc $(WHAT); then \
 	    if test $(host_os) = mingw32; then \
 		$(RM) $(DEPDIR)/noaa_swig.Sd; \
 		$(SED) 's,\\\\,/,g' < $(DEPDIR)/noaa_swig.Std \
@@ -249,7 +266,7 @@ $(DEPDIR)/noaa_swig-generate-stamp:
 ## executing this rule; allows other threads waiting on this process
 ## to continue.
 ##
-	touch $(DEPDIR)/noaa_swig-generate-stamp
+	touch $(DEPDIR)/noaa_swig-generate-python-stamp
 
 # KLUDGE: Force runtime include of a SWIG dependency file.  This is
 # not guaranteed to be portable, but will probably work.  If it works,
diff --git a/gr-pager/swig/Makefile.swig.gen b/gr-pager/swig/Makefile.swig.gen
index 5cfbc66be..8870c674b 100644
--- a/gr-pager/swig/Makefile.swig.gen
+++ b/gr-pager/swig/Makefile.swig.gen
@@ -72,7 +72,7 @@ MOSTLYCLEANFILES += $(DEPDIR)/*.S*
 ## .h file is sometimes built, but not always ... so that one has to
 ## be added manually by the including Makefile.am .
 
-swig_built_sources += pager_swig.py pager_swig.cc
+swig_built_sources += pager_swig.py pager_swig-python.cc
 
 ## Various SWIG variables.  These can be overloaded in the including
 ## Makefile.am by setting the variable value there, then including
@@ -86,7 +86,7 @@ pager_swig_pylib_LTLIBRARIES =		\
 	_pager_swig.la
 
 _pager_swig_la_SOURCES = 			\
-	pager_swig.cc			\
+	pager_swig-python.cc			\
 	$(pager_swig_la_swig_sources)
 
 _pager_swig_la_LIBADD =			\
@@ -107,7 +107,7 @@ pager_swig_python_PYTHON =			\
 
 ## Entry rule for running SWIG
 
-pager_swig.h pager_swig.py pager_swig.cc: pager_swig.i
+pager_swig.h pager_swig.py pager_swig-python.cc: pager_swig.i
 ## This rule will get called only when MAKE decides that one of the
 ## targets needs to be created or re-created, because:
 ##
@@ -159,11 +159,12 @@ pager_swig.h pager_swig.py pager_swig.cc: pager_swig.i
 ##
 ## Remove the stamp associated with this filename.
 ##
-		rm -f $(DEPDIR)/pager_swig-generate-stamp; \
+		rm -f $(DEPDIR)/pager_swig-generate-*stamp; \
 ##
 ## Tell MAKE to run the rule for creating this stamp.
 ##
-		$(MAKE) $(AM_MAKEFLAGS) $(DEPDIR)/pager_swig-generate-stamp WHAT=$<; \
+		$(MAKE) $(AM_MAKEFLAGS) $(DEPDIR)/pager_swig-generate-python-stamp WHAT=$<; \
+		$(MAKE) $(AM_MAKEFLAGS) $(DEPDIR)/pager_swig-generate-guile-stamp WHAT=$<; \
 ##
 ## Now that the .cc, .h, and .py files have been (re)created from the
 ## .i file, future checking of this rule during the same MAKE
@@ -187,11 +188,27 @@ pager_swig.h pager_swig.py pager_swig.cc: pager_swig.i
 ## Succeed if and only if the first process succeeded; exit this
 ## process returning the status of the generated stamp.
 ##
-		test -f $(DEPDIR)/pager_swig-generate-stamp; \
+		test -f $(DEPDIR)/pager_swig-generate-python-stamp; \
 		exit $$?; \
 	fi;
 
-$(DEPDIR)/pager_swig-generate-stamp:
+$(DEPDIR)/pager_swig-generate-guile-stamp:
+	if $(SWIG) $(STD_SWIG_GUILE_ARGS) $(pager_swig_swig_args) \
+		-MD -MF $(DEPDIR)/pager_swig.Std \
+		-module pager_swig -o pager_swig-guile.cc $(WHAT); then \
+	    if test $(host_os) = mingw32; then \
+		$(RM) $(DEPDIR)/pager_swig.Sd; \
+		$(SED) 's,\\\\,/,g' < $(DEPDIR)/pager_swig.Std \
+			> $(DEPDIR)/pager_swig.Sd; \
+		$(RM) $(DEPDIR)/pager_swig.Std; \
+		$(MV) $(DEPDIR)/pager_swig.Sd $(DEPDIR)/pager_swig.Std; \
+	    fi; \
+	else \
+	    $(RM) $(DEPDIR)/pager_swig.S*; exit 1; \
+	fi;
+	touch $(DEPDIR)/pager_swig-generate-guile-stamp
+
+$(DEPDIR)/pager_swig-generate-python-stamp:
 ## This rule will be called only by the first process issuing the
 ## above rule to succeed in creating the lock directory, after
 ## removing the actual stamp file in order to guarantee that MAKE will
@@ -202,7 +219,7 @@ $(DEPDIR)/pager_swig-generate-stamp:
 ##
 	if $(SWIG) $(STD_SWIG_PYTHON_ARGS) $(pager_swig_swig_args) \
 		-MD -MF $(DEPDIR)/pager_swig.Std \
-		-module pager_swig -o pager_swig.cc $(WHAT); then \
+		-module pager_swig -o pager_swig-python.cc $(WHAT); then \
 	    if test $(host_os) = mingw32; then \
 		$(RM) $(DEPDIR)/pager_swig.Sd; \
 		$(SED) 's,\\\\,/,g' < $(DEPDIR)/pager_swig.Std \
@@ -249,7 +266,7 @@ $(DEPDIR)/pager_swig-generate-stamp:
 ## executing this rule; allows other threads waiting on this process
 ## to continue.
 ##
-	touch $(DEPDIR)/pager_swig-generate-stamp
+	touch $(DEPDIR)/pager_swig-generate-python-stamp
 
 # KLUDGE: Force runtime include of a SWIG dependency file.  This is
 # not guaranteed to be portable, but will probably work.  If it works,
diff --git a/gr-qtgui/src/lib/Makefile.swig.gen b/gr-qtgui/src/lib/Makefile.swig.gen
index f40f0d881..e0b2bfd53 100644
--- a/gr-qtgui/src/lib/Makefile.swig.gen
+++ b/gr-qtgui/src/lib/Makefile.swig.gen
@@ -72,7 +72,7 @@ MOSTLYCLEANFILES += $(DEPDIR)/*.S*
 ## .h file is sometimes built, but not always ... so that one has to
 ## be added manually by the including Makefile.am .
 
-swig_built_sources += qtgui.py qtgui.cc
+swig_built_sources += qtgui.py qtgui-python.cc
 
 ## Various SWIG variables.  These can be overloaded in the including
 ## Makefile.am by setting the variable value there, then including
@@ -86,7 +86,7 @@ qtgui_pylib_LTLIBRARIES =		\
 	_qtgui.la
 
 _qtgui_la_SOURCES = 			\
-	qtgui.cc			\
+	qtgui-python.cc			\
 	$(qtgui_la_swig_sources)
 
 _qtgui_la_LIBADD =			\
@@ -107,7 +107,7 @@ qtgui_python_PYTHON =			\
 
 ## Entry rule for running SWIG
 
-qtgui.h qtgui.py qtgui.cc: qtgui.i
+qtgui.h qtgui.py qtgui-python.cc: qtgui.i
 ## This rule will get called only when MAKE decides that one of the
 ## targets needs to be created or re-created, because:
 ##
@@ -159,11 +159,12 @@ qtgui.h qtgui.py qtgui.cc: qtgui.i
 ##
 ## Remove the stamp associated with this filename.
 ##
-		rm -f $(DEPDIR)/qtgui-generate-stamp; \
+		rm -f $(DEPDIR)/qtgui-generate-*stamp; \
 ##
 ## Tell MAKE to run the rule for creating this stamp.
 ##
-		$(MAKE) $(AM_MAKEFLAGS) $(DEPDIR)/qtgui-generate-stamp WHAT=$<; \
+		$(MAKE) $(AM_MAKEFLAGS) $(DEPDIR)/qtgui-generate-python-stamp WHAT=$<; \
+		$(MAKE) $(AM_MAKEFLAGS) $(DEPDIR)/qtgui-generate-guile-stamp WHAT=$<; \
 ##
 ## Now that the .cc, .h, and .py files have been (re)created from the
 ## .i file, future checking of this rule during the same MAKE
@@ -187,11 +188,27 @@ qtgui.h qtgui.py qtgui.cc: qtgui.i
 ## Succeed if and only if the first process succeeded; exit this
 ## process returning the status of the generated stamp.
 ##
-		test -f $(DEPDIR)/qtgui-generate-stamp; \
+		test -f $(DEPDIR)/qtgui-generate-python-stamp; \
 		exit $$?; \
 	fi;
 
-$(DEPDIR)/qtgui-generate-stamp:
+$(DEPDIR)/qtgui-generate-guile-stamp:
+	if $(SWIG) $(STD_SWIG_GUILE_ARGS) $(qtgui_swig_args) \
+		-MD -MF $(DEPDIR)/qtgui.Std \
+		-module qtgui -o qtgui-guile.cc $(WHAT); then \
+	    if test $(host_os) = mingw32; then \
+		$(RM) $(DEPDIR)/qtgui.Sd; \
+		$(SED) 's,\\\\,/,g' < $(DEPDIR)/qtgui.Std \
+			> $(DEPDIR)/qtgui.Sd; \
+		$(RM) $(DEPDIR)/qtgui.Std; \
+		$(MV) $(DEPDIR)/qtgui.Sd $(DEPDIR)/qtgui.Std; \
+	    fi; \
+	else \
+	    $(RM) $(DEPDIR)/qtgui.S*; exit 1; \
+	fi;
+	touch $(DEPDIR)/qtgui-generate-guile-stamp
+
+$(DEPDIR)/qtgui-generate-python-stamp:
 ## This rule will be called only by the first process issuing the
 ## above rule to succeed in creating the lock directory, after
 ## removing the actual stamp file in order to guarantee that MAKE will
@@ -202,7 +219,7 @@ $(DEPDIR)/qtgui-generate-stamp:
 ##
 	if $(SWIG) $(STD_SWIG_PYTHON_ARGS) $(qtgui_swig_args) \
 		-MD -MF $(DEPDIR)/qtgui.Std \
-		-module qtgui -o qtgui.cc $(WHAT); then \
+		-module qtgui -o qtgui-python.cc $(WHAT); then \
 	    if test $(host_os) = mingw32; then \
 		$(RM) $(DEPDIR)/qtgui.Sd; \
 		$(SED) 's,\\\\,/,g' < $(DEPDIR)/qtgui.Std \
@@ -249,7 +266,7 @@ $(DEPDIR)/qtgui-generate-stamp:
 ## executing this rule; allows other threads waiting on this process
 ## to continue.
 ##
-	touch $(DEPDIR)/qtgui-generate-stamp
+	touch $(DEPDIR)/qtgui-generate-python-stamp
 
 # KLUDGE: Force runtime include of a SWIG dependency file.  This is
 # not guaranteed to be portable, but will probably work.  If it works,
diff --git a/gr-radio-astronomy/src/lib/Makefile.swig.gen b/gr-radio-astronomy/src/lib/Makefile.swig.gen
index 26f2373f5..70687aed7 100644
--- a/gr-radio-astronomy/src/lib/Makefile.swig.gen
+++ b/gr-radio-astronomy/src/lib/Makefile.swig.gen
@@ -72,7 +72,7 @@ MOSTLYCLEANFILES += $(DEPDIR)/*.S*
 ## .h file is sometimes built, but not always ... so that one has to
 ## be added manually by the including Makefile.am .
 
-swig_built_sources += ra.py ra.cc
+swig_built_sources += ra.py ra-python.cc
 
 ## Various SWIG variables.  These can be overloaded in the including
 ## Makefile.am by setting the variable value there, then including
@@ -86,7 +86,7 @@ ra_pylib_LTLIBRARIES =		\
 	_ra.la
 
 _ra_la_SOURCES = 			\
-	ra.cc			\
+	ra-python.cc			\
 	$(ra_la_swig_sources)
 
 _ra_la_LIBADD =			\
@@ -107,7 +107,7 @@ ra_python_PYTHON =			\
 
 ## Entry rule for running SWIG
 
-ra.h ra.py ra.cc: ra.i
+ra.h ra.py ra-python.cc: ra.i
 ## This rule will get called only when MAKE decides that one of the
 ## targets needs to be created or re-created, because:
 ##
@@ -159,11 +159,12 @@ ra.h ra.py ra.cc: ra.i
 ##
 ## Remove the stamp associated with this filename.
 ##
-		rm -f $(DEPDIR)/ra-generate-stamp; \
+		rm -f $(DEPDIR)/ra-generate-*stamp; \
 ##
 ## Tell MAKE to run the rule for creating this stamp.
 ##
-		$(MAKE) $(AM_MAKEFLAGS) $(DEPDIR)/ra-generate-stamp WHAT=$<; \
+		$(MAKE) $(AM_MAKEFLAGS) $(DEPDIR)/ra-generate-python-stamp WHAT=$<; \
+		$(MAKE) $(AM_MAKEFLAGS) $(DEPDIR)/ra-generate-guile-stamp WHAT=$<; \
 ##
 ## Now that the .cc, .h, and .py files have been (re)created from the
 ## .i file, future checking of this rule during the same MAKE
@@ -187,11 +188,27 @@ ra.h ra.py ra.cc: ra.i
 ## Succeed if and only if the first process succeeded; exit this
 ## process returning the status of the generated stamp.
 ##
-		test -f $(DEPDIR)/ra-generate-stamp; \
+		test -f $(DEPDIR)/ra-generate-python-stamp; \
 		exit $$?; \
 	fi;
 
-$(DEPDIR)/ra-generate-stamp:
+$(DEPDIR)/ra-generate-guile-stamp:
+	if $(SWIG) $(STD_SWIG_GUILE_ARGS) $(ra_swig_args) \
+		-MD -MF $(DEPDIR)/ra.Std \
+		-module ra -o ra-guile.cc $(WHAT); then \
+	    if test $(host_os) = mingw32; then \
+		$(RM) $(DEPDIR)/ra.Sd; \
+		$(SED) 's,\\\\,/,g' < $(DEPDIR)/ra.Std \
+			> $(DEPDIR)/ra.Sd; \
+		$(RM) $(DEPDIR)/ra.Std; \
+		$(MV) $(DEPDIR)/ra.Sd $(DEPDIR)/ra.Std; \
+	    fi; \
+	else \
+	    $(RM) $(DEPDIR)/ra.S*; exit 1; \
+	fi;
+	touch $(DEPDIR)/ra-generate-guile-stamp
+
+$(DEPDIR)/ra-generate-python-stamp:
 ## This rule will be called only by the first process issuing the
 ## above rule to succeed in creating the lock directory, after
 ## removing the actual stamp file in order to guarantee that MAKE will
@@ -202,7 +219,7 @@ $(DEPDIR)/ra-generate-stamp:
 ##
 	if $(SWIG) $(STD_SWIG_PYTHON_ARGS) $(ra_swig_args) \
 		-MD -MF $(DEPDIR)/ra.Std \
-		-module ra -o ra.cc $(WHAT); then \
+		-module ra -o ra-python.cc $(WHAT); then \
 	    if test $(host_os) = mingw32; then \
 		$(RM) $(DEPDIR)/ra.Sd; \
 		$(SED) 's,\\\\,/,g' < $(DEPDIR)/ra.Std \
@@ -249,7 +266,7 @@ $(DEPDIR)/ra-generate-stamp:
 ## executing this rule; allows other threads waiting on this process
 ## to continue.
 ##
-	touch $(DEPDIR)/ra-generate-stamp
+	touch $(DEPDIR)/ra-generate-python-stamp
 
 # KLUDGE: Force runtime include of a SWIG dependency file.  This is
 # not guaranteed to be portable, but will probably work.  If it works,
diff --git a/gr-trellis/src/lib/Makefile.swig.gen b/gr-trellis/src/lib/Makefile.swig.gen
index 1a9656b8f..05f03ee77 100644
--- a/gr-trellis/src/lib/Makefile.swig.gen
+++ b/gr-trellis/src/lib/Makefile.swig.gen
@@ -72,7 +72,7 @@ MOSTLYCLEANFILES += $(DEPDIR)/*.S*
 ## .h file is sometimes built, but not always ... so that one has to
 ## be added manually by the including Makefile.am .
 
-swig_built_sources += trellis.py trellis.cc
+swig_built_sources += trellis.py trellis-python.cc
 
 ## Various SWIG variables.  These can be overloaded in the including
 ## Makefile.am by setting the variable value there, then including
@@ -86,7 +86,7 @@ trellis_pylib_LTLIBRARIES =		\
 	_trellis.la
 
 _trellis_la_SOURCES = 			\
-	trellis.cc			\
+	trellis-python.cc			\
 	$(trellis_la_swig_sources)
 
 _trellis_la_LIBADD =			\
@@ -107,7 +107,7 @@ trellis_python_PYTHON =			\
 
 ## Entry rule for running SWIG
 
-trellis.h trellis.py trellis.cc: trellis.i
+trellis.h trellis.py trellis-python.cc: trellis.i
 ## This rule will get called only when MAKE decides that one of the
 ## targets needs to be created or re-created, because:
 ##
@@ -159,11 +159,12 @@ trellis.h trellis.py trellis.cc: trellis.i
 ##
 ## Remove the stamp associated with this filename.
 ##
-		rm -f $(DEPDIR)/trellis-generate-stamp; \
+		rm -f $(DEPDIR)/trellis-generate-*stamp; \
 ##
 ## Tell MAKE to run the rule for creating this stamp.
 ##
-		$(MAKE) $(AM_MAKEFLAGS) $(DEPDIR)/trellis-generate-stamp WHAT=$<; \
+		$(MAKE) $(AM_MAKEFLAGS) $(DEPDIR)/trellis-generate-python-stamp WHAT=$<; \
+		$(MAKE) $(AM_MAKEFLAGS) $(DEPDIR)/trellis-generate-guile-stamp WHAT=$<; \
 ##
 ## Now that the .cc, .h, and .py files have been (re)created from the
 ## .i file, future checking of this rule during the same MAKE
@@ -187,11 +188,27 @@ trellis.h trellis.py trellis.cc: trellis.i
 ## Succeed if and only if the first process succeeded; exit this
 ## process returning the status of the generated stamp.
 ##
-		test -f $(DEPDIR)/trellis-generate-stamp; \
+		test -f $(DEPDIR)/trellis-generate-python-stamp; \
 		exit $$?; \
 	fi;
 
-$(DEPDIR)/trellis-generate-stamp:
+$(DEPDIR)/trellis-generate-guile-stamp:
+	if $(SWIG) $(STD_SWIG_GUILE_ARGS) $(trellis_swig_args) \
+		-MD -MF $(DEPDIR)/trellis.Std \
+		-module trellis -o trellis-guile.cc $(WHAT); then \
+	    if test $(host_os) = mingw32; then \
+		$(RM) $(DEPDIR)/trellis.Sd; \
+		$(SED) 's,\\\\,/,g' < $(DEPDIR)/trellis.Std \
+			> $(DEPDIR)/trellis.Sd; \
+		$(RM) $(DEPDIR)/trellis.Std; \
+		$(MV) $(DEPDIR)/trellis.Sd $(DEPDIR)/trellis.Std; \
+	    fi; \
+	else \
+	    $(RM) $(DEPDIR)/trellis.S*; exit 1; \
+	fi;
+	touch $(DEPDIR)/trellis-generate-guile-stamp
+
+$(DEPDIR)/trellis-generate-python-stamp:
 ## This rule will be called only by the first process issuing the
 ## above rule to succeed in creating the lock directory, after
 ## removing the actual stamp file in order to guarantee that MAKE will
@@ -202,7 +219,7 @@ $(DEPDIR)/trellis-generate-stamp:
 ##
 	if $(SWIG) $(STD_SWIG_PYTHON_ARGS) $(trellis_swig_args) \
 		-MD -MF $(DEPDIR)/trellis.Std \
-		-module trellis -o trellis.cc $(WHAT); then \
+		-module trellis -o trellis-python.cc $(WHAT); then \
 	    if test $(host_os) = mingw32; then \
 		$(RM) $(DEPDIR)/trellis.Sd; \
 		$(SED) 's,\\\\,/,g' < $(DEPDIR)/trellis.Std \
@@ -249,7 +266,7 @@ $(DEPDIR)/trellis-generate-stamp:
 ## executing this rule; allows other threads waiting on this process
 ## to continue.
 ##
-	touch $(DEPDIR)/trellis-generate-stamp
+	touch $(DEPDIR)/trellis-generate-python-stamp
 
 # KLUDGE: Force runtime include of a SWIG dependency file.  This is
 # not guaranteed to be portable, but will probably work.  If it works,
diff --git a/gr-usrp2/src/Makefile.swig.gen b/gr-usrp2/src/Makefile.swig.gen
index 24d9f17c0..e7518d255 100644
--- a/gr-usrp2/src/Makefile.swig.gen
+++ b/gr-usrp2/src/Makefile.swig.gen
@@ -72,7 +72,7 @@ MOSTLYCLEANFILES += $(DEPDIR)/*.S*
 ## .h file is sometimes built, but not always ... so that one has to
 ## be added manually by the including Makefile.am .
 
-swig_built_sources += usrp2.py usrp2.cc
+swig_built_sources += usrp2.py usrp2-python.cc
 
 ## Various SWIG variables.  These can be overloaded in the including
 ## Makefile.am by setting the variable value there, then including
@@ -86,7 +86,7 @@ usrp2_pylib_LTLIBRARIES =		\
 	_usrp2.la
 
 _usrp2_la_SOURCES = 			\
-	usrp2.cc			\
+	usrp2-python.cc			\
 	$(usrp2_la_swig_sources)
 
 _usrp2_la_LIBADD =			\
@@ -107,7 +107,7 @@ usrp2_python_PYTHON =			\
 
 ## Entry rule for running SWIG
 
-usrp2.h usrp2.py usrp2.cc: usrp2.i
+usrp2.h usrp2.py usrp2-python.cc: usrp2.i
 ## This rule will get called only when MAKE decides that one of the
 ## targets needs to be created or re-created, because:
 ##
@@ -159,11 +159,12 @@ usrp2.h usrp2.py usrp2.cc: usrp2.i
 ##
 ## Remove the stamp associated with this filename.
 ##
-		rm -f $(DEPDIR)/usrp2-generate-stamp; \
+		rm -f $(DEPDIR)/usrp2-generate-*stamp; \
 ##
 ## Tell MAKE to run the rule for creating this stamp.
 ##
-		$(MAKE) $(AM_MAKEFLAGS) $(DEPDIR)/usrp2-generate-stamp WHAT=$<; \
+		$(MAKE) $(AM_MAKEFLAGS) $(DEPDIR)/usrp2-generate-python-stamp WHAT=$<; \
+		$(MAKE) $(AM_MAKEFLAGS) $(DEPDIR)/usrp2-generate-guile-stamp WHAT=$<; \
 ##
 ## Now that the .cc, .h, and .py files have been (re)created from the
 ## .i file, future checking of this rule during the same MAKE
@@ -187,11 +188,27 @@ usrp2.h usrp2.py usrp2.cc: usrp2.i
 ## Succeed if and only if the first process succeeded; exit this
 ## process returning the status of the generated stamp.
 ##
-		test -f $(DEPDIR)/usrp2-generate-stamp; \
+		test -f $(DEPDIR)/usrp2-generate-python-stamp; \
 		exit $$?; \
 	fi;
 
-$(DEPDIR)/usrp2-generate-stamp:
+$(DEPDIR)/usrp2-generate-guile-stamp:
+	if $(SWIG) $(STD_SWIG_GUILE_ARGS) $(usrp2_swig_args) \
+		-MD -MF $(DEPDIR)/usrp2.Std \
+		-module usrp2 -o usrp2-guile.cc $(WHAT); then \
+	    if test $(host_os) = mingw32; then \
+		$(RM) $(DEPDIR)/usrp2.Sd; \
+		$(SED) 's,\\\\,/,g' < $(DEPDIR)/usrp2.Std \
+			> $(DEPDIR)/usrp2.Sd; \
+		$(RM) $(DEPDIR)/usrp2.Std; \
+		$(MV) $(DEPDIR)/usrp2.Sd $(DEPDIR)/usrp2.Std; \
+	    fi; \
+	else \
+	    $(RM) $(DEPDIR)/usrp2.S*; exit 1; \
+	fi;
+	touch $(DEPDIR)/usrp2-generate-guile-stamp
+
+$(DEPDIR)/usrp2-generate-python-stamp:
 ## This rule will be called only by the first process issuing the
 ## above rule to succeed in creating the lock directory, after
 ## removing the actual stamp file in order to guarantee that MAKE will
@@ -202,7 +219,7 @@ $(DEPDIR)/usrp2-generate-stamp:
 ##
 	if $(SWIG) $(STD_SWIG_PYTHON_ARGS) $(usrp2_swig_args) \
 		-MD -MF $(DEPDIR)/usrp2.Std \
-		-module usrp2 -o usrp2.cc $(WHAT); then \
+		-module usrp2 -o usrp2-python.cc $(WHAT); then \
 	    if test $(host_os) = mingw32; then \
 		$(RM) $(DEPDIR)/usrp2.Sd; \
 		$(SED) 's,\\\\,/,g' < $(DEPDIR)/usrp2.Std \
@@ -249,7 +266,7 @@ $(DEPDIR)/usrp2-generate-stamp:
 ## executing this rule; allows other threads waiting on this process
 ## to continue.
 ##
-	touch $(DEPDIR)/usrp2-generate-stamp
+	touch $(DEPDIR)/usrp2-generate-python-stamp
 
 # KLUDGE: Force runtime include of a SWIG dependency file.  This is
 # not guaranteed to be portable, but will probably work.  If it works,
diff --git a/gr-video-sdl/src/Makefile.swig.gen b/gr-video-sdl/src/Makefile.swig.gen
index a2728a4f3..949f495b3 100644
--- a/gr-video-sdl/src/Makefile.swig.gen
+++ b/gr-video-sdl/src/Makefile.swig.gen
@@ -72,7 +72,7 @@ MOSTLYCLEANFILES += $(DEPDIR)/*.S*
 ## .h file is sometimes built, but not always ... so that one has to
 ## be added manually by the including Makefile.am .
 
-swig_built_sources += video_sdl.py video_sdl.cc
+swig_built_sources += video_sdl.py video_sdl-python.cc
 
 ## Various SWIG variables.  These can be overloaded in the including
 ## Makefile.am by setting the variable value there, then including
@@ -86,7 +86,7 @@ video_sdl_pylib_LTLIBRARIES =		\
 	_video_sdl.la
 
 _video_sdl_la_SOURCES = 			\
-	video_sdl.cc			\
+	video_sdl-python.cc			\
 	$(video_sdl_la_swig_sources)
 
 _video_sdl_la_LIBADD =			\
@@ -107,7 +107,7 @@ video_sdl_python_PYTHON =			\
 
 ## Entry rule for running SWIG
 
-video_sdl.h video_sdl.py video_sdl.cc: video_sdl.i
+video_sdl.h video_sdl.py video_sdl-python.cc: video_sdl.i
 ## This rule will get called only when MAKE decides that one of the
 ## targets needs to be created or re-created, because:
 ##
@@ -159,11 +159,12 @@ video_sdl.h video_sdl.py video_sdl.cc: video_sdl.i
 ##
 ## Remove the stamp associated with this filename.
 ##
-		rm -f $(DEPDIR)/video_sdl-generate-stamp; \
+		rm -f $(DEPDIR)/video_sdl-generate-*stamp; \
 ##
 ## Tell MAKE to run the rule for creating this stamp.
 ##
-		$(MAKE) $(AM_MAKEFLAGS) $(DEPDIR)/video_sdl-generate-stamp WHAT=$<; \
+		$(MAKE) $(AM_MAKEFLAGS) $(DEPDIR)/video_sdl-generate-python-stamp WHAT=$<; \
+		$(MAKE) $(AM_MAKEFLAGS) $(DEPDIR)/video_sdl-generate-guile-stamp WHAT=$<; \
 ##
 ## Now that the .cc, .h, and .py files have been (re)created from the
 ## .i file, future checking of this rule during the same MAKE
@@ -187,11 +188,27 @@ video_sdl.h video_sdl.py video_sdl.cc: video_sdl.i
 ## Succeed if and only if the first process succeeded; exit this
 ## process returning the status of the generated stamp.
 ##
-		test -f $(DEPDIR)/video_sdl-generate-stamp; \
+		test -f $(DEPDIR)/video_sdl-generate-python-stamp; \
 		exit $$?; \
 	fi;
 
-$(DEPDIR)/video_sdl-generate-stamp:
+$(DEPDIR)/video_sdl-generate-guile-stamp:
+	if $(SWIG) $(STD_SWIG_GUILE_ARGS) $(video_sdl_swig_args) \
+		-MD -MF $(DEPDIR)/video_sdl.Std \
+		-module video_sdl -o video_sdl-guile.cc $(WHAT); then \
+	    if test $(host_os) = mingw32; then \
+		$(RM) $(DEPDIR)/video_sdl.Sd; \
+		$(SED) 's,\\\\,/,g' < $(DEPDIR)/video_sdl.Std \
+			> $(DEPDIR)/video_sdl.Sd; \
+		$(RM) $(DEPDIR)/video_sdl.Std; \
+		$(MV) $(DEPDIR)/video_sdl.Sd $(DEPDIR)/video_sdl.Std; \
+	    fi; \
+	else \
+	    $(RM) $(DEPDIR)/video_sdl.S*; exit 1; \
+	fi;
+	touch $(DEPDIR)/video_sdl-generate-guile-stamp
+
+$(DEPDIR)/video_sdl-generate-python-stamp:
 ## This rule will be called only by the first process issuing the
 ## above rule to succeed in creating the lock directory, after
 ## removing the actual stamp file in order to guarantee that MAKE will
@@ -202,7 +219,7 @@ $(DEPDIR)/video_sdl-generate-stamp:
 ##
 	if $(SWIG) $(STD_SWIG_PYTHON_ARGS) $(video_sdl_swig_args) \
 		-MD -MF $(DEPDIR)/video_sdl.Std \
-		-module video_sdl -o video_sdl.cc $(WHAT); then \
+		-module video_sdl -o video_sdl-python.cc $(WHAT); then \
 	    if test $(host_os) = mingw32; then \
 		$(RM) $(DEPDIR)/video_sdl.Sd; \
 		$(SED) 's,\\\\,/,g' < $(DEPDIR)/video_sdl.Std \
@@ -249,7 +266,7 @@ $(DEPDIR)/video_sdl-generate-stamp:
 ## executing this rule; allows other threads waiting on this process
 ## to continue.
 ##
-	touch $(DEPDIR)/video_sdl-generate-stamp
+	touch $(DEPDIR)/video_sdl-generate-python-stamp
 
 # KLUDGE: Force runtime include of a SWIG dependency file.  This is
 # not guaranteed to be portable, but will probably work.  If it works,