regenerated

1 files changed, 390 insertions, 168 deletions

diff --git a/gnuradio-core/src/lib/swig/Makefile.swig.gen b/gnuradio-core/src/lib/swig/Makefile.swig.gen
index 42c431204..091cdf82b 100644
--- a/gnuradio-core/src/lib/swig/Makefile.swig.gen
+++ b/gnuradio-core/src/lib/swig/Makefile.swig.gen
@@ -38,6 +38,16 @@ gnuradio_swig_py_runtime_pylibdir_category ?= $(gnuradio_swig_py_runtime_pythond
 gnuradio_swig_py_runtime_pythondir = $(pythondir)/$(gnuradio_swig_py_runtime_pythondir_category)
 gnuradio_swig_py_runtime_pylibdir = $(pyexecdir)/$(gnuradio_swig_py_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_swig_py_runtime_scmlibdir = @GUILE_PKLIBDIR@/gnuradio
+
+# The scm files for the guile modules get installed where ever guile
+# is installed, usually /usr/share/guile/site/gnuradio_swig_py_runtime
+# FIXME: determince whether these should be installed with gnuradio.
+gnuradio_swig_py_runtime_scmdir = @GUILE_PKDATADIR@/gnuradio
+
 ## SWIG headers are always installed into the same directory.
 
 gnuradio_swig_py_runtime_swigincludedir = $(swigincludedir)
@@ -73,6 +83,9 @@ MOSTLYCLEANFILES += $(DEPDIR)/*.S*
 ## be added manually by the including Makefile.am .
 
 swig_built_sources += gnuradio_swig_py_runtime.py gnuradio_swig_py_runtime_python.cc
+if GUILE
+swig_built_sources += gnuradio_swig_py_runtime.scm gnuradio_swig_py_runtime_guile.cc
+endif
 
 ## Various SWIG variables.  These can be overloaded in the including
 ## Makefile.am by setting the variable value there, then including
@@ -106,11 +119,11 @@ gnuradio_swig_py_runtime_python_PYTHON =			\
 	$(gnuradio_swig_py_runtime_python)
 
 if GUILE
-gnuradio_swig_py_runtime_pylib_LTLIBRARIES += _gnuradio_swig_py_runtime_guile.la
-
+gnuradio_swig_py_runtime_scmlib_LTLIBRARIES = _gnuradio_swig_py_runtime_guile.la
 _gnuradio_swig_py_runtime_guile_la_SOURCES = 		\
-	gnuradio_swig_py_runtime_guile.cc		\
+	gnuradio_swig_py_runtime_guile.cc		        \
 	$(gnuradio_swig_py_runtime_la_swig_sources)
+gnuradio_swig_py_runtime_scm_DATA = gnuradio_swig_py_runtime.scm
 
 # Guile can use the same flags as python does
 _gnuradio_swig_py_runtime_guile_la_LIBADD = $(_gnuradio_swig_py_runtime_python_la_LIBADD)
@@ -121,7 +134,8 @@ endif				# end of GUILE
 
 ## Entry rule for running SWIG
 
-gnuradio_swig_py_runtime_python.h gnuradio_swig_py_runtime.py gnuradio_swig_py_runtime_python.cc gnuradio_swig_py_runtime_guile.cc gnuradio_swig_py_runtime_guile.h: gnuradio_swig_py_runtime.i
+# $(python_deps) $(guile_deps): gnuradio_swig_py_runtime.i
+gnuradio_swig_py_runtime_python.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:
 ##
@@ -178,7 +192,6 @@ gnuradio_swig_py_runtime_python.h gnuradio_swig_py_runtime.py gnuradio_swig_py_r
 ## Tell MAKE to run the rule for creating this stamp.
 ##
 		$(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
@@ -206,32 +219,23 @@ gnuradio_swig_py_runtime_python.h gnuradio_swig_py_runtime.py gnuradio_swig_py_r
 		exit $$?; \
 	fi;
 
-$(DEPDIR)/gnuradio_swig_py_runtime-generate-guile-stamp:
+# the comments for the target above apply to this target as well, but it seemed
+# silly to include them twice. The only main change is for guile.
+gnuradio_swig_py_runtime_guile.h gnuradio_swig_py_runtime.scm gnuradio_swig_py_runtime_guile.cc: gnuradio_swig_py_runtime.i
 if GUILE
-	if $(SWIG) $(STD_SWIG_GUILE_ARGS) $(gnuradio_swig_py_runtime_swig_args) \
-		-MD -MF $(DEPDIR)/gnuradio_swig_py_runtime_guile.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_guile.Sd; \
-		$(SED) 's,\\\\,/,g' < $(DEPDIR)/gnuradio_swig_py_runtime_guile.Std \
-			> $(DEPDIR)/gnuradio_swig_py_runtime_guile.Sd; \
-		$(RM) $(DEPDIR)/gnuradio_swig_py_runtime_guile.Std; \
-		$(MV) $(DEPDIR)/gnuradio_swig_py_runtime_guile.Sd $(DEPDIR)/gnuradio_swig_py_runtime_guile.Std; \
-	    fi; \
+	trap 'rm -rf $(DEPDIR)/gnuradio_swig_py_runtime-generate-*' 1 2 13 15; \
+	if mkdir $(DEPDIR)/gnuradio_swig_py_runtime-generate-lock 2>/dev/null; then \
+		rm -f $(DEPDIR)/gnuradio_swig_py_runtime-generate-*stamp; \
+		$(MAKE) $(AM_MAKEFLAGS) $(DEPDIR)/gnuradio_swig_py_runtime-generate-guile-stamp WHAT=$<; \
+		rmdir $(DEPDIR)/gnuradio_swig_py_runtime-generate-lock; \
 	else \
-	    $(RM) $(DEPDIR)/gnuradio_swig_py_runtime_guile.S*; exit 1; \
+		while test -d $(DEPDIR)/gnuradio_swig_py_runtime-generate-lock; do \
+			sleep 1; \
+		done; \
+		test -f $(DEPDIR)/gnuradio_swig_py_runtime-generate-guile-stamp; \
+		exit $$?; \
 	fi;
-	touch $(DEPDIR)/gnuradio_swig_py_runtime-generate-guile-stamp
-	$(RM) $(DEPDIR)/gnuradio_swig_py_runtime_guile.d
-	cp $(DEPDIR)/gnuradio_swig_py_runtime_guile.Std $(DEPDIR)/gnuradio_swig_py_runtime_guile.d
-	echo "" >> $(DEPDIR)/gnuradio_swig_py_runtime_guile.d
-	$(SED) -e '1d;s, \\,,g;s, ,,g' < $(DEPDIR)/gnuradio_swig_py_runtime_guile.Std | \
-		awk '{ printf "%s:\n\n", $$0 }' >> $(DEPDIR)/gnuradio_swig_py_runtime_guile.d
-	$(RM) $(DEPDIR)/gnuradio_swig_py_runtime_guile.Std
-	touch $(DEPDIR)/gnuradio_swig_py_runtime-generate-guile-stamp
-
-@am__include@ @am__quote@./$(DEPDIR)/gnuradio_swig_py_runtime_guile.d@am__quote@
-endif
+endif				# end of GUILE
 
 $(DEPDIR)/gnuradio_swig_py_runtime-generate-python-stamp:
 ## This rule will be called only by the first process issuing the
@@ -299,6 +303,39 @@ $(DEPDIR)/gnuradio_swig_py_runtime-generate-python-stamp:
 
 @am__include@ @am__quote@./$(DEPDIR)/gnuradio_swig_py_runtime_python.d@am__quote@
 
+if GUILE
+$(DEPDIR)/gnuradio_swig_py_runtime-generate-guile-stamp:
+# the comments for the target above apply to this target as well, but it seemed
+# silly to include them twice. The only main change is for guile.
+	if $(SWIG) $(STD_SWIG_GUILE_ARGS) $(gnuradio_swig_py_runtime_swig_args) \
+		-MD -MF $(DEPDIR)/gnuradio_swig_py_runtime_guile.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_guile.Sd; \
+		$(SED) 's,\\\\,/,g' < $(DEPDIR)/gnuradio_swig_py_runtime_guile.Std \
+			> $(DEPDIR)/gnuradio_swig_py_runtime_guile.Sd; \
+		$(RM) $(DEPDIR)/gnuradio_swig_py_runtime_guile.Std; \
+		$(MV) $(DEPDIR)/gnuradio_swig_py_runtime_guile.Sd $(DEPDIR)/gnuradio_swig_py_runtime_guile.Std; \
+	    fi; \
+	else \
+	    $(RM) $(DEPDIR)/gnuradio_swig_py_runtime_guile.S*; exit 1; \
+	fi;
+	touch $(DEPDIR)/gnuradio_swig_py_runtime-generate-guile-stamp
+	$(RM) $(DEPDIR)/gnuradio_swig_py_runtime_guile.d
+	cp $(DEPDIR)/gnuradio_swig_py_runtime_guile.Std $(DEPDIR)/gnuradio_swig_py_runtime_guile.d
+	echo "" >> $(DEPDIR)/gnuradio_swig_py_runtime_guile.d
+	$(SED) -e '1d;s, \\,,g;s, ,,g' < $(DEPDIR)/gnuradio_swig_py_runtime_guile.Std | \
+		awk '{ printf "%s:\n\n", $$0 }' >> $(DEPDIR)/gnuradio_swig_py_runtime_guile.d
+	$(RM) $(DEPDIR)/gnuradio_swig_py_runtime_guile.Std
+	touch $(DEPDIR)/gnuradio_swig_py_runtime-generate-guile-stamp
+else
+	touch $(DEPDIR)/gnuradio_swig_py_runtime-generate-guile-stamp
+endif
+
+@am__include@ @am__quote@./$(DEPDIR)/gnuradio_swig_py_runtime_guile.d@am__quote@
+
+#gnuradio_swig_py_runtime_python.h: gnuradio_swig_py_runtime.i
+
 # -*- Makefile -*-
 #
 # Copyright 2009 Free Software Foundation, Inc.
@@ -339,6 +376,16 @@ gnuradio_swig_py_general_pylibdir_category ?= $(gnuradio_swig_py_general_pythond
 gnuradio_swig_py_general_pythondir = $(pythondir)/$(gnuradio_swig_py_general_pythondir_category)
 gnuradio_swig_py_general_pylibdir = $(pyexecdir)/$(gnuradio_swig_py_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_swig_py_general_scmlibdir = @GUILE_PKLIBDIR@/gnuradio
+
+# The scm files for the guile modules get installed where ever guile
+# is installed, usually /usr/share/guile/site/gnuradio_swig_py_general
+# FIXME: determince whether these should be installed with gnuradio.
+gnuradio_swig_py_general_scmdir = @GUILE_PKDATADIR@/gnuradio
+
 ## SWIG headers are always installed into the same directory.
 
 gnuradio_swig_py_general_swigincludedir = $(swigincludedir)
@@ -374,6 +421,9 @@ MOSTLYCLEANFILES += $(DEPDIR)/*.S*
 ## be added manually by the including Makefile.am .
 
 swig_built_sources += gnuradio_swig_py_general.py gnuradio_swig_py_general_python.cc
+if GUILE
+swig_built_sources += gnuradio_swig_py_general.scm gnuradio_swig_py_general_guile.cc
+endif
 
 ## Various SWIG variables.  These can be overloaded in the including
 ## Makefile.am by setting the variable value there, then including
@@ -407,11 +457,11 @@ gnuradio_swig_py_general_python_PYTHON =			\
 	$(gnuradio_swig_py_general_python)
 
 if GUILE
-gnuradio_swig_py_general_pylib_LTLIBRARIES += _gnuradio_swig_py_general_guile.la
-
+gnuradio_swig_py_general_scmlib_LTLIBRARIES = _gnuradio_swig_py_general_guile.la
 _gnuradio_swig_py_general_guile_la_SOURCES = 		\
-	gnuradio_swig_py_general_guile.cc		\
+	gnuradio_swig_py_general_guile.cc		        \
 	$(gnuradio_swig_py_general_la_swig_sources)
+gnuradio_swig_py_general_scm_DATA = gnuradio_swig_py_general.scm
 
 # Guile can use the same flags as python does
 _gnuradio_swig_py_general_guile_la_LIBADD = $(_gnuradio_swig_py_general_python_la_LIBADD)
@@ -422,7 +472,8 @@ endif				# end of GUILE
 
 ## Entry rule for running SWIG
 
-gnuradio_swig_py_general_python.h gnuradio_swig_py_general.py gnuradio_swig_py_general_python.cc gnuradio_swig_py_general_guile.cc gnuradio_swig_py_general_guile.h: gnuradio_swig_py_general.i
+# $(python_deps) $(guile_deps): gnuradio_swig_py_general.i
+gnuradio_swig_py_general_python.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:
 ##
@@ -479,7 +530,6 @@ gnuradio_swig_py_general_python.h gnuradio_swig_py_general.py gnuradio_swig_py_g
 ## Tell MAKE to run the rule for creating this stamp.
 ##
 		$(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
@@ -507,32 +557,23 @@ gnuradio_swig_py_general_python.h gnuradio_swig_py_general.py gnuradio_swig_py_g
 		exit $$?; \
 	fi;
 
-$(DEPDIR)/gnuradio_swig_py_general-generate-guile-stamp:
+# the comments for the target above apply to this target as well, but it seemed
+# silly to include them twice. The only main change is for guile.
+gnuradio_swig_py_general_guile.h gnuradio_swig_py_general.scm gnuradio_swig_py_general_guile.cc: gnuradio_swig_py_general.i
 if GUILE
-	if $(SWIG) $(STD_SWIG_GUILE_ARGS) $(gnuradio_swig_py_general_swig_args) \
-		-MD -MF $(DEPDIR)/gnuradio_swig_py_general_guile.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_guile.Sd; \
-		$(SED) 's,\\\\,/,g' < $(DEPDIR)/gnuradio_swig_py_general_guile.Std \
-			> $(DEPDIR)/gnuradio_swig_py_general_guile.Sd; \
-		$(RM) $(DEPDIR)/gnuradio_swig_py_general_guile.Std; \
-		$(MV) $(DEPDIR)/gnuradio_swig_py_general_guile.Sd $(DEPDIR)/gnuradio_swig_py_general_guile.Std; \
-	    fi; \
+	trap 'rm -rf $(DEPDIR)/gnuradio_swig_py_general-generate-*' 1 2 13 15; \
+	if mkdir $(DEPDIR)/gnuradio_swig_py_general-generate-lock 2>/dev/null; then \
+		rm -f $(DEPDIR)/gnuradio_swig_py_general-generate-*stamp; \
+		$(MAKE) $(AM_MAKEFLAGS) $(DEPDIR)/gnuradio_swig_py_general-generate-guile-stamp WHAT=$<; \
+		rmdir $(DEPDIR)/gnuradio_swig_py_general-generate-lock; \
 	else \
-	    $(RM) $(DEPDIR)/gnuradio_swig_py_general_guile.S*; exit 1; \
+		while test -d $(DEPDIR)/gnuradio_swig_py_general-generate-lock; do \
+			sleep 1; \
+		done; \
+		test -f $(DEPDIR)/gnuradio_swig_py_general-generate-guile-stamp; \
+		exit $$?; \
 	fi;
-	touch $(DEPDIR)/gnuradio_swig_py_general-generate-guile-stamp
-	$(RM) $(DEPDIR)/gnuradio_swig_py_general_guile.d
-	cp $(DEPDIR)/gnuradio_swig_py_general_guile.Std $(DEPDIR)/gnuradio_swig_py_general_guile.d
-	echo "" >> $(DEPDIR)/gnuradio_swig_py_general_guile.d
-	$(SED) -e '1d;s, \\,,g;s, ,,g' < $(DEPDIR)/gnuradio_swig_py_general_guile.Std | \
-		awk '{ printf "%s:\n\n", $$0 }' >> $(DEPDIR)/gnuradio_swig_py_general_guile.d
-	$(RM) $(DEPDIR)/gnuradio_swig_py_general_guile.Std
-	touch $(DEPDIR)/gnuradio_swig_py_general-generate-guile-stamp
-
-@am__include@ @am__quote@./$(DEPDIR)/gnuradio_swig_py_general_guile.d@am__quote@
-endif
+endif				# end of GUILE
 
 $(DEPDIR)/gnuradio_swig_py_general-generate-python-stamp:
 ## This rule will be called only by the first process issuing the
@@ -600,6 +641,39 @@ $(DEPDIR)/gnuradio_swig_py_general-generate-python-stamp:
 
 @am__include@ @am__quote@./$(DEPDIR)/gnuradio_swig_py_general_python.d@am__quote@
 
+if GUILE
+$(DEPDIR)/gnuradio_swig_py_general-generate-guile-stamp:
+# the comments for the target above apply to this target as well, but it seemed
+# silly to include them twice. The only main change is for guile.
+	if $(SWIG) $(STD_SWIG_GUILE_ARGS) $(gnuradio_swig_py_general_swig_args) \
+		-MD -MF $(DEPDIR)/gnuradio_swig_py_general_guile.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_guile.Sd; \
+		$(SED) 's,\\\\,/,g' < $(DEPDIR)/gnuradio_swig_py_general_guile.Std \
+			> $(DEPDIR)/gnuradio_swig_py_general_guile.Sd; \
+		$(RM) $(DEPDIR)/gnuradio_swig_py_general_guile.Std; \
+		$(MV) $(DEPDIR)/gnuradio_swig_py_general_guile.Sd $(DEPDIR)/gnuradio_swig_py_general_guile.Std; \
+	    fi; \
+	else \
+	    $(RM) $(DEPDIR)/gnuradio_swig_py_general_guile.S*; exit 1; \
+	fi;
+	touch $(DEPDIR)/gnuradio_swig_py_general-generate-guile-stamp
+	$(RM) $(DEPDIR)/gnuradio_swig_py_general_guile.d
+	cp $(DEPDIR)/gnuradio_swig_py_general_guile.Std $(DEPDIR)/gnuradio_swig_py_general_guile.d
+	echo "" >> $(DEPDIR)/gnuradio_swig_py_general_guile.d
+	$(SED) -e '1d;s, \\,,g;s, ,,g' < $(DEPDIR)/gnuradio_swig_py_general_guile.Std | \
+		awk '{ printf "%s:\n\n", $$0 }' >> $(DEPDIR)/gnuradio_swig_py_general_guile.d
+	$(RM) $(DEPDIR)/gnuradio_swig_py_general_guile.Std
+	touch $(DEPDIR)/gnuradio_swig_py_general-generate-guile-stamp
+else
+	touch $(DEPDIR)/gnuradio_swig_py_general-generate-guile-stamp
+endif
+
+@am__include@ @am__quote@./$(DEPDIR)/gnuradio_swig_py_general_guile.d@am__quote@
+
+#gnuradio_swig_py_runtime_python.h: gnuradio_swig_py_runtime.i
+
 # -*- Makefile -*-
 #
 # Copyright 2009 Free Software Foundation, Inc.
@@ -640,6 +714,16 @@ gnuradio_swig_py_gengen_pylibdir_category ?= $(gnuradio_swig_py_gengen_pythondir
 gnuradio_swig_py_gengen_pythondir = $(pythondir)/$(gnuradio_swig_py_gengen_pythondir_category)
 gnuradio_swig_py_gengen_pylibdir = $(pyexecdir)/$(gnuradio_swig_py_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_swig_py_gengen_scmlibdir = @GUILE_PKLIBDIR@/gnuradio
+
+# The scm files for the guile modules get installed where ever guile
+# is installed, usually /usr/share/guile/site/gnuradio_swig_py_gengen
+# FIXME: determince whether these should be installed with gnuradio.
+gnuradio_swig_py_gengen_scmdir = @GUILE_PKDATADIR@/gnuradio
+
 ## SWIG headers are always installed into the same directory.
 
 gnuradio_swig_py_gengen_swigincludedir = $(swigincludedir)
@@ -675,6 +759,9 @@ MOSTLYCLEANFILES += $(DEPDIR)/*.S*
 ## be added manually by the including Makefile.am .
 
 swig_built_sources += gnuradio_swig_py_gengen.py gnuradio_swig_py_gengen_python.cc
+if GUILE
+swig_built_sources += gnuradio_swig_py_gengen.scm gnuradio_swig_py_gengen_guile.cc
+endif
 
 ## Various SWIG variables.  These can be overloaded in the including
 ## Makefile.am by setting the variable value there, then including
@@ -708,11 +795,11 @@ gnuradio_swig_py_gengen_python_PYTHON =			\
 	$(gnuradio_swig_py_gengen_python)
 
 if GUILE
-gnuradio_swig_py_gengen_pylib_LTLIBRARIES += _gnuradio_swig_py_gengen_guile.la
-
+gnuradio_swig_py_gengen_scmlib_LTLIBRARIES = _gnuradio_swig_py_gengen_guile.la
 _gnuradio_swig_py_gengen_guile_la_SOURCES = 		\
-	gnuradio_swig_py_gengen_guile.cc		\
+	gnuradio_swig_py_gengen_guile.cc		        \
 	$(gnuradio_swig_py_gengen_la_swig_sources)
+gnuradio_swig_py_gengen_scm_DATA = gnuradio_swig_py_gengen.scm
 
 # Guile can use the same flags as python does
 _gnuradio_swig_py_gengen_guile_la_LIBADD = $(_gnuradio_swig_py_gengen_python_la_LIBADD)
@@ -723,7 +810,8 @@ endif				# end of GUILE
 
 ## Entry rule for running SWIG
 
-gnuradio_swig_py_gengen_python.h gnuradio_swig_py_gengen.py gnuradio_swig_py_gengen_python.cc gnuradio_swig_py_gengen_guile.cc gnuradio_swig_py_gengen_guile.h: gnuradio_swig_py_gengen.i
+# $(python_deps) $(guile_deps): gnuradio_swig_py_gengen.i
+gnuradio_swig_py_gengen_python.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:
 ##
@@ -780,7 +868,6 @@ gnuradio_swig_py_gengen_python.h gnuradio_swig_py_gengen.py gnuradio_swig_py_gen
 ## Tell MAKE to run the rule for creating this stamp.
 ##
 		$(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
@@ -808,32 +895,23 @@ gnuradio_swig_py_gengen_python.h gnuradio_swig_py_gengen.py gnuradio_swig_py_gen
 		exit $$?; \
 	fi;
 
-$(DEPDIR)/gnuradio_swig_py_gengen-generate-guile-stamp:
+# the comments for the target above apply to this target as well, but it seemed
+# silly to include them twice. The only main change is for guile.
+gnuradio_swig_py_gengen_guile.h gnuradio_swig_py_gengen.scm gnuradio_swig_py_gengen_guile.cc: gnuradio_swig_py_gengen.i
 if GUILE
-	if $(SWIG) $(STD_SWIG_GUILE_ARGS) $(gnuradio_swig_py_gengen_swig_args) \
-		-MD -MF $(DEPDIR)/gnuradio_swig_py_gengen_guile.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_guile.Sd; \
-		$(SED) 's,\\\\,/,g' < $(DEPDIR)/gnuradio_swig_py_gengen_guile.Std \
-			> $(DEPDIR)/gnuradio_swig_py_gengen_guile.Sd; \
-		$(RM) $(DEPDIR)/gnuradio_swig_py_gengen_guile.Std; \
-		$(MV) $(DEPDIR)/gnuradio_swig_py_gengen_guile.Sd $(DEPDIR)/gnuradio_swig_py_gengen_guile.Std; \
-	    fi; \
+	trap 'rm -rf $(DEPDIR)/gnuradio_swig_py_gengen-generate-*' 1 2 13 15; \
+	if mkdir $(DEPDIR)/gnuradio_swig_py_gengen-generate-lock 2>/dev/null; then \
+		rm -f $(DEPDIR)/gnuradio_swig_py_gengen-generate-*stamp; \
+		$(MAKE) $(AM_MAKEFLAGS) $(DEPDIR)/gnuradio_swig_py_gengen-generate-guile-stamp WHAT=$<; \
+		rmdir $(DEPDIR)/gnuradio_swig_py_gengen-generate-lock; \
 	else \
-	    $(RM) $(DEPDIR)/gnuradio_swig_py_gengen_guile.S*; exit 1; \
+		while test -d $(DEPDIR)/gnuradio_swig_py_gengen-generate-lock; do \
+			sleep 1; \
+		done; \
+		test -f $(DEPDIR)/gnuradio_swig_py_gengen-generate-guile-stamp; \
+		exit $$?; \
 	fi;
-	touch $(DEPDIR)/gnuradio_swig_py_gengen-generate-guile-stamp
-	$(RM) $(DEPDIR)/gnuradio_swig_py_gengen_guile.d
-	cp $(DEPDIR)/gnuradio_swig_py_gengen_guile.Std $(DEPDIR)/gnuradio_swig_py_gengen_guile.d
-	echo "" >> $(DEPDIR)/gnuradio_swig_py_gengen_guile.d
-	$(SED) -e '1d;s, \\,,g;s, ,,g' < $(DEPDIR)/gnuradio_swig_py_gengen_guile.Std | \
-		awk '{ printf "%s:\n\n", $$0 }' >> $(DEPDIR)/gnuradio_swig_py_gengen_guile.d
-	$(RM) $(DEPDIR)/gnuradio_swig_py_gengen_guile.Std
-	touch $(DEPDIR)/gnuradio_swig_py_gengen-generate-guile-stamp
-
-@am__include@ @am__quote@./$(DEPDIR)/gnuradio_swig_py_gengen_guile.d@am__quote@
-endif
+endif				# end of GUILE
 
 $(DEPDIR)/gnuradio_swig_py_gengen-generate-python-stamp:
 ## This rule will be called only by the first process issuing the
@@ -901,6 +979,39 @@ $(DEPDIR)/gnuradio_swig_py_gengen-generate-python-stamp:
 
 @am__include@ @am__quote@./$(DEPDIR)/gnuradio_swig_py_gengen_python.d@am__quote@
 
+if GUILE
+$(DEPDIR)/gnuradio_swig_py_gengen-generate-guile-stamp:
+# the comments for the target above apply to this target as well, but it seemed
+# silly to include them twice. The only main change is for guile.
+	if $(SWIG) $(STD_SWIG_GUILE_ARGS) $(gnuradio_swig_py_gengen_swig_args) \
+		-MD -MF $(DEPDIR)/gnuradio_swig_py_gengen_guile.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_guile.Sd; \
+		$(SED) 's,\\\\,/,g' < $(DEPDIR)/gnuradio_swig_py_gengen_guile.Std \
+			> $(DEPDIR)/gnuradio_swig_py_gengen_guile.Sd; \
+		$(RM) $(DEPDIR)/gnuradio_swig_py_gengen_guile.Std; \
+		$(MV) $(DEPDIR)/gnuradio_swig_py_gengen_guile.Sd $(DEPDIR)/gnuradio_swig_py_gengen_guile.Std; \
+	    fi; \
+	else \
+	    $(RM) $(DEPDIR)/gnuradio_swig_py_gengen_guile.S*; exit 1; \
+	fi;
+	touch $(DEPDIR)/gnuradio_swig_py_gengen-generate-guile-stamp
+	$(RM) $(DEPDIR)/gnuradio_swig_py_gengen_guile.d
+	cp $(DEPDIR)/gnuradio_swig_py_gengen_guile.Std $(DEPDIR)/gnuradio_swig_py_gengen_guile.d
+	echo "" >> $(DEPDIR)/gnuradio_swig_py_gengen_guile.d
+	$(SED) -e '1d;s, \\,,g;s, ,,g' < $(DEPDIR)/gnuradio_swig_py_gengen_guile.Std | \
+		awk '{ printf "%s:\n\n", $$0 }' >> $(DEPDIR)/gnuradio_swig_py_gengen_guile.d
+	$(RM) $(DEPDIR)/gnuradio_swig_py_gengen_guile.Std
+	touch $(DEPDIR)/gnuradio_swig_py_gengen-generate-guile-stamp
+else
+	touch $(DEPDIR)/gnuradio_swig_py_gengen-generate-guile-stamp
+endif
+
+@am__include@ @am__quote@./$(DEPDIR)/gnuradio_swig_py_gengen_guile.d@am__quote@
+
+#gnuradio_swig_py_runtime_python.h: gnuradio_swig_py_runtime.i
+
 # -*- Makefile -*-
 #
 # Copyright 2009 Free Software Foundation, Inc.
@@ -941,6 +1052,16 @@ gnuradio_swig_py_filter_pylibdir_category ?= $(gnuradio_swig_py_filter_pythondir
 gnuradio_swig_py_filter_pythondir = $(pythondir)/$(gnuradio_swig_py_filter_pythondir_category)
 gnuradio_swig_py_filter_pylibdir = $(pyexecdir)/$(gnuradio_swig_py_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_swig_py_filter_scmlibdir = @GUILE_PKLIBDIR@/gnuradio
+
+# The scm files for the guile modules get installed where ever guile
+# is installed, usually /usr/share/guile/site/gnuradio_swig_py_filter
+# FIXME: determince whether these should be installed with gnuradio.
+gnuradio_swig_py_filter_scmdir = @GUILE_PKDATADIR@/gnuradio
+
 ## SWIG headers are always installed into the same directory.
 
 gnuradio_swig_py_filter_swigincludedir = $(swigincludedir)
@@ -976,6 +1097,9 @@ MOSTLYCLEANFILES += $(DEPDIR)/*.S*
 ## be added manually by the including Makefile.am .
 
 swig_built_sources += gnuradio_swig_py_filter.py gnuradio_swig_py_filter_python.cc
+if GUILE
+swig_built_sources += gnuradio_swig_py_filter.scm gnuradio_swig_py_filter_guile.cc
+endif
 
 ## Various SWIG variables.  These can be overloaded in the including
 ## Makefile.am by setting the variable value there, then including
@@ -1009,11 +1133,11 @@ gnuradio_swig_py_filter_python_PYTHON =			\
 	$(gnuradio_swig_py_filter_python)
 
 if GUILE
-gnuradio_swig_py_filter_pylib_LTLIBRARIES += _gnuradio_swig_py_filter_guile.la
-
+gnuradio_swig_py_filter_scmlib_LTLIBRARIES = _gnuradio_swig_py_filter_guile.la
 _gnuradio_swig_py_filter_guile_la_SOURCES = 		\
-	gnuradio_swig_py_filter_guile.cc		\
+	gnuradio_swig_py_filter_guile.cc		        \
 	$(gnuradio_swig_py_filter_la_swig_sources)
+gnuradio_swig_py_filter_scm_DATA = gnuradio_swig_py_filter.scm
 
 # Guile can use the same flags as python does
 _gnuradio_swig_py_filter_guile_la_LIBADD = $(_gnuradio_swig_py_filter_python_la_LIBADD)
@@ -1024,7 +1148,8 @@ endif				# end of GUILE
 
 ## Entry rule for running SWIG
 
-gnuradio_swig_py_filter_python.h gnuradio_swig_py_filter.py gnuradio_swig_py_filter_python.cc gnuradio_swig_py_filter_guile.cc gnuradio_swig_py_filter_guile.h: gnuradio_swig_py_filter.i
+# $(python_deps) $(guile_deps): gnuradio_swig_py_filter.i
+gnuradio_swig_py_filter_python.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:
 ##
@@ -1081,7 +1206,6 @@ gnuradio_swig_py_filter_python.h gnuradio_swig_py_filter.py gnuradio_swig_py_fil
 ## Tell MAKE to run the rule for creating this stamp.
 ##
 		$(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
@@ -1109,32 +1233,23 @@ gnuradio_swig_py_filter_python.h gnuradio_swig_py_filter.py gnuradio_swig_py_fil
 		exit $$?; \
 	fi;
 
-$(DEPDIR)/gnuradio_swig_py_filter-generate-guile-stamp:
+# the comments for the target above apply to this target as well, but it seemed
+# silly to include them twice. The only main change is for guile.
+gnuradio_swig_py_filter_guile.h gnuradio_swig_py_filter.scm gnuradio_swig_py_filter_guile.cc: gnuradio_swig_py_filter.i
 if GUILE
-	if $(SWIG) $(STD_SWIG_GUILE_ARGS) $(gnuradio_swig_py_filter_swig_args) \
-		-MD -MF $(DEPDIR)/gnuradio_swig_py_filter_guile.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_guile.Sd; \
-		$(SED) 's,\\\\,/,g' < $(DEPDIR)/gnuradio_swig_py_filter_guile.Std \
-			> $(DEPDIR)/gnuradio_swig_py_filter_guile.Sd; \
-		$(RM) $(DEPDIR)/gnuradio_swig_py_filter_guile.Std; \
-		$(MV) $(DEPDIR)/gnuradio_swig_py_filter_guile.Sd $(DEPDIR)/gnuradio_swig_py_filter_guile.Std; \
-	    fi; \
+	trap 'rm -rf $(DEPDIR)/gnuradio_swig_py_filter-generate-*' 1 2 13 15; \
+	if mkdir $(DEPDIR)/gnuradio_swig_py_filter-generate-lock 2>/dev/null; then \
+		rm -f $(DEPDIR)/gnuradio_swig_py_filter-generate-*stamp; \
+		$(MAKE) $(AM_MAKEFLAGS) $(DEPDIR)/gnuradio_swig_py_filter-generate-guile-stamp WHAT=$<; \
+		rmdir $(DEPDIR)/gnuradio_swig_py_filter-generate-lock; \
 	else \
-	    $(RM) $(DEPDIR)/gnuradio_swig_py_filter_guile.S*; exit 1; \
+		while test -d $(DEPDIR)/gnuradio_swig_py_filter-generate-lock; do \
+			sleep 1; \
+		done; \
+		test -f $(DEPDIR)/gnuradio_swig_py_filter-generate-guile-stamp; \
+		exit $$?; \
 	fi;
-	touch $(DEPDIR)/gnuradio_swig_py_filter-generate-guile-stamp
-	$(RM) $(DEPDIR)/gnuradio_swig_py_filter_guile.d
-	cp $(DEPDIR)/gnuradio_swig_py_filter_guile.Std $(DEPDIR)/gnuradio_swig_py_filter_guile.d
-	echo "" >> $(DEPDIR)/gnuradio_swig_py_filter_guile.d
-	$(SED) -e '1d;s, \\,,g;s, ,,g' < $(DEPDIR)/gnuradio_swig_py_filter_guile.Std | \
-		awk '{ printf "%s:\n\n", $$0 }' >> $(DEPDIR)/gnuradio_swig_py_filter_guile.d
-	$(RM) $(DEPDIR)/gnuradio_swig_py_filter_guile.Std
-	touch $(DEPDIR)/gnuradio_swig_py_filter-generate-guile-stamp
-
-@am__include@ @am__quote@./$(DEPDIR)/gnuradio_swig_py_filter_guile.d@am__quote@
-endif
+endif				# end of GUILE
 
 $(DEPDIR)/gnuradio_swig_py_filter-generate-python-stamp:
 ## This rule will be called only by the first process issuing the
@@ -1202,6 +1317,39 @@ $(DEPDIR)/gnuradio_swig_py_filter-generate-python-stamp:
 
 @am__include@ @am__quote@./$(DEPDIR)/gnuradio_swig_py_filter_python.d@am__quote@
 
+if GUILE
+$(DEPDIR)/gnuradio_swig_py_filter-generate-guile-stamp:
+# the comments for the target above apply to this target as well, but it seemed
+# silly to include them twice. The only main change is for guile.
+	if $(SWIG) $(STD_SWIG_GUILE_ARGS) $(gnuradio_swig_py_filter_swig_args) \
+		-MD -MF $(DEPDIR)/gnuradio_swig_py_filter_guile.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_guile.Sd; \
+		$(SED) 's,\\\\,/,g' < $(DEPDIR)/gnuradio_swig_py_filter_guile.Std \
+			> $(DEPDIR)/gnuradio_swig_py_filter_guile.Sd; \
+		$(RM) $(DEPDIR)/gnuradio_swig_py_filter_guile.Std; \
+		$(MV) $(DEPDIR)/gnuradio_swig_py_filter_guile.Sd $(DEPDIR)/gnuradio_swig_py_filter_guile.Std; \
+	    fi; \
+	else \
+	    $(RM) $(DEPDIR)/gnuradio_swig_py_filter_guile.S*; exit 1; \
+	fi;
+	touch $(DEPDIR)/gnuradio_swig_py_filter-generate-guile-stamp
+	$(RM) $(DEPDIR)/gnuradio_swig_py_filter_guile.d
+	cp $(DEPDIR)/gnuradio_swig_py_filter_guile.Std $(DEPDIR)/gnuradio_swig_py_filter_guile.d
+	echo "" >> $(DEPDIR)/gnuradio_swig_py_filter_guile.d
+	$(SED) -e '1d;s, \\,,g;s, ,,g' < $(DEPDIR)/gnuradio_swig_py_filter_guile.Std | \
+		awk '{ printf "%s:\n\n", $$0 }' >> $(DEPDIR)/gnuradio_swig_py_filter_guile.d
+	$(RM) $(DEPDIR)/gnuradio_swig_py_filter_guile.Std
+	touch $(DEPDIR)/gnuradio_swig_py_filter-generate-guile-stamp
+else
+	touch $(DEPDIR)/gnuradio_swig_py_filter-generate-guile-stamp
+endif
+
+@am__include@ @am__quote@./$(DEPDIR)/gnuradio_swig_py_filter_guile.d@am__quote@
+
+#gnuradio_swig_py_runtime_python.h: gnuradio_swig_py_runtime.i
+
 # -*- Makefile -*-
 #
 # Copyright 2009 Free Software Foundation, Inc.
@@ -1242,6 +1390,16 @@ gnuradio_swig_py_io_pylibdir_category ?= $(gnuradio_swig_py_io_pythondir_categor
 gnuradio_swig_py_io_pythondir = $(pythondir)/$(gnuradio_swig_py_io_pythondir_category)
 gnuradio_swig_py_io_pylibdir = $(pyexecdir)/$(gnuradio_swig_py_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_swig_py_io_scmlibdir = @GUILE_PKLIBDIR@/gnuradio
+
+# The scm files for the guile modules get installed where ever guile
+# is installed, usually /usr/share/guile/site/gnuradio_swig_py_io
+# FIXME: determince whether these should be installed with gnuradio.
+gnuradio_swig_py_io_scmdir = @GUILE_PKDATADIR@/gnuradio
+
 ## SWIG headers are always installed into the same directory.
 
 gnuradio_swig_py_io_swigincludedir = $(swigincludedir)
@@ -1277,6 +1435,9 @@ MOSTLYCLEANFILES += $(DEPDIR)/*.S*
 ## be added manually by the including Makefile.am .
 
 swig_built_sources += gnuradio_swig_py_io.py gnuradio_swig_py_io_python.cc
+if GUILE
+swig_built_sources += gnuradio_swig_py_io.scm gnuradio_swig_py_io_guile.cc
+endif
 
 ## Various SWIG variables.  These can be overloaded in the including
 ## Makefile.am by setting the variable value there, then including
@@ -1310,11 +1471,11 @@ gnuradio_swig_py_io_python_PYTHON =			\
 	$(gnuradio_swig_py_io_python)
 
 if GUILE
-gnuradio_swig_py_io_pylib_LTLIBRARIES += _gnuradio_swig_py_io_guile.la
-
+gnuradio_swig_py_io_scmlib_LTLIBRARIES = _gnuradio_swig_py_io_guile.la
 _gnuradio_swig_py_io_guile_la_SOURCES = 		\
-	gnuradio_swig_py_io_guile.cc		\
+	gnuradio_swig_py_io_guile.cc		        \
 	$(gnuradio_swig_py_io_la_swig_sources)
+gnuradio_swig_py_io_scm_DATA = gnuradio_swig_py_io.scm
 
 # Guile can use the same flags as python does
 _gnuradio_swig_py_io_guile_la_LIBADD = $(_gnuradio_swig_py_io_python_la_LIBADD)
@@ -1325,7 +1486,8 @@ endif				# end of GUILE
 
 ## Entry rule for running SWIG
 
-gnuradio_swig_py_io_python.h gnuradio_swig_py_io.py gnuradio_swig_py_io_python.cc gnuradio_swig_py_io_guile.cc gnuradio_swig_py_io_guile.h: gnuradio_swig_py_io.i
+# $(python_deps) $(guile_deps): gnuradio_swig_py_io.i
+gnuradio_swig_py_io_python.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:
 ##
@@ -1382,7 +1544,6 @@ gnuradio_swig_py_io_python.h gnuradio_swig_py_io.py gnuradio_swig_py_io_python.c
 ## Tell MAKE to run the rule for creating this stamp.
 ##
 		$(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
@@ -1410,32 +1571,23 @@ gnuradio_swig_py_io_python.h gnuradio_swig_py_io.py gnuradio_swig_py_io_python.c
 		exit $$?; \
 	fi;
 
-$(DEPDIR)/gnuradio_swig_py_io-generate-guile-stamp:
+# the comments for the target above apply to this target as well, but it seemed
+# silly to include them twice. The only main change is for guile.
+gnuradio_swig_py_io_guile.h gnuradio_swig_py_io.scm gnuradio_swig_py_io_guile.cc: gnuradio_swig_py_io.i
 if GUILE
-	if $(SWIG) $(STD_SWIG_GUILE_ARGS) $(gnuradio_swig_py_io_swig_args) \
-		-MD -MF $(DEPDIR)/gnuradio_swig_py_io_guile.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_guile.Sd; \
-		$(SED) 's,\\\\,/,g' < $(DEPDIR)/gnuradio_swig_py_io_guile.Std \
-			> $(DEPDIR)/gnuradio_swig_py_io_guile.Sd; \
-		$(RM) $(DEPDIR)/gnuradio_swig_py_io_guile.Std; \
-		$(MV) $(DEPDIR)/gnuradio_swig_py_io_guile.Sd $(DEPDIR)/gnuradio_swig_py_io_guile.Std; \
-	    fi; \
+	trap 'rm -rf $(DEPDIR)/gnuradio_swig_py_io-generate-*' 1 2 13 15; \
+	if mkdir $(DEPDIR)/gnuradio_swig_py_io-generate-lock 2>/dev/null; then \
+		rm -f $(DEPDIR)/gnuradio_swig_py_io-generate-*stamp; \
+		$(MAKE) $(AM_MAKEFLAGS) $(DEPDIR)/gnuradio_swig_py_io-generate-guile-stamp WHAT=$<; \
+		rmdir $(DEPDIR)/gnuradio_swig_py_io-generate-lock; \
 	else \
-	    $(RM) $(DEPDIR)/gnuradio_swig_py_io_guile.S*; exit 1; \
+		while test -d $(DEPDIR)/gnuradio_swig_py_io-generate-lock; do \
+			sleep 1; \
+		done; \
+		test -f $(DEPDIR)/gnuradio_swig_py_io-generate-guile-stamp; \
+		exit $$?; \
 	fi;
-	touch $(DEPDIR)/gnuradio_swig_py_io-generate-guile-stamp
-	$(RM) $(DEPDIR)/gnuradio_swig_py_io_guile.d
-	cp $(DEPDIR)/gnuradio_swig_py_io_guile.Std $(DEPDIR)/gnuradio_swig_py_io_guile.d
-	echo "" >> $(DEPDIR)/gnuradio_swig_py_io_guile.d
-	$(SED) -e '1d;s, \\,,g;s, ,,g' < $(DEPDIR)/gnuradio_swig_py_io_guile.Std | \
-		awk '{ printf "%s:\n\n", $$0 }' >> $(DEPDIR)/gnuradio_swig_py_io_guile.d
-	$(RM) $(DEPDIR)/gnuradio_swig_py_io_guile.Std
-	touch $(DEPDIR)/gnuradio_swig_py_io-generate-guile-stamp
-
-@am__include@ @am__quote@./$(DEPDIR)/gnuradio_swig_py_io_guile.d@am__quote@
-endif
+endif				# end of GUILE
 
 $(DEPDIR)/gnuradio_swig_py_io-generate-python-stamp:
 ## This rule will be called only by the first process issuing the
@@ -1503,6 +1655,39 @@ $(DEPDIR)/gnuradio_swig_py_io-generate-python-stamp:
 
 @am__include@ @am__quote@./$(DEPDIR)/gnuradio_swig_py_io_python.d@am__quote@
 
+if GUILE
+$(DEPDIR)/gnuradio_swig_py_io-generate-guile-stamp:
+# the comments for the target above apply to this target as well, but it seemed
+# silly to include them twice. The only main change is for guile.
+	if $(SWIG) $(STD_SWIG_GUILE_ARGS) $(gnuradio_swig_py_io_swig_args) \
+		-MD -MF $(DEPDIR)/gnuradio_swig_py_io_guile.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_guile.Sd; \
+		$(SED) 's,\\\\,/,g' < $(DEPDIR)/gnuradio_swig_py_io_guile.Std \
+			> $(DEPDIR)/gnuradio_swig_py_io_guile.Sd; \
+		$(RM) $(DEPDIR)/gnuradio_swig_py_io_guile.Std; \
+		$(MV) $(DEPDIR)/gnuradio_swig_py_io_guile.Sd $(DEPDIR)/gnuradio_swig_py_io_guile.Std; \
+	    fi; \
+	else \
+	    $(RM) $(DEPDIR)/gnuradio_swig_py_io_guile.S*; exit 1; \
+	fi;
+	touch $(DEPDIR)/gnuradio_swig_py_io-generate-guile-stamp
+	$(RM) $(DEPDIR)/gnuradio_swig_py_io_guile.d
+	cp $(DEPDIR)/gnuradio_swig_py_io_guile.Std $(DEPDIR)/gnuradio_swig_py_io_guile.d
+	echo "" >> $(DEPDIR)/gnuradio_swig_py_io_guile.d
+	$(SED) -e '1d;s, \\,,g;s, ,,g' < $(DEPDIR)/gnuradio_swig_py_io_guile.Std | \
+		awk '{ printf "%s:\n\n", $$0 }' >> $(DEPDIR)/gnuradio_swig_py_io_guile.d
+	$(RM) $(DEPDIR)/gnuradio_swig_py_io_guile.Std
+	touch $(DEPDIR)/gnuradio_swig_py_io-generate-guile-stamp
+else
+	touch $(DEPDIR)/gnuradio_swig_py_io-generate-guile-stamp
+endif
+
+@am__include@ @am__quote@./$(DEPDIR)/gnuradio_swig_py_io_guile.d@am__quote@
+
+#gnuradio_swig_py_runtime_python.h: gnuradio_swig_py_runtime.i
+
 # -*- Makefile -*-
 #
 # Copyright 2009 Free Software Foundation, Inc.
@@ -1543,6 +1728,16 @@ gnuradio_swig_py_hier_pylibdir_category ?= $(gnuradio_swig_py_hier_pythondir_cat
 gnuradio_swig_py_hier_pythondir = $(pythondir)/$(gnuradio_swig_py_hier_pythondir_category)
 gnuradio_swig_py_hier_pylibdir = $(pyexecdir)/$(gnuradio_swig_py_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_swig_py_hier_scmlibdir = @GUILE_PKLIBDIR@/gnuradio
+
+# The scm files for the guile modules get installed where ever guile
+# is installed, usually /usr/share/guile/site/gnuradio_swig_py_hier
+# FIXME: determince whether these should be installed with gnuradio.
+gnuradio_swig_py_hier_scmdir = @GUILE_PKDATADIR@/gnuradio
+
 ## SWIG headers are always installed into the same directory.
 
 gnuradio_swig_py_hier_swigincludedir = $(swigincludedir)
@@ -1578,6 +1773,9 @@ MOSTLYCLEANFILES += $(DEPDIR)/*.S*
 ## be added manually by the including Makefile.am .
 
 swig_built_sources += gnuradio_swig_py_hier.py gnuradio_swig_py_hier_python.cc
+if GUILE
+swig_built_sources += gnuradio_swig_py_hier.scm gnuradio_swig_py_hier_guile.cc
+endif
 
 ## Various SWIG variables.  These can be overloaded in the including
 ## Makefile.am by setting the variable value there, then including
@@ -1611,11 +1809,11 @@ gnuradio_swig_py_hier_python_PYTHON =			\
 	$(gnuradio_swig_py_hier_python)
 
 if GUILE
-gnuradio_swig_py_hier_pylib_LTLIBRARIES += _gnuradio_swig_py_hier_guile.la
-
+gnuradio_swig_py_hier_scmlib_LTLIBRARIES = _gnuradio_swig_py_hier_guile.la
 _gnuradio_swig_py_hier_guile_la_SOURCES = 		\
-	gnuradio_swig_py_hier_guile.cc		\
+	gnuradio_swig_py_hier_guile.cc		        \
 	$(gnuradio_swig_py_hier_la_swig_sources)
+gnuradio_swig_py_hier_scm_DATA = gnuradio_swig_py_hier.scm
 
 # Guile can use the same flags as python does
 _gnuradio_swig_py_hier_guile_la_LIBADD = $(_gnuradio_swig_py_hier_python_la_LIBADD)
@@ -1626,7 +1824,8 @@ endif				# end of GUILE
 
 ## Entry rule for running SWIG
 
-gnuradio_swig_py_hier_python.h gnuradio_swig_py_hier.py gnuradio_swig_py_hier_python.cc gnuradio_swig_py_hier_guile.cc gnuradio_swig_py_hier_guile.h: gnuradio_swig_py_hier.i
+# $(python_deps) $(guile_deps): gnuradio_swig_py_hier.i
+gnuradio_swig_py_hier_python.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:
 ##
@@ -1683,7 +1882,6 @@ gnuradio_swig_py_hier_python.h gnuradio_swig_py_hier.py gnuradio_swig_py_hier_py
 ## Tell MAKE to run the rule for creating this stamp.
 ##
 		$(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
@@ -1711,32 +1909,23 @@ gnuradio_swig_py_hier_python.h gnuradio_swig_py_hier.py gnuradio_swig_py_hier_py
 		exit $$?; \
 	fi;
 
-$(DEPDIR)/gnuradio_swig_py_hier-generate-guile-stamp:
+# the comments for the target above apply to this target as well, but it seemed
+# silly to include them twice. The only main change is for guile.
+gnuradio_swig_py_hier_guile.h gnuradio_swig_py_hier.scm gnuradio_swig_py_hier_guile.cc: gnuradio_swig_py_hier.i
 if GUILE
-	if $(SWIG) $(STD_SWIG_GUILE_ARGS) $(gnuradio_swig_py_hier_swig_args) \
-		-MD -MF $(DEPDIR)/gnuradio_swig_py_hier_guile.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_guile.Sd; \
-		$(SED) 's,\\\\,/,g' < $(DEPDIR)/gnuradio_swig_py_hier_guile.Std \
-			> $(DEPDIR)/gnuradio_swig_py_hier_guile.Sd; \
-		$(RM) $(DEPDIR)/gnuradio_swig_py_hier_guile.Std; \
-		$(MV) $(DEPDIR)/gnuradio_swig_py_hier_guile.Sd $(DEPDIR)/gnuradio_swig_py_hier_guile.Std; \
-	    fi; \
+	trap 'rm -rf $(DEPDIR)/gnuradio_swig_py_hier-generate-*' 1 2 13 15; \
+	if mkdir $(DEPDIR)/gnuradio_swig_py_hier-generate-lock 2>/dev/null; then \
+		rm -f $(DEPDIR)/gnuradio_swig_py_hier-generate-*stamp; \
+		$(MAKE) $(AM_MAKEFLAGS) $(DEPDIR)/gnuradio_swig_py_hier-generate-guile-stamp WHAT=$<; \
+		rmdir $(DEPDIR)/gnuradio_swig_py_hier-generate-lock; \
 	else \
-	    $(RM) $(DEPDIR)/gnuradio_swig_py_hier_guile.S*; exit 1; \
+		while test -d $(DEPDIR)/gnuradio_swig_py_hier-generate-lock; do \
+			sleep 1; \
+		done; \
+		test -f $(DEPDIR)/gnuradio_swig_py_hier-generate-guile-stamp; \
+		exit $$?; \
 	fi;
-	touch $(DEPDIR)/gnuradio_swig_py_hier-generate-guile-stamp
-	$(RM) $(DEPDIR)/gnuradio_swig_py_hier_guile.d
-	cp $(DEPDIR)/gnuradio_swig_py_hier_guile.Std $(DEPDIR)/gnuradio_swig_py_hier_guile.d
-	echo "" >> $(DEPDIR)/gnuradio_swig_py_hier_guile.d
-	$(SED) -e '1d;s, \\,,g;s, ,,g' < $(DEPDIR)/gnuradio_swig_py_hier_guile.Std | \
-		awk '{ printf "%s:\n\n", $$0 }' >> $(DEPDIR)/gnuradio_swig_py_hier_guile.d
-	$(RM) $(DEPDIR)/gnuradio_swig_py_hier_guile.Std
-	touch $(DEPDIR)/gnuradio_swig_py_hier-generate-guile-stamp
-
-@am__include@ @am__quote@./$(DEPDIR)/gnuradio_swig_py_hier_guile.d@am__quote@
-endif
+endif				# end of GUILE
 
 $(DEPDIR)/gnuradio_swig_py_hier-generate-python-stamp:
 ## This rule will be called only by the first process issuing the
@@ -1804,3 +1993,36 @@ $(DEPDIR)/gnuradio_swig_py_hier-generate-python-stamp:
 
 @am__include@ @am__quote@./$(DEPDIR)/gnuradio_swig_py_hier_python.d@am__quote@
 
+if GUILE
+$(DEPDIR)/gnuradio_swig_py_hier-generate-guile-stamp:
+# the comments for the target above apply to this target as well, but it seemed
+# silly to include them twice. The only main change is for guile.
+	if $(SWIG) $(STD_SWIG_GUILE_ARGS) $(gnuradio_swig_py_hier_swig_args) \
+		-MD -MF $(DEPDIR)/gnuradio_swig_py_hier_guile.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_guile.Sd; \
+		$(SED) 's,\\\\,/,g' < $(DEPDIR)/gnuradio_swig_py_hier_guile.Std \
+			> $(DEPDIR)/gnuradio_swig_py_hier_guile.Sd; \
+		$(RM) $(DEPDIR)/gnuradio_swig_py_hier_guile.Std; \
+		$(MV) $(DEPDIR)/gnuradio_swig_py_hier_guile.Sd $(DEPDIR)/gnuradio_swig_py_hier_guile.Std; \
+	    fi; \
+	else \
+	    $(RM) $(DEPDIR)/gnuradio_swig_py_hier_guile.S*; exit 1; \
+	fi;
+	touch $(DEPDIR)/gnuradio_swig_py_hier-generate-guile-stamp
+	$(RM) $(DEPDIR)/gnuradio_swig_py_hier_guile.d
+	cp $(DEPDIR)/gnuradio_swig_py_hier_guile.Std $(DEPDIR)/gnuradio_swig_py_hier_guile.d
+	echo "" >> $(DEPDIR)/gnuradio_swig_py_hier_guile.d
+	$(SED) -e '1d;s, \\,,g;s, ,,g' < $(DEPDIR)/gnuradio_swig_py_hier_guile.Std | \
+		awk '{ printf "%s:\n\n", $$0 }' >> $(DEPDIR)/gnuradio_swig_py_hier_guile.d
+	$(RM) $(DEPDIR)/gnuradio_swig_py_hier_guile.Std
+	touch $(DEPDIR)/gnuradio_swig_py_hier-generate-guile-stamp
+else
+	touch $(DEPDIR)/gnuradio_swig_py_hier-generate-guile-stamp
+endif
+
+@am__include@ @am__quote@./$(DEPDIR)/gnuradio_swig_py_hier_guile.d@am__quote@
+
+#gnuradio_swig_py_runtime_python.h: gnuradio_swig_py_runtime.i
+