regenerated

1 files changed, 9 insertions, 26 deletions

diff --git a/gr-audio-portaudio/src/Makefile.swig.gen b/gr-audio-portaudio/src/Makefile.swig.gen
index 05408468a..e7817c1e1 100644
--- a/gr-audio-portaudio/src/Makefile.swig.gen
+++ b/gr-audio-portaudio/src/Makefile.swig.gen
@@ -67,28 +67,10 @@ audio_portaudio_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_portaudio-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_portaudio.py
-# if GUILE
-# swig_built_sources += gnuradio/audio_portaudio.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_portaudio_la_LIBADD =			\
 	$(STD_SWIG_LA_LIB_ADD)		\
 	$(audio_portaudio_la_swig_libadd)
 
-# _audio_portaudio_la_DEPENDENCIES = python/audio_portaudio.lo
-
 _audio_portaudio_la_LDFLAGS =			\
 	$(STD_SWIG_LA_LD_FLAGS)		\
 	$(audio_portaudio_la_swig_ldflags)
@@ -123,14 +103,20 @@ audio_portaudio_python_PYTHON =			\
 	audio_portaudio.py			\
 	$(audio_portaudio)
 
+python/audio_portaudio.cc: audio_portaudio.py
+audio_portaudio.py: audio_portaudio.i
+
+# Include the python dependencies for this file
+-include python/audio_portaudio.d
+# end of PYTHON
+
 if GUILE
 audio_portaudio_scmlib_LTLIBRARIES = libguile-audio_portaudio.la
-libguile_audio_portaudio_la_SOURCES = 		\
+libguile_audio_portaudio_la_SOURCES =		\
 	guile/audio_portaudio.cc			\
 	$(audio_portaudio_la_swig_sources)
 nobase_audio_portaudio_scm_DATA = gnuradio/audio_portaudio.scm gnuradio/audio_portaudio-primitive.scm
 
-# Guile can use the same flags as python does
 libguile_audio_portaudio_la_LIBADD = $(_audio_portaudio_la_LIBADD)
 libguile_audio_portaudio_la_LDFLAGS = $(_audio_portaudio_la_LDFLAGS)
 libguile_audio_portaudio_la_CXXFLAGS = $(_audio_portaudio_la_CXXFLAGS)
@@ -139,12 +125,9 @@ guile/audio_portaudio.cc: gnuradio/audio_portaudio.scm
 gnuradio/audio_portaudio.scm: audio_portaudio.i
 gnuradio/audio_portaudio-primitive.scm: gnuradio/audio_portaudio.scm
 
+# Include the guile dependencies for this file
 -include guile/audio_portaudio.d
 
 endif				# end of GUILE
 
-audio_portaudio.lo: audio_portaudio.py audio_portaudio.scm
-audio_portaudio.py: audio_portaudio.i
-
--include python/audio_portaudio.d