14 files changed, 200 insertions, 540 deletions
diff --git a/gnuradio-core/src/lib/swig/Makefile.swig.gen b/gnuradio-core/src/lib/swig/Makefile.swig.gen
index a92ff22314..0803cbfee0 100644
--- a/gnuradio-core/src/lib/swig/Makefile.swig.gen
+++ b/gnuradio-core/src/lib/swig/Makefile.swig.gen
@@ -67,28 +67,10 @@ gnuradio_core_runtime_swigincludedir = $(swigincludedir)
 ## 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)/gnuradio_core_runtime-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 .
-
-# generating the py or scm file also generates the .cc or .h files,
-# but dependencies work better without the .cc ort .h files listed.
-# swig_built_sources += gnuradio_core_runtime.py
-# if GUILE
-# swig_built_sources += gnuradio/gnuradio_core_runtime.scm
-# endif
-
 ## Various SWIG variables.  These can be overloaded in the including
 ## Makefile.am by setting the variable value there, then including
 ## Makefile.swig .
@@ -108,8 +90,6 @@ _gnuradio_core_runtime_la_LIBADD =			\
 	$(STD_SWIG_LA_LIB_ADD)		\
 	$(gnuradio_core_runtime_la_swig_libadd)
 
-# _gnuradio_core_runtime_la_DEPENDENCIES = python/gnuradio_core_runtime.lo
-
 _gnuradio_core_runtime_la_LDFLAGS =			\
 	$(STD_SWIG_LA_LD_FLAGS)		\
 	$(gnuradio_core_runtime_la_swig_ldflags)
@@ -123,14 +103,20 @@ gnuradio_core_runtime_python_PYTHON =			\
 	gnuradio_core_runtime.py			\
 	$(gnuradio_core_runtime)
 
+python/gnuradio_core_runtime.cc: gnuradio_core_runtime.py
+gnuradio_core_runtime.py: gnuradio_core_runtime.i
+
+# Include the python dependencies for this file
+-include python/gnuradio_core_runtime.d
+# end of PYTHON
+
 if GUILE
 gnuradio_core_runtime_scmlib_LTLIBRARIES = libguile-gnuradio_core_runtime.la
-libguile_gnuradio_core_runtime_la_SOURCES = 		\
-	guile/gnuradio_core_runtime.cc			\
+libguile_gnuradio_core_runtime_la_SOURCES = \
+	guile/gnuradio_core_runtime.cc				       \
 	$(gnuradio_core_runtime_la_swig_sources)
 nobase_gnuradio_core_runtime_scm_DATA = gnuradio/gnuradio_core_runtime.scm gnuradio/gnuradio_core_runtime-primitive.scm
 
-# Guile can use the same flags as python does
 libguile_gnuradio_core_runtime_la_LIBADD = $(_gnuradio_core_runtime_la_LIBADD)
 libguile_gnuradio_core_runtime_la_LDFLAGS = $(_gnuradio_core_runtime_la_LDFLAGS)
 libguile_gnuradio_core_runtime_la_CXXFLAGS = $(_gnuradio_core_runtime_la_CXXFLAGS)
@@ -139,14 +125,11 @@ guile/gnuradio_core_runtime.cc: gnuradio/gnuradio_core_runtime.scm
 gnuradio/gnuradio_core_runtime.scm: gnuradio_core_runtime.i
 gnuradio/gnuradio_core_runtime-primitive.scm: gnuradio/gnuradio_core_runtime.scm
 
+# Include the guile dependencies for this file
 -include guile/gnuradio_core_runtime.d
 
 endif				# end of GUILE
 
-gnuradio_core_runtime.lo: gnuradio_core_runtime.py gnuradio_core_runtime.scm
-gnuradio_core_runtime.py: gnuradio_core_runtime.i
-
--include python/gnuradio_core_runtime.d
 
 # -*- Makefile -*-
 #
@@ -217,28 +200,10 @@ gnuradio_core_general_swigincludedir = $(swigincludedir)
 ## 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)/gnuradio_core_general-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 .
-
-# generating the py or scm file also generates the .cc or .h files,
-# but dependencies work better without the .cc ort .h files listed.
-# swig_built_sources += gnuradio_core_general.py
-# if GUILE
-# swig_built_sources += gnuradio/gnuradio_core_general.scm
-# endif
-
 ## Various SWIG variables.  These can be overloaded in the including
 ## Makefile.am by setting the variable value there, then including
 ## Makefile.swig .
@@ -258,8 +223,6 @@ _gnuradio_core_general_la_LIBADD =			\
 	$(STD_SWIG_LA_LIB_ADD)		\
 	$(gnuradio_core_general_la_swig_libadd)
 
-# _gnuradio_core_general_la_DEPENDENCIES = python/gnuradio_core_general.lo
-
 _gnuradio_core_general_la_LDFLAGS =			\
 	$(STD_SWIG_LA_LD_FLAGS)		\
 	$(gnuradio_core_general_la_swig_ldflags)
@@ -273,14 +236,20 @@ gnuradio_core_general_python_PYTHON =			\
 	gnuradio_core_general.py			\
 	$(gnuradio_core_general)
 
+python/gnuradio_core_general.cc: gnuradio_core_general.py
+gnuradio_core_general.py: gnuradio_core_general.i
+
+# Include the python dependencies for this file
+-include python/gnuradio_core_general.d
+# end of PYTHON
+
 if GUILE
 gnuradio_core_general_scmlib_LTLIBRARIES = libguile-gnuradio_core_general.la
-libguile_gnuradio_core_general_la_SOURCES = 		\
-	guile/gnuradio_core_general.cc			\
+libguile_gnuradio_core_general_la_SOURCES = \
+	guile/gnuradio_core_general.cc				       \
 	$(gnuradio_core_general_la_swig_sources)
 nobase_gnuradio_core_general_scm_DATA = gnuradio/gnuradio_core_general.scm gnuradio/gnuradio_core_general-primitive.scm
 
-# Guile can use the same flags as python does
 libguile_gnuradio_core_general_la_LIBADD = $(_gnuradio_core_general_la_LIBADD)
 libguile_gnuradio_core_general_la_LDFLAGS = $(_gnuradio_core_general_la_LDFLAGS)
 libguile_gnuradio_core_general_la_CXXFLAGS = $(_gnuradio_core_general_la_CXXFLAGS)
@@ -289,14 +258,11 @@ guile/gnuradio_core_general.cc: gnuradio/gnuradio_core_general.scm
 gnuradio/gnuradio_core_general.scm: gnuradio_core_general.i
 gnuradio/gnuradio_core_general-primitive.scm: gnuradio/gnuradio_core_general.scm
 
+# Include the guile dependencies for this file
 -include guile/gnuradio_core_general.d
 
 endif				# end of GUILE
 
-gnuradio_core_general.lo: gnuradio_core_general.py gnuradio_core_general.scm
-gnuradio_core_general.py: gnuradio_core_general.i
-
--include python/gnuradio_core_general.d
 
 # -*- Makefile -*-
 #
@@ -367,28 +333,10 @@ gnuradio_core_gengen_swigincludedir = $(swigincludedir)
 ## 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)/gnuradio_core_gengen-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 .
-
-# generating the py or scm file also generates the .cc or .h files,
-# but dependencies work better without the .cc ort .h files listed.
-# swig_built_sources += gnuradio_core_gengen.py
-# if GUILE
-# swig_built_sources += gnuradio/gnuradio_core_gengen.scm
-# endif
-
 ## Various SWIG variables.  These can be overloaded in the including
 ## Makefile.am by setting the variable value there, then including
 ## Makefile.swig .
@@ -408,8 +356,6 @@ _gnuradio_core_gengen_la_LIBADD =			\
 	$(STD_SWIG_LA_LIB_ADD)		\
 	$(gnuradio_core_gengen_la_swig_libadd)
 
-# _gnuradio_core_gengen_la_DEPENDENCIES = python/gnuradio_core_gengen.lo
-
 _gnuradio_core_gengen_la_LDFLAGS =			\
 	$(STD_SWIG_LA_LD_FLAGS)		\
 	$(gnuradio_core_gengen_la_swig_ldflags)
@@ -423,14 +369,20 @@ gnuradio_core_gengen_python_PYTHON =			\
 	gnuradio_core_gengen.py			\
 	$(gnuradio_core_gengen)
 
+python/gnuradio_core_gengen.cc: gnuradio_core_gengen.py
+gnuradio_core_gengen.py: gnuradio_core_gengen.i
+
+# Include the python dependencies for this file
+-include python/gnuradio_core_gengen.d
+# end of PYTHON
+
 if GUILE
 gnuradio_core_gengen_scmlib_LTLIBRARIES = libguile-gnuradio_core_gengen.la
-libguile_gnuradio_core_gengen_la_SOURCES = 		\
-	guile/gnuradio_core_gengen.cc			\
+libguile_gnuradio_core_gengen_la_SOURCES = \
+	guile/gnuradio_core_gengen.cc				       \
 	$(gnuradio_core_gengen_la_swig_sources)
 nobase_gnuradio_core_gengen_scm_DATA = gnuradio/gnuradio_core_gengen.scm gnuradio/gnuradio_core_gengen-primitive.scm
 
-# Guile can use the same flags as python does
 libguile_gnuradio_core_gengen_la_LIBADD = $(_gnuradio_core_gengen_la_LIBADD)
 libguile_gnuradio_core_gengen_la_LDFLAGS = $(_gnuradio_core_gengen_la_LDFLAGS)
 libguile_gnuradio_core_gengen_la_CXXFLAGS = $(_gnuradio_core_gengen_la_CXXFLAGS)
@@ -439,14 +391,11 @@ guile/gnuradio_core_gengen.cc: gnuradio/gnuradio_core_gengen.scm
 gnuradio/gnuradio_core_gengen.scm: gnuradio_core_gengen.i
 gnuradio/gnuradio_core_gengen-primitive.scm: gnuradio/gnuradio_core_gengen.scm
 
+# Include the guile dependencies for this file
 -include guile/gnuradio_core_gengen.d
 
 endif				# end of GUILE
 
-gnuradio_core_gengen.lo: gnuradio_core_gengen.py gnuradio_core_gengen.scm
-gnuradio_core_gengen.py: gnuradio_core_gengen.i
-
--include python/gnuradio_core_gengen.d
 
 # -*- Makefile -*-
 #
@@ -517,28 +466,10 @@ gnuradio_core_filter_swigincludedir = $(swigincludedir)
 ## 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)/gnuradio_core_filter-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 .
-
-# generating the py or scm file also generates the .cc or .h files,
-# but dependencies work better without the .cc ort .h files listed.
-# swig_built_sources += gnuradio_core_filter.py
-# if GUILE
-# swig_built_sources += gnuradio/gnuradio_core_filter.scm
-# endif
-
 ## Various SWIG variables.  These can be overloaded in the including
 ## Makefile.am by setting the variable value there, then including
 ## Makefile.swig .
@@ -558,8 +489,6 @@ _gnuradio_core_filter_la_LIBADD =			\
 	$(STD_SWIG_LA_LIB_ADD)		\
 	$(gnuradio_core_filter_la_swig_libadd)
 
-# _gnuradio_core_filter_la_DEPENDENCIES = python/gnuradio_core_filter.lo
-
 _gnuradio_core_filter_la_LDFLAGS =			\
 	$(STD_SWIG_LA_LD_FLAGS)		\
 	$(gnuradio_core_filter_la_swig_ldflags)
@@ -573,14 +502,20 @@ gnuradio_core_filter_python_PYTHON =			\
 	gnuradio_core_filter.py			\
 	$(gnuradio_core_filter)
 
+python/gnuradio_core_filter.cc: gnuradio_core_filter.py
+gnuradio_core_filter.py: gnuradio_core_filter.i
+
+# Include the python dependencies for this file
+-include python/gnuradio_core_filter.d
+# end of PYTHON
+
 if GUILE
 gnuradio_core_filter_scmlib_LTLIBRARIES = libguile-gnuradio_core_filter.la
-libguile_gnuradio_core_filter_la_SOURCES = 		\
-	guile/gnuradio_core_filter.cc			\
+libguile_gnuradio_core_filter_la_SOURCES = \
+	guile/gnuradio_core_filter.cc				       \
 	$(gnuradio_core_filter_la_swig_sources)
 nobase_gnuradio_core_filter_scm_DATA = gnuradio/gnuradio_core_filter.scm gnuradio/gnuradio_core_filter-primitive.scm
 
-# Guile can use the same flags as python does
 libguile_gnuradio_core_filter_la_LIBADD = $(_gnuradio_core_filter_la_LIBADD)
 libguile_gnuradio_core_filter_la_LDFLAGS = $(_gnuradio_core_filter_la_LDFLAGS)
 libguile_gnuradio_core_filter_la_CXXFLAGS = $(_gnuradio_core_filter_la_CXXFLAGS)
@@ -589,14 +524,11 @@ guile/gnuradio_core_filter.cc: gnuradio/gnuradio_core_filter.scm
 gnuradio/gnuradio_core_filter.scm: gnuradio_core_filter.i
 gnuradio/gnuradio_core_filter-primitive.scm: gnuradio/gnuradio_core_filter.scm
 
+# Include the guile dependencies for this file
 -include guile/gnuradio_core_filter.d
 
 endif				# end of GUILE
 
-gnuradio_core_filter.lo: gnuradio_core_filter.py gnuradio_core_filter.scm
-gnuradio_core_filter.py: gnuradio_core_filter.i
-
--include python/gnuradio_core_filter.d
 
 # -*- Makefile -*-
 #
@@ -667,28 +599,10 @@ gnuradio_core_io_swigincludedir = $(swigincludedir)
 ## 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)/gnuradio_core_io-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 .
-
-# generating the py or scm file also generates the .cc or .h files,
-# but dependencies work better without the .cc ort .h files listed.
-# swig_built_sources += gnuradio_core_io.py
-# if GUILE
-# swig_built_sources += gnuradio/gnuradio_core_io.scm
-# endif
-
 ## Various SWIG variables.  These can be overloaded in the including
 ## Makefile.am by setting the variable value there, then including
 ## Makefile.swig .
@@ -708,8 +622,6 @@ _gnuradio_core_io_la_LIBADD =			\
 	$(STD_SWIG_LA_LIB_ADD)		\
 	$(gnuradio_core_io_la_swig_libadd)
 
-# _gnuradio_core_io_la_DEPENDENCIES = python/gnuradio_core_io.lo
-
 _gnuradio_core_io_la_LDFLAGS =			\
 	$(STD_SWIG_LA_LD_FLAGS)		\
 	$(gnuradio_core_io_la_swig_ldflags)
@@ -723,14 +635,20 @@ gnuradio_core_io_python_PYTHON =			\
 	gnuradio_core_io.py			\
 	$(gnuradio_core_io)
 
+python/gnuradio_core_io.cc: gnuradio_core_io.py
+gnuradio_core_io.py: gnuradio_core_io.i
+
+# Include the python dependencies for this file
+-include python/gnuradio_core_io.d
+# end of PYTHON
+
 if GUILE
 gnuradio_core_io_scmlib_LTLIBRARIES = libguile-gnuradio_core_io.la
-libguile_gnuradio_core_io_la_SOURCES = 		\
-	guile/gnuradio_core_io.cc			\
+libguile_gnuradio_core_io_la_SOURCES = \
+	guile/gnuradio_core_io.cc				       \
 	$(gnuradio_core_io_la_swig_sources)
 nobase_gnuradio_core_io_scm_DATA = gnuradio/gnuradio_core_io.scm gnuradio/gnuradio_core_io-primitive.scm
 
-# Guile can use the same flags as python does
 libguile_gnuradio_core_io_la_LIBADD = $(_gnuradio_core_io_la_LIBADD)
 libguile_gnuradio_core_io_la_LDFLAGS = $(_gnuradio_core_io_la_LDFLAGS)
 libguile_gnuradio_core_io_la_CXXFLAGS = $(_gnuradio_core_io_la_CXXFLAGS)
@@ -739,14 +657,11 @@ guile/gnuradio_core_io.cc: gnuradio/gnuradio_core_io.scm
 gnuradio/gnuradio_core_io.scm: gnuradio_core_io.i
 gnuradio/gnuradio_core_io-primitive.scm: gnuradio/gnuradio_core_io.scm
 
+# Include the guile dependencies for this file
 -include guile/gnuradio_core_io.d
 
 endif				# end of GUILE
 
-gnuradio_core_io.lo: gnuradio_core_io.py gnuradio_core_io.scm
-gnuradio_core_io.py: gnuradio_core_io.i
-
--include python/gnuradio_core_io.d
 
 # -*- Makefile -*-
 #
@@ -817,28 +732,10 @@ gnuradio_core_hier_swigincludedir = $(swigincludedir)
 ## 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)/gnuradio_core_hier-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 .
-
-# generating the py or scm file also generates the .cc or .h files,
-# but dependencies work better without the .cc ort .h files listed.
-# swig_built_sources += gnuradio_core_hier.py
-# if GUILE
-# swig_built_sources += gnuradio/gnuradio_core_hier.scm
-# endif
-
 ## Various SWIG variables.  These can be overloaded in the including
 ## Makefile.am by setting the variable value there, then including
 ## Makefile.swig .
@@ -858,8 +755,6 @@ _gnuradio_core_hier_la_LIBADD =			\
 	$(STD_SWIG_LA_LIB_ADD)		\
 	$(gnuradio_core_hier_la_swig_libadd)
 
-# _gnuradio_core_hier_la_DEPENDENCIES = python/gnuradio_core_hier.lo
-
 _gnuradio_core_hier_la_LDFLAGS =			\
 	$(STD_SWIG_LA_LD_FLAGS)		\
 	$(gnuradio_core_hier_la_swig_ldflags)
@@ -873,14 +768,20 @@ gnuradio_core_hier_python_PYTHON =			\
 	gnuradio_core_hier.py			\
 	$(gnuradio_core_hier)
 
+python/gnuradio_core_hier.cc: gnuradio_core_hier.py
+gnuradio_core_hier.py: gnuradio_core_hier.i
+
+# Include the python dependencies for this file
+-include python/gnuradio_core_hier.d
+# end of PYTHON
+
 if GUILE
 gnuradio_core_hier_scmlib_LTLIBRARIES = libguile-gnuradio_core_hier.la
-libguile_gnuradio_core_hier_la_SOURCES = 		\
-	guile/gnuradio_core_hier.cc			\
+libguile_gnuradio_core_hier_la_SOURCES = \
+	guile/gnuradio_core_hier.cc				       \
 	$(gnuradio_core_hier_la_swig_sources)
 nobase_gnuradio_core_hier_scm_DATA = gnuradio/gnuradio_core_hier.scm gnuradio/gnuradio_core_hier-primitive.scm
 
-# Guile can use the same flags as python does
 libguile_gnuradio_core_hier_la_LIBADD = $(_gnuradio_core_hier_la_LIBADD)
 libguile_gnuradio_core_hier_la_LDFLAGS = $(_gnuradio_core_hier_la_LDFLAGS)
 libguile_gnuradio_core_hier_la_CXXFLAGS = $(_gnuradio_core_hier_la_CXXFLAGS)
@@ -889,12 +790,9 @@ guile/gnuradio_core_hier.cc: gnuradio/gnuradio_core_hier.scm
 gnuradio/gnuradio_core_hier.scm: gnuradio_core_hier.i
 gnuradio/gnuradio_core_hier-primitive.scm: gnuradio/gnuradio_core_hier.scm
 
+# Include the guile dependencies for this file
 -include guile/gnuradio_core_hier.d
 
 endif				# end of GUILE
 
-gnuradio_core_hier.lo: gnuradio_core_hier.py gnuradio_core_hier.scm
-gnuradio_core_hier.py: gnuradio_core_hier.i
-
--include python/gnuradio_core_hier.d
 
diff --git a/gr-atsc/src/lib/Makefile.swig.gen b/gr-atsc/src/lib/Makefile.swig.gen
index f4667c5c6a..8b53ada781 100644
--- a/gr-atsc/src/lib/Makefile.swig.gen
+++ b/gr-atsc/src/lib/Makefile.swig.gen
@@ -67,28 +67,10 @@ atsc_swigincludedir = $(swigincludedir)
 ## 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)/atsc-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 .
-
-# generating the py or scm file also generates the .cc or .h files,
-# but dependencies work better without the .cc ort .h files listed.
-# swig_built_sources += atsc.py
-# if GUILE
-# swig_built_sources += gnuradio/atsc.scm
-# endif
-
 ## Various SWIG variables.  These can be overloaded in the including
 ## Makefile.am by setting the variable value there, then including
 ## Makefile.swig .
@@ -108,8 +90,6 @@ _atsc_la_LIBADD =			\
 	$(STD_SWIG_LA_LIB_ADD)		\
 	$(atsc_la_swig_libadd)
 
-# _atsc_la_DEPENDENCIES = python/atsc.lo
-
 _atsc_la_LDFLAGS =			\
 	$(STD_SWIG_LA_LD_FLAGS)		\
 	$(atsc_la_swig_ldflags)
@@ -123,14 +103,20 @@ atsc_python_PYTHON =			\
 	atsc.py			\
 	$(atsc)
 
+python/atsc.cc: atsc.py
+atsc.py: atsc.i
+
+# Include the python dependencies for this file
+-include python/atsc.d
+# end of PYTHON
+
 if GUILE
 atsc_scmlib_LTLIBRARIES = libguile-atsc.la
-libguile_atsc_la_SOURCES = 		\
-	guile/atsc.cc			\
+libguile_atsc_la_SOURCES = \
+	guile/atsc.cc				       \
 	$(atsc_la_swig_sources)
 nobase_atsc_scm_DATA = gnuradio/atsc.scm gnuradio/atsc-primitive.scm
 
-# Guile can use the same flags as python does
 libguile_atsc_la_LIBADD = $(_atsc_la_LIBADD)
 libguile_atsc_la_LDFLAGS = $(_atsc_la_LDFLAGS)
 libguile_atsc_la_CXXFLAGS = $(_atsc_la_CXXFLAGS)
@@ -139,12 +125,9 @@ guile/atsc.cc: gnuradio/atsc.scm
 gnuradio/atsc.scm: atsc.i
 gnuradio/atsc-primitive.scm: gnuradio/atsc.scm
 
+# Include the guile dependencies for this file
 -include guile/atsc.d
 
 endif				# end of GUILE
 
-atsc.lo: atsc.py atsc.scm
-atsc.py: atsc.i
-
--include python/atsc.d
 
diff --git a/gr-audio-alsa/src/Makefile.swig.gen b/gr-audio-alsa/src/Makefile.swig.gen
index 930e122d0f..522ba5c670 100644
--- a/gr-audio-alsa/src/Makefile.swig.gen
+++ b/gr-audio-alsa/src/Makefile.swig.gen
@@ -67,28 +67,10 @@ audio_alsa_swigincludedir = $(swigincludedir)
 ## 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)/audio_alsa-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 .
-
-# generating the py or scm file also generates the .cc or .h files,
-# but dependencies work better without the .cc ort .h files listed.
-# swig_built_sources += audio_alsa.py
-# if GUILE
-# swig_built_sources += gnuradio/audio_alsa.scm
-# endif
-
 ## Various SWIG variables.  These can be overloaded in the including
 ## Makefile.am by setting the variable value there, then including
 ## Makefile.swig .
@@ -108,8 +90,6 @@ _audio_alsa_la_LIBADD =			\
 	$(STD_SWIG_LA_LIB_ADD)		\
 	$(audio_alsa_la_swig_libadd)
 
-# _audio_alsa_la_DEPENDENCIES = python/audio_alsa.lo
-
 _audio_alsa_la_LDFLAGS =			\
 	$(STD_SWIG_LA_LD_FLAGS)		\
 	$(audio_alsa_la_swig_ldflags)
@@ -123,14 +103,20 @@ audio_alsa_python_PYTHON =			\
 	audio_alsa.py			\
 	$(audio_alsa)
 
+python/audio_alsa.cc: audio_alsa.py
+audio_alsa.py: audio_alsa.i
+
+# Include the python dependencies for this file
+-include python/audio_alsa.d
+# end of PYTHON
+
 if GUILE
 audio_alsa_scmlib_LTLIBRARIES = libguile-audio_alsa.la
-libguile_audio_alsa_la_SOURCES = 		\
-	guile/audio_alsa.cc			\
+libguile_audio_alsa_la_SOURCES = \
+	guile/audio_alsa.cc				       \
 	$(audio_alsa_la_swig_sources)
 nobase_audio_alsa_scm_DATA = gnuradio/audio_alsa.scm gnuradio/audio_alsa-primitive.scm
 
-# Guile can use the same flags as python does
 libguile_audio_alsa_la_LIBADD = $(_audio_alsa_la_LIBADD)
 libguile_audio_alsa_la_LDFLAGS = $(_audio_alsa_la_LDFLAGS)
 libguile_audio_alsa_la_CXXFLAGS = $(_audio_alsa_la_CXXFLAGS)
@@ -139,12 +125,9 @@ guile/audio_alsa.cc: gnuradio/audio_alsa.scm
 gnuradio/audio_alsa.scm: audio_alsa.i
 gnuradio/audio_alsa-primitive.scm: gnuradio/audio_alsa.scm
 
+# Include the guile dependencies for this file
 -include guile/audio_alsa.d
 
 endif				# end of GUILE
 
-audio_alsa.lo: audio_alsa.py audio_alsa.scm
-audio_alsa.py: audio_alsa.i
-
--include python/audio_alsa.d
 
diff --git a/gr-audio-oss/src/Makefile.swig.gen b/gr-audio-oss/src/Makefile.swig.gen
index 38f2b0e7d1..77938d4a49 100644
--- a/gr-audio-oss/src/Makefile.swig.gen
+++ b/gr-audio-oss/src/Makefile.swig.gen
@@ -67,28 +67,10 @@ audio_oss_swigincludedir = $(swigincludedir)
 ## 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)/audio_oss-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 .
-
-# generating the py or scm file also generates the .cc or .h files,
-# but dependencies work better without the .cc ort .h files listed.
-# swig_built_sources += audio_oss.py
-# if GUILE
-# swig_built_sources += gnuradio/audio_oss.scm
-# endif
-
 ## Various SWIG variables.  These can be overloaded in the including
 ## Makefile.am by setting the variable value there, then including
 ## Makefile.swig .
@@ -108,8 +90,6 @@ _audio_oss_la_LIBADD =			\
 	$(STD_SWIG_LA_LIB_ADD)		\
 	$(audio_oss_la_swig_libadd)
 
-# _audio_oss_la_DEPENDENCIES = python/audio_oss.lo
-
 _audio_oss_la_LDFLAGS =			\
 	$(STD_SWIG_LA_LD_FLAGS)		\
 	$(audio_oss_la_swig_ldflags)
@@ -123,14 +103,20 @@ audio_oss_python_PYTHON =			\
 	audio_oss.py			\
 	$(audio_oss)
 
+python/audio_oss.cc: audio_oss.py
+audio_oss.py: audio_oss.i
+
+# Include the python dependencies for this file
+-include python/audio_oss.d
+# end of PYTHON
+
 if GUILE
 audio_oss_scmlib_LTLIBRARIES = libguile-audio_oss.la
-libguile_audio_oss_la_SOURCES = 		\
-	guile/audio_oss.cc			\
+libguile_audio_oss_la_SOURCES = \
+	guile/audio_oss.cc				       \
 	$(audio_oss_la_swig_sources)
 nobase_audio_oss_scm_DATA = gnuradio/audio_oss.scm gnuradio/audio_oss-primitive.scm
 
-# Guile can use the same flags as python does
 libguile_audio_oss_la_LIBADD = $(_audio_oss_la_LIBADD)
 libguile_audio_oss_la_LDFLAGS = $(_audio_oss_la_LDFLAGS)
 libguile_audio_oss_la_CXXFLAGS = $(_audio_oss_la_CXXFLAGS)
@@ -139,12 +125,9 @@ guile/audio_oss.cc: gnuradio/audio_oss.scm
 gnuradio/audio_oss.scm: audio_oss.i
 gnuradio/audio_oss-primitive.scm: gnuradio/audio_oss.scm
 
+# Include the guile dependencies for this file
 -include guile/audio_oss.d
 
 endif				# end of GUILE
 
-audio_oss.lo: audio_oss.py audio_oss.scm
-audio_oss.py: audio_oss.i
-
--include python/audio_oss.d
 
diff --git a/gr-cvsd-vocoder/src/lib/Makefile.swig.gen b/gr-cvsd-vocoder/src/lib/Makefile.swig.gen
index 0748596f3a..92adb403f6 100644
--- a/gr-cvsd-vocoder/src/lib/Makefile.swig.gen
+++ b/gr-cvsd-vocoder/src/lib/Makefile.swig.gen
@@ -67,28 +67,10 @@ cvsd_vocoder_swigincludedir = $(swigincludedir)
 ## 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)/cvsd_vocoder-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 .
-
-# generating the py or scm file also generates the .cc or .h files,
-# but dependencies work better without the .cc ort .h files listed.
-# swig_built_sources += cvsd_vocoder.py
-# if GUILE
-# swig_built_sources += gnuradio/cvsd_vocoder.scm
-# endif
-
 ## Various SWIG variables.  These can be overloaded in the including
 ## Makefile.am by setting the variable value there, then including
 ## Makefile.swig .
@@ -108,8 +90,6 @@ _cvsd_vocoder_la_LIBADD =			\
 	$(STD_SWIG_LA_LIB_ADD)		\
 	$(cvsd_vocoder_la_swig_libadd)
 
-# _cvsd_vocoder_la_DEPENDENCIES = python/cvsd_vocoder.lo
-
 _cvsd_vocoder_la_LDFLAGS =			\
 	$(STD_SWIG_LA_LD_FLAGS)		\
 	$(cvsd_vocoder_la_swig_ldflags)
@@ -123,14 +103,20 @@ cvsd_vocoder_python_PYTHON =			\
 	cvsd_vocoder.py			\
 	$(cvsd_vocoder)
 
+python/cvsd_vocoder.cc: cvsd_vocoder.py
+cvsd_vocoder.py: cvsd_vocoder.i
+
+# Include the python dependencies for this file
+-include python/cvsd_vocoder.d
+# end of PYTHON
+
 if GUILE
 cvsd_vocoder_scmlib_LTLIBRARIES = libguile-cvsd_vocoder.la
-libguile_cvsd_vocoder_la_SOURCES = 		\
-	guile/cvsd_vocoder.cc			\
+libguile_cvsd_vocoder_la_SOURCES = \
+	guile/cvsd_vocoder.cc				       \
 	$(cvsd_vocoder_la_swig_sources)
 nobase_cvsd_vocoder_scm_DATA = gnuradio/cvsd_vocoder.scm gnuradio/cvsd_vocoder-primitive.scm
 
-# Guile can use the same flags as python does
 libguile_cvsd_vocoder_la_LIBADD = $(_cvsd_vocoder_la_LIBADD)
 libguile_cvsd_vocoder_la_LDFLAGS = $(_cvsd_vocoder_la_LDFLAGS)
 libguile_cvsd_vocoder_la_CXXFLAGS = $(_cvsd_vocoder_la_CXXFLAGS)
@@ -139,12 +125,9 @@ guile/cvsd_vocoder.cc: gnuradio/cvsd_vocoder.scm
 gnuradio/cvsd_vocoder.scm: cvsd_vocoder.i
 gnuradio/cvsd_vocoder-primitive.scm: gnuradio/cvsd_vocoder.scm
 
+# Include the guile dependencies for this file
 -include guile/cvsd_vocoder.d
 
 endif				# end of GUILE
 
-cvsd_vocoder.lo: cvsd_vocoder.py cvsd_vocoder.scm
-cvsd_vocoder.py: cvsd_vocoder.i
-
--include python/cvsd_vocoder.d
 
diff --git a/gr-gsm-fr-vocoder/src/lib/Makefile.swig.gen b/gr-gsm-fr-vocoder/src/lib/Makefile.swig.gen
index 5b3c2d3d61..332aaf268c 100644
--- a/gr-gsm-fr-vocoder/src/lib/Makefile.swig.gen
+++ b/gr-gsm-fr-vocoder/src/lib/Makefile.swig.gen
@@ -67,28 +67,10 @@ gsm_full_rate_swigincludedir = $(swigincludedir)
 ## 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)/gsm_full_rate-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 .
-
-# generating the py or scm file also generates the .cc or .h files,
-# but dependencies work better without the .cc ort .h files listed.
-# swig_built_sources += gsm_full_rate.py
-# if GUILE
-# swig_built_sources += gnuradio/gsm_full_rate.scm
-# endif
-
 ## Various SWIG variables.  These can be overloaded in the including
 ## Makefile.am by setting the variable value there, then including
 ## Makefile.swig .
@@ -108,8 +90,6 @@ _gsm_full_rate_la_LIBADD =			\
 	$(STD_SWIG_LA_LIB_ADD)		\
 	$(gsm_full_rate_la_swig_libadd)
 
-# _gsm_full_rate_la_DEPENDENCIES = python/gsm_full_rate.lo
-
 _gsm_full_rate_la_LDFLAGS =			\
 	$(STD_SWIG_LA_LD_FLAGS)		\
 	$(gsm_full_rate_la_swig_ldflags)
@@ -123,14 +103,20 @@ gsm_full_rate_python_PYTHON =			\
 	gsm_full_rate.py			\
 	$(gsm_full_rate)
 
+python/gsm_full_rate.cc: gsm_full_rate.py
+gsm_full_rate.py: gsm_full_rate.i
+
+# Include the python dependencies for this file
+-include python/gsm_full_rate.d
+# end of PYTHON
+
 if GUILE
 gsm_full_rate_scmlib_LTLIBRARIES = libguile-gsm_full_rate.la
-libguile_gsm_full_rate_la_SOURCES = 		\
-	guile/gsm_full_rate.cc			\
+libguile_gsm_full_rate_la_SOURCES = \
+	guile/gsm_full_rate.cc				       \
 	$(gsm_full_rate_la_swig_sources)
 nobase_gsm_full_rate_scm_DATA = gnuradio/gsm_full_rate.scm gnuradio/gsm_full_rate-primitive.scm
 
-# Guile can use the same flags as python does
 libguile_gsm_full_rate_la_LIBADD = $(_gsm_full_rate_la_LIBADD)
 libguile_gsm_full_rate_la_LDFLAGS = $(_gsm_full_rate_la_LDFLAGS)
 libguile_gsm_full_rate_la_CXXFLAGS = $(_gsm_full_rate_la_CXXFLAGS)
@@ -139,12 +125,9 @@ guile/gsm_full_rate.cc: gnuradio/gsm_full_rate.scm
 gnuradio/gsm_full_rate.scm: gsm_full_rate.i
 gnuradio/gsm_full_rate-primitive.scm: gnuradio/gsm_full_rate.scm
 
+# Include the guile dependencies for this file
 -include guile/gsm_full_rate.d
 
 endif				# end of GUILE
 
-gsm_full_rate.lo: gsm_full_rate.py gsm_full_rate.scm
-gsm_full_rate.py: gsm_full_rate.i
-
--include python/gsm_full_rate.d
 
diff --git a/gr-msdd6000/src/Makefile.swig.gen b/gr-msdd6000/src/Makefile.swig.gen
index ba3850cd87..7f0d484b9f 100644
--- a/gr-msdd6000/src/Makefile.swig.gen
+++ b/gr-msdd6000/src/Makefile.swig.gen
@@ -67,28 +67,10 @@ msdd_swigincludedir = $(swigincludedir)
 ## 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-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 .
-
-# generating the py or scm file also generates the .cc or .h files,
-# but dependencies work better without the .cc ort .h files listed.
-# swig_built_sources += msdd.py
-# if GUILE
-# swig_built_sources += gnuradio/msdd.scm
-# endif
-
 ## Various SWIG variables.  These can be overloaded in the including
 ## Makefile.am by setting the variable value there, then including
 ## Makefile.swig .
@@ -108,8 +90,6 @@ _msdd_la_LIBADD =			\
 	$(STD_SWIG_LA_LIB_ADD)		\
 	$(msdd_la_swig_libadd)
 
-# _msdd_la_DEPENDENCIES = python/msdd.lo
-
 _msdd_la_LDFLAGS =			\
 	$(STD_SWIG_LA_LD_FLAGS)		\
 	$(msdd_la_swig_ldflags)
@@ -123,14 +103,20 @@ msdd_python_PYTHON =			\
 	msdd.py			\
 	$(msdd)
 
+python/msdd.cc: msdd.py
+msdd.py: msdd.i
+
+# Include the python dependencies for this file
+-include python/msdd.d
+# end of PYTHON
+
 if GUILE
 msdd_scmlib_LTLIBRARIES = libguile-msdd.la
-libguile_msdd_la_SOURCES = 		\
-	guile/msdd.cc			\
+libguile_msdd_la_SOURCES = \
+	guile/msdd.cc				       \
 	$(msdd_la_swig_sources)
 nobase_msdd_scm_DATA = gnuradio/msdd.scm gnuradio/msdd-primitive.scm
 
-# Guile can use the same flags as python does
 libguile_msdd_la_LIBADD = $(_msdd_la_LIBADD)
 libguile_msdd_la_LDFLAGS = $(_msdd_la_LDFLAGS)
 libguile_msdd_la_CXXFLAGS = $(_msdd_la_CXXFLAGS)
@@ -139,14 +125,11 @@ guile/msdd.cc: gnuradio/msdd.scm
 gnuradio/msdd.scm: msdd.i
 gnuradio/msdd-primitive.scm: gnuradio/msdd.scm
 
+# Include the guile dependencies for this file
 -include guile/msdd.d
 
 endif				# end of GUILE
 
-msdd.lo: msdd.py msdd.scm
-msdd.py: msdd.i
-
--include python/msdd.d
 
 # -*- Makefile -*-
 #
@@ -217,28 +200,10 @@ msdd_rs_swigincludedir = $(swigincludedir)
 ## 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 .
-
-# generating the py or scm file also generates the .cc or .h files,
-# but dependencies work better without the .cc ort .h files listed.
-# swig_built_sources += msdd_rs.py
-# if GUILE
-# swig_built_sources += gnuradio/msdd_rs.scm
-# endif
-
 ## Various SWIG variables.  These can be overloaded in the including
 ## Makefile.am by setting the variable value there, then including
 ## Makefile.swig .
@@ -258,8 +223,6 @@ _msdd_rs_la_LIBADD =			\
 	$(STD_SWIG_LA_LIB_ADD)		\
 	$(msdd_rs_la_swig_libadd)
 
-# _msdd_rs_la_DEPENDENCIES = python/msdd_rs.lo
-
 _msdd_rs_la_LDFLAGS =			\
 	$(STD_SWIG_LA_LD_FLAGS)		\
 	$(msdd_rs_la_swig_ldflags)
@@ -273,14 +236,20 @@ msdd_rs_python_PYTHON =			\
 	msdd_rs.py			\
 	$(msdd_rs)
 
+python/msdd_rs.cc: msdd_rs.py
+msdd_rs.py: msdd_rs.i
+
+# Include the python dependencies for this file
+-include python/msdd_rs.d
+# end of PYTHON
+
 if GUILE
 msdd_rs_scmlib_LTLIBRARIES = libguile-msdd_rs.la
-libguile_msdd_rs_la_SOURCES = 		\
-	guile/msdd_rs.cc			\
+libguile_msdd_rs_la_SOURCES = \
+	guile/msdd_rs.cc				       \
 	$(msdd_rs_la_swig_sources)
 nobase_msdd_rs_scm_DATA = gnuradio/msdd_rs.scm gnuradio/msdd_rs-primitive.scm
 
-# Guile can use the same flags as python does
 libguile_msdd_rs_la_LIBADD = $(_msdd_rs_la_LIBADD)
 libguile_msdd_rs_la_LDFLAGS = $(_msdd_rs_la_LDFLAGS)
 libguile_msdd_rs_la_CXXFLAGS = $(_msdd_rs_la_CXXFLAGS)
@@ -289,12 +258,9 @@ guile/msdd_rs.cc: gnuradio/msdd_rs.scm
 gnuradio/msdd_rs.scm: msdd_rs.i
 gnuradio/msdd_rs-primitive.scm: gnuradio/msdd_rs.scm
 
+# Include the guile dependencies for this file
 -include guile/msdd_rs.d
 
 endif				# end of GUILE
 
-msdd_rs.lo: msdd_rs.py msdd_rs.scm
-msdd_rs.py: msdd_rs.i
-
--include python/msdd_rs.d
 
diff --git a/gr-noaa/swig/Makefile.swig.gen b/gr-noaa/swig/Makefile.swig.gen
index 7e02878536..5bbb7a6d8b 100644
--- a/gr-noaa/swig/Makefile.swig.gen
+++ b/gr-noaa/swig/Makefile.swig.gen
@@ -67,28 +67,10 @@ noaa_swig_swigincludedir = $(swigincludedir)
 ## 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)/noaa_swig-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 .
-
-# generating the py or scm file also generates the .cc or .h files,
-# but dependencies work better without the .cc ort .h files listed.
-# swig_built_sources += noaa_swig.py
-# if GUILE
-# swig_built_sources += gnuradio/noaa_swig.scm
-# endif
-
 ## Various SWIG variables.  These can be overloaded in the including
 ## Makefile.am by setting the variable value there, then including
 ## Makefile.swig .
@@ -108,8 +90,6 @@ _noaa_swig_la_LIBADD =			\
 	$(STD_SWIG_LA_LIB_ADD)		\
 	$(noaa_swig_la_swig_libadd)
 
-# _noaa_swig_la_DEPENDENCIES = python/noaa_swig.lo
-
 _noaa_swig_la_LDFLAGS =			\
 	$(STD_SWIG_LA_LD_FLAGS)		\
 	$(noaa_swig_la_swig_ldflags)
@@ -123,14 +103,20 @@ noaa_swig_python_PYTHON =			\
 	noaa_swig.py			\
 	$(noaa_swig)
 
+python/noaa_swig.cc: noaa_swig.py
+noaa_swig.py: noaa_swig.i
+
+# Include the python dependencies for this file
+-include python/noaa_swig.d
+# end of PYTHON
+
 if GUILE
 noaa_swig_scmlib_LTLIBRARIES = libguile-noaa_swig.la
-libguile_noaa_swig_la_SOURCES = 		\
-	guile/noaa_swig.cc			\
+libguile_noaa_swig_la_SOURCES = \
+	guile/noaa_swig.cc				       \
 	$(noaa_swig_la_swig_sources)
 nobase_noaa_swig_scm_DATA = gnuradio/noaa_swig.scm gnuradio/noaa_swig-primitive.scm
 
-# Guile can use the same flags as python does
 libguile_noaa_swig_la_LIBADD = $(_noaa_swig_la_LIBADD)
 libguile_noaa_swig_la_LDFLAGS = $(_noaa_swig_la_LDFLAGS)
 libguile_noaa_swig_la_CXXFLAGS = $(_noaa_swig_la_CXXFLAGS)
@@ -139,12 +125,9 @@ guile/noaa_swig.cc: gnuradio/noaa_swig.scm
 gnuradio/noaa_swig.scm: noaa_swig.i
 gnuradio/noaa_swig-primitive.scm: gnuradio/noaa_swig.scm
 
+# Include the guile dependencies for this file
 -include guile/noaa_swig.d
 
 endif				# end of GUILE
 
-noaa_swig.lo: noaa_swig.py noaa_swig.scm
-noaa_swig.py: noaa_swig.i
-
--include python/noaa_swig.d
 
diff --git a/gr-pager/swig/Makefile.swig.gen b/gr-pager/swig/Makefile.swig.gen
index 3a719394b8..5321807fbe 100644
--- a/gr-pager/swig/Makefile.swig.gen
+++ b/gr-pager/swig/Makefile.swig.gen
@@ -67,28 +67,10 @@ pager_swig_swigincludedir = $(swigincludedir)
 ## 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)/pager_swig-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 .
-
-# generating the py or scm file also generates the .cc or .h files,
-# but dependencies work better without the .cc ort .h files listed.
-# swig_built_sources += pager_swig.py
-# if GUILE
-# swig_built_sources += gnuradio/pager_swig.scm
-# endif
-
 ## Various SWIG variables.  These can be overloaded in the including
 ## Makefile.am by setting the variable value there, then including
 ## Makefile.swig .
@@ -108,8 +90,6 @@ _pager_swig_la_LIBADD =			\
 	$(STD_SWIG_LA_LIB_ADD)		\
 	$(pager_swig_la_swig_libadd)
 
-# _pager_swig_la_DEPENDENCIES = python/pager_swig.lo
-
 _pager_swig_la_LDFLAGS =			\
 	$(STD_SWIG_LA_LD_FLAGS)		\
 	$(pager_swig_la_swig_ldflags)
@@ -123,14 +103,20 @@ pager_swig_python_PYTHON =			\
 	pager_swig.py			\
 	$(pager_swig)
 
+python/pager_swig.cc: pager_swig.py
+pager_swig.py: pager_swig.i
+
+# Include the python dependencies for this file
+-include python/pager_swig.d
+# end of PYTHON
+
 if GUILE
 pager_swig_scmlib_LTLIBRARIES = libguile-pager_swig.la
-libguile_pager_swig_la_SOURCES = 		\
-	guile/pager_swig.cc			\
+libguile_pager_swig_la_SOURCES = \
+	guile/pager_swig.cc				       \
 	$(pager_swig_la_swig_sources)
 nobase_pager_swig_scm_DATA = gnuradio/pager_swig.scm gnuradio/pager_swig-primitive.scm
 
-# Guile can use the same flags as python does
 libguile_pager_swig_la_LIBADD = $(_pager_swig_la_LIBADD)
 libguile_pager_swig_la_LDFLAGS = $(_pager_swig_la_LDFLAGS)
 libguile_pager_swig_la_CXXFLAGS = $(_pager_swig_la_CXXFLAGS)
@@ -139,12 +125,9 @@ guile/pager_swig.cc: gnuradio/pager_swig.scm
 gnuradio/pager_swig.scm: pager_swig.i
 gnuradio/pager_swig-primitive.scm: gnuradio/pager_swig.scm
 
+# Include the guile dependencies for this file
 -include guile/pager_swig.d
 
 endif				# end of GUILE
 
-pager_swig.lo: pager_swig.py pager_swig.scm
-pager_swig.py: pager_swig.i
-
--include python/pager_swig.d
 
diff --git a/gr-qtgui/src/lib/Makefile.swig.gen b/gr-qtgui/src/lib/Makefile.swig.gen
index aeb0af3042..6adf722097 100644
--- a/gr-qtgui/src/lib/Makefile.swig.gen
+++ b/gr-qtgui/src/lib/Makefile.swig.gen
@@ -67,28 +67,10 @@ qtgui_swigincludedir = $(swigincludedir)
 ## 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)/qtgui-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 .
-
-# generating the py or scm file also generates the .cc or .h files,
-# but dependencies work better without the .cc ort .h files listed.
-# swig_built_sources += qtgui.py
-# if GUILE
-# swig_built_sources += gnuradio/qtgui.scm
-# endif
-
 ## Various SWIG variables.  These can be overloaded in the including
 ## Makefile.am by setting the variable value there, then including
 ## Makefile.swig .
@@ -108,8 +90,6 @@ _qtgui_la_LIBADD =			\
 	$(STD_SWIG_LA_LIB_ADD)		\
 	$(qtgui_la_swig_libadd)
 
-# _qtgui_la_DEPENDENCIES = python/qtgui.lo
-
 _qtgui_la_LDFLAGS =			\
 	$(STD_SWIG_LA_LD_FLAGS)		\
 	$(qtgui_la_swig_ldflags)
@@ -123,14 +103,20 @@ qtgui_python_PYTHON =			\
 	qtgui.py			\
 	$(qtgui)
 
+python/qtgui.cc: qtgui.py
+qtgui.py: qtgui.i
+
+# Include the python dependencies for this file
+-include python/qtgui.d
+# end of PYTHON
+
 if GUILE
 qtgui_scmlib_LTLIBRARIES = libguile-qtgui.la
-libguile_qtgui_la_SOURCES = 		\
-	guile/qtgui.cc			\
+libguile_qtgui_la_SOURCES = \
+	guile/qtgui.cc				       \
 	$(qtgui_la_swig_sources)
 nobase_qtgui_scm_DATA = gnuradio/qtgui.scm gnuradio/qtgui-primitive.scm
 
-# Guile can use the same flags as python does
 libguile_qtgui_la_LIBADD = $(_qtgui_la_LIBADD)
 libguile_qtgui_la_LDFLAGS = $(_qtgui_la_LDFLAGS)
 libguile_qtgui_la_CXXFLAGS = $(_qtgui_la_CXXFLAGS)
@@ -139,12 +125,9 @@ guile/qtgui.cc: gnuradio/qtgui.scm
 gnuradio/qtgui.scm: qtgui.i
 gnuradio/qtgui-primitive.scm: gnuradio/qtgui.scm
 
+# Include the guile dependencies for this file
 -include guile/qtgui.d
 
 endif				# end of GUILE
 
-qtgui.lo: qtgui.py qtgui.scm
-qtgui.py: qtgui.i
-
--include python/qtgui.d
 
diff --git a/gr-radio-astronomy/src/lib/Makefile.swig.gen b/gr-radio-astronomy/src/lib/Makefile.swig.gen
index 82af254d3b..064a8c13d7 100644
--- a/gr-radio-astronomy/src/lib/Makefile.swig.gen
+++ b/gr-radio-astronomy/src/lib/Makefile.swig.gen
@@ -67,28 +67,10 @@ ra_swigincludedir = $(swigincludedir)
 ## 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)/ra-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 .
-
-# generating the py or scm file also generates the .cc or .h files,
-# but dependencies work better without the .cc ort .h files listed.
-# swig_built_sources += ra.py
-# if GUILE
-# swig_built_sources += gnuradio/ra.scm
-# endif
-
 ## Various SWIG variables.  These can be overloaded in the including
 ## Makefile.am by setting the variable value there, then including
 ## Makefile.swig .
@@ -108,8 +90,6 @@ _ra_la_LIBADD =			\
 	$(STD_SWIG_LA_LIB_ADD)		\
 	$(ra_la_swig_libadd)
 
-# _ra_la_DEPENDENCIES = python/ra.lo
-
 _ra_la_LDFLAGS =			\
 	$(STD_SWIG_LA_LD_FLAGS)		\
 	$(ra_la_swig_ldflags)
@@ -123,14 +103,20 @@ ra_python_PYTHON =			\
 	ra.py			\
 	$(ra)
 
+python/ra.cc: ra.py
+ra.py: ra.i
+
+# Include the python dependencies for this file
+-include python/ra.d
+# end of PYTHON
+
 if GUILE
 ra_scmlib_LTLIBRARIES = libguile-ra.la
-libguile_ra_la_SOURCES = 		\
-	guile/ra.cc			\
+libguile_ra_la_SOURCES = \
+	guile/ra.cc				       \
 	$(ra_la_swig_sources)
 nobase_ra_scm_DATA = gnuradio/ra.scm gnuradio/ra-primitive.scm
 
-# Guile can use the same flags as python does
 libguile_ra_la_LIBADD = $(_ra_la_LIBADD)
 libguile_ra_la_LDFLAGS = $(_ra_la_LDFLAGS)
 libguile_ra_la_CXXFLAGS = $(_ra_la_CXXFLAGS)
@@ -139,12 +125,9 @@ guile/ra.cc: gnuradio/ra.scm
 gnuradio/ra.scm: ra.i
 gnuradio/ra-primitive.scm: gnuradio/ra.scm
 
+# Include the guile dependencies for this file
 -include guile/ra.d
 
 endif				# end of GUILE
 
-ra.lo: ra.py ra.scm
-ra.py: ra.i
-
--include python/ra.d
 
diff --git a/gr-trellis/src/lib/Makefile.swig.gen b/gr-trellis/src/lib/Makefile.swig.gen
index 4417d49095..8edc2a7434 100644
--- a/gr-trellis/src/lib/Makefile.swig.gen
+++ b/gr-trellis/src/lib/Makefile.swig.gen
@@ -67,28 +67,10 @@ trellis_swigincludedir = $(swigincludedir)
 ## 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)/trellis-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 .
-
-# generating the py or scm file also generates the .cc or .h files,
-# but dependencies work better without the .cc ort .h files listed.
-# swig_built_sources += trellis.py
-# if GUILE
-# swig_built_sources += gnuradio/trellis.scm
-# endif
-
 ## Various SWIG variables.  These can be overloaded in the including
 ## Makefile.am by setting the variable value there, then including
 ## Makefile.swig .
@@ -108,8 +90,6 @@ _trellis_la_LIBADD =			\
 	$(STD_SWIG_LA_LIB_ADD)		\
 	$(trellis_la_swig_libadd)
 
-# _trellis_la_DEPENDENCIES = python/trellis.lo
-
 _trellis_la_LDFLAGS =			\
 	$(STD_SWIG_LA_LD_FLAGS)		\
 	$(trellis_la_swig_ldflags)
@@ -123,14 +103,20 @@ trellis_python_PYTHON =			\
 	trellis.py			\
 	$(trellis)
 
+python/trellis.cc: trellis.py
+trellis.py: trellis.i
+
+# Include the python dependencies for this file
+-include python/trellis.d
+# end of PYTHON
+
 if GUILE
 trellis_scmlib_LTLIBRARIES = libguile-trellis.la
-libguile_trellis_la_SOURCES = 		\
-	guile/trellis.cc			\
+libguile_trellis_la_SOURCES = \
+	guile/trellis.cc				       \
 	$(trellis_la_swig_sources)
 nobase_trellis_scm_DATA = gnuradio/trellis.scm gnuradio/trellis-primitive.scm
 
-# Guile can use the same flags as python does
 libguile_trellis_la_LIBADD = $(_trellis_la_LIBADD)
 libguile_trellis_la_LDFLAGS = $(_trellis_la_LDFLAGS)
 libguile_trellis_la_CXXFLAGS = $(_trellis_la_CXXFLAGS)
@@ -139,12 +125,9 @@ guile/trellis.cc: gnuradio/trellis.scm
 gnuradio/trellis.scm: trellis.i
 gnuradio/trellis-primitive.scm: gnuradio/trellis.scm
 
+# Include the guile dependencies for this file
 -include guile/trellis.d
 
 endif				# end of GUILE
 
-trellis.lo: trellis.py trellis.scm
-trellis.py: trellis.i
-
--include python/trellis.d
 
diff --git a/gr-usrp2/src/Makefile.swig.gen b/gr-usrp2/src/Makefile.swig.gen
index 72abdef923..a39ae12c81 100644
--- a/gr-usrp2/src/Makefile.swig.gen
+++ b/gr-usrp2/src/Makefile.swig.gen
@@ -67,28 +67,10 @@ usrp2_swigincludedir = $(swigincludedir)
 ## 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)/usrp2-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 .
-
-# generating the py or scm file also generates the .cc or .h files,
-# but dependencies work better without the .cc ort .h files listed.
-# swig_built_sources += usrp2.py
-# if GUILE
-# swig_built_sources += gnuradio/usrp2.scm
-# endif
-
 ## Various SWIG variables.  These can be overloaded in the including
 ## Makefile.am by setting the variable value there, then including
 ## Makefile.swig .
@@ -108,8 +90,6 @@ _usrp2_la_LIBADD =			\
 	$(STD_SWIG_LA_LIB_ADD)		\
 	$(usrp2_la_swig_libadd)
 
-# _usrp2_la_DEPENDENCIES = python/usrp2.lo
-
 _usrp2_la_LDFLAGS =			\
 	$(STD_SWIG_LA_LD_FLAGS)		\
 	$(usrp2_la_swig_ldflags)
@@ -123,14 +103,20 @@ usrp2_python_PYTHON =			\
 	usrp2.py			\
 	$(usrp2)
 
+python/usrp2.cc: usrp2.py
+usrp2.py: usrp2.i
+
+# Include the python dependencies for this file
+-include python/usrp2.d
+# end of PYTHON
+
 if GUILE
 usrp2_scmlib_LTLIBRARIES = libguile-usrp2.la
-libguile_usrp2_la_SOURCES = 		\
-	guile/usrp2.cc			\
+libguile_usrp2_la_SOURCES = \
+	guile/usrp2.cc				       \
 	$(usrp2_la_swig_sources)
 nobase_usrp2_scm_DATA = gnuradio/usrp2.scm gnuradio/usrp2-primitive.scm
 
-# Guile can use the same flags as python does
 libguile_usrp2_la_LIBADD = $(_usrp2_la_LIBADD)
 libguile_usrp2_la_LDFLAGS = $(_usrp2_la_LDFLAGS)
 libguile_usrp2_la_CXXFLAGS = $(_usrp2_la_CXXFLAGS)
@@ -139,12 +125,9 @@ guile/usrp2.cc: gnuradio/usrp2.scm
 gnuradio/usrp2.scm: usrp2.i
 gnuradio/usrp2-primitive.scm: gnuradio/usrp2.scm
 
+# Include the guile dependencies for this file
 -include guile/usrp2.d
 
 endif				# end of GUILE
 
-usrp2.lo: usrp2.py usrp2.scm
-usrp2.py: usrp2.i
-
--include python/usrp2.d
 
diff --git a/gr-video-sdl/src/Makefile.swig.gen b/gr-video-sdl/src/Makefile.swig.gen
index 6a8e6e040e..6ec66de4b5 100644
--- a/gr-video-sdl/src/Makefile.swig.gen
+++ b/gr-video-sdl/src/Makefile.swig.gen
@@ -67,28 +67,10 @@ video_sdl_swigincludedir = $(swigincludedir)
 ## 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)/video_sdl-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 .
-
-# generating the py or scm file also generates the .cc or .h files,
-# but dependencies work better without the .cc ort .h files listed.
-# swig_built_sources += video_sdl.py
-# if GUILE
-# swig_built_sources += gnuradio/video_sdl.scm
-# endif
-
 ## Various SWIG variables.  These can be overloaded in the including
 ## Makefile.am by setting the variable value there, then including
 ## Makefile.swig .
@@ -108,8 +90,6 @@ _video_sdl_la_LIBADD =			\
 	$(STD_SWIG_LA_LIB_ADD)		\
 	$(video_sdl_la_swig_libadd)
 
-# _video_sdl_la_DEPENDENCIES = python/video_sdl.lo
-
 _video_sdl_la_LDFLAGS =			\
 	$(STD_SWIG_LA_LD_FLAGS)		\
 	$(video_sdl_la_swig_ldflags)
@@ -123,14 +103,20 @@ video_sdl_python_PYTHON =			\
 	video_sdl.py			\
 	$(video_sdl)
 
+python/video_sdl.cc: video_sdl.py
+video_sdl.py: video_sdl.i
+
+# Include the python dependencies for this file
+-include python/video_sdl.d
+# end of PYTHON
+
 if GUILE
 video_sdl_scmlib_LTLIBRARIES = libguile-video_sdl.la
-libguile_video_sdl_la_SOURCES = 		\
-	guile/video_sdl.cc			\
+libguile_video_sdl_la_SOURCES = \
+	guile/video_sdl.cc				       \
 	$(video_sdl_la_swig_sources)
 nobase_video_sdl_scm_DATA = gnuradio/video_sdl.scm gnuradio/video_sdl-primitive.scm
 
-# Guile can use the same flags as python does
 libguile_video_sdl_la_LIBADD = $(_video_sdl_la_LIBADD)
 libguile_video_sdl_la_LDFLAGS = $(_video_sdl_la_LDFLAGS)
 libguile_video_sdl_la_CXXFLAGS = $(_video_sdl_la_CXXFLAGS)
@@ -139,12 +125,9 @@ guile/video_sdl.cc: gnuradio/video_sdl.scm
 gnuradio/video_sdl.scm: video_sdl.i
 gnuradio/video_sdl-primitive.scm: gnuradio/video_sdl.scm
 
+# Include the guile dependencies for this file
 -include guile/video_sdl.d
 
 endif				# end of GUILE
 
-video_sdl.lo: video_sdl.py video_sdl.scm
-video_sdl.py: video_sdl.i
-
--include python/video_sdl.d