regenerated

1 files changed, 10 insertions, 27 deletions

diff --git a/gr-usrp2/src/Makefile.swig.gen b/gr-usrp2/src/Makefile.swig.gen
index 72abdef92..a39ae12c8 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