regenerated

1 files changed, 20 insertions, 54 deletions

diff --git a/gr-msdd6000/src/Makefile.swig.gen b/gr-msdd6000/src/Makefile.swig.gen
index ba3850cd8..7f0d484b9 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