regenerated

1 files changed, 60 insertions, 162 deletions

diff --git a/gnuradio-core/src/lib/swig/Makefile.swig.gen b/gnuradio-core/src/lib/swig/Makefile.swig.gen
index a92ff2231..0803cbfee 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