regenerated

7 files changed, 49 insertions, 56 deletions

diff --git a/gr-audio-jack/src/Makefile.swig.gen b/gr-audio-jack/src/Makefile.swig.gen
index 790ed8087..980b4e56d 100644
--- a/gr-audio-jack/src/Makefile.swig.gen
+++ b/gr-audio-jack/src/Makefile.swig.gen
@@ -84,10 +84,10 @@ MOSTLYCLEANFILES += $(DEPDIR)/*.S*
 
 # 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_jack.py
-if GUILE
-swig_built_sources += audio_jack.scm
-endif
+# swig_built_sources += audio_jack.py
+# if GUILE
+# swig_built_sources += gnuradio/audio_jack.scm
+# endif
 
 ## Various SWIG variables.  These can be overloaded in the including
 ## Makefile.am by setting the variable value there, then including
@@ -135,15 +135,14 @@ libguile_audio_jack_la_LIBADD = $(_audio_jack_la_LIBADD)
 libguile_audio_jack_la_LDFLAGS = $(_audio_jack_la_LDFLAGS)
 libguile_audio_jack_la_CXXFLAGS = $(_audio_jack_la_CXXFLAGS)
 
-guile/audio_jack.lo: audio_jack.lo
-audio_jack.scm: audio_jack.i
-gnuradio/audio_jack-primitive.scm: audio_jack.scm
+guile/audio_jack.cc: gnuradio/audio_jack.scm
+gnuradio/audio_jack.scm: audio_jack.i
+gnuradio/audio_jack-primitive.scm: gnuradio/audio_jack.scm
 
 -include guile/audio_jack.d
 
 endif				# end of GUILE
 
-python/audio_jack.lo:
 audio_jack.lo: audio_jack.py audio_jack.scm
 audio_jack.py: audio_jack.i
 
diff --git a/gr-audio-osx/src/Makefile.swig.gen b/gr-audio-osx/src/Makefile.swig.gen
index c17e54786..d48a85810 100644
--- a/gr-audio-osx/src/Makefile.swig.gen
+++ b/gr-audio-osx/src/Makefile.swig.gen
@@ -84,10 +84,10 @@ MOSTLYCLEANFILES += $(DEPDIR)/*.S*
 
 # 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_osx.py
-if GUILE
-swig_built_sources += audio_osx.scm
-endif
+# swig_built_sources += audio_osx.py
+# if GUILE
+# swig_built_sources += gnuradio/audio_osx.scm
+# endif
 
 ## Various SWIG variables.  These can be overloaded in the including
 ## Makefile.am by setting the variable value there, then including
@@ -135,15 +135,14 @@ libguile_audio_osx_la_LIBADD = $(_audio_osx_la_LIBADD)
 libguile_audio_osx_la_LDFLAGS = $(_audio_osx_la_LDFLAGS)
 libguile_audio_osx_la_CXXFLAGS = $(_audio_osx_la_CXXFLAGS)
 
-guile/audio_osx.lo: audio_osx.lo
-audio_osx.scm: audio_osx.i
-gnuradio/audio_osx-primitive.scm: audio_osx.scm
+guile/audio_osx.cc: gnuradio/audio_osx.scm
+gnuradio/audio_osx.scm: audio_osx.i
+gnuradio/audio_osx-primitive.scm: gnuradio/audio_osx.scm
 
 -include guile/audio_osx.d
 
 endif				# end of GUILE
 
-python/audio_osx.lo:
 audio_osx.lo: audio_osx.py audio_osx.scm
 audio_osx.py: audio_osx.i
 
diff --git a/gr-audio-portaudio/src/Makefile.swig.gen b/gr-audio-portaudio/src/Makefile.swig.gen
index 7d744ad3a..05408468a 100644
--- a/gr-audio-portaudio/src/Makefile.swig.gen
+++ b/gr-audio-portaudio/src/Makefile.swig.gen
@@ -84,10 +84,10 @@ MOSTLYCLEANFILES += $(DEPDIR)/*.S*
 
 # 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 += audio_portaudio.scm
-endif
+# 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
@@ -135,15 +135,14 @@ 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)
 
-guile/audio_portaudio.lo: audio_portaudio.lo
-audio_portaudio.scm: audio_portaudio.i
-gnuradio/audio_portaudio-primitive.scm: audio_portaudio.scm
+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 guile/audio_portaudio.d
 
 endif				# end of GUILE
 
-python/audio_portaudio.lo:
 audio_portaudio.lo: audio_portaudio.py audio_portaudio.scm
 audio_portaudio.py: audio_portaudio.i
 
diff --git a/gr-audio-windows/src/Makefile.swig.gen b/gr-audio-windows/src/Makefile.swig.gen
index 3fea849ec..4009fa9b0 100644
--- a/gr-audio-windows/src/Makefile.swig.gen
+++ b/gr-audio-windows/src/Makefile.swig.gen
@@ -84,10 +84,10 @@ MOSTLYCLEANFILES += $(DEPDIR)/*.S*
 
 # 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_windows.py
-if GUILE
-swig_built_sources += audio_windows.scm
-endif
+# swig_built_sources += audio_windows.py
+# if GUILE
+# swig_built_sources += gnuradio/audio_windows.scm
+# endif
 
 ## Various SWIG variables.  These can be overloaded in the including
 ## Makefile.am by setting the variable value there, then including
@@ -135,15 +135,14 @@ libguile_audio_windows_la_LIBADD = $(_audio_windows_la_LIBADD)
 libguile_audio_windows_la_LDFLAGS = $(_audio_windows_la_LDFLAGS)
 libguile_audio_windows_la_CXXFLAGS = $(_audio_windows_la_CXXFLAGS)
 
-guile/audio_windows.lo: audio_windows.lo
-audio_windows.scm: audio_windows.i
-gnuradio/audio_windows-primitive.scm: audio_windows.scm
+guile/audio_windows.cc: gnuradio/audio_windows.scm
+gnuradio/audio_windows.scm: audio_windows.i
+gnuradio/audio_windows-primitive.scm: gnuradio/audio_windows.scm
 
 -include guile/audio_windows.d
 
 endif				# end of GUILE
 
-python/audio_windows.lo:
 audio_windows.lo: audio_windows.py audio_windows.scm
 audio_windows.py: audio_windows.i
 
diff --git a/gr-comedi/src/Makefile.swig.gen b/gr-comedi/src/Makefile.swig.gen
index 06be4769e..8fab4212b 100644
--- a/gr-comedi/src/Makefile.swig.gen
+++ b/gr-comedi/src/Makefile.swig.gen
@@ -84,10 +84,10 @@ MOSTLYCLEANFILES += $(DEPDIR)/*.S*
 
 # 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 += comedi.py
-if GUILE
-swig_built_sources += comedi.scm
-endif
+# swig_built_sources += comedi.py
+# if GUILE
+# swig_built_sources += gnuradio/comedi.scm
+# endif
 
 ## Various SWIG variables.  These can be overloaded in the including
 ## Makefile.am by setting the variable value there, then including
@@ -135,15 +135,14 @@ libguile_comedi_la_LIBADD = $(_comedi_la_LIBADD)
 libguile_comedi_la_LDFLAGS = $(_comedi_la_LDFLAGS)
 libguile_comedi_la_CXXFLAGS = $(_comedi_la_CXXFLAGS)
 
-guile/comedi.lo: comedi.lo
-comedi.scm: comedi.i
-gnuradio/comedi-primitive.scm: comedi.scm
+guile/comedi.cc: gnuradio/comedi.scm
+gnuradio/comedi.scm: comedi.i
+gnuradio/comedi-primitive.scm: gnuradio/comedi.scm
 
 -include guile/comedi.d
 
 endif				# end of GUILE
 
-python/comedi.lo:
 comedi.lo: comedi.py comedi.scm
 comedi.py: comedi.i
 
diff --git a/gr-gcell/src/Makefile.swig.gen b/gr-gcell/src/Makefile.swig.gen
index 819b2b4ab..7a11242dd 100644
--- a/gr-gcell/src/Makefile.swig.gen
+++ b/gr-gcell/src/Makefile.swig.gen
@@ -84,10 +84,10 @@ MOSTLYCLEANFILES += $(DEPDIR)/*.S*
 
 # 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 += gcell.py
-if GUILE
-swig_built_sources += gcell.scm
-endif
+# swig_built_sources += gcell.py
+# if GUILE
+# swig_built_sources += gnuradio/gcell.scm
+# endif
 
 ## Various SWIG variables.  These can be overloaded in the including
 ## Makefile.am by setting the variable value there, then including
@@ -135,15 +135,14 @@ libguile_gcell_la_LIBADD = $(_gcell_la_LIBADD)
 libguile_gcell_la_LDFLAGS = $(_gcell_la_LDFLAGS)
 libguile_gcell_la_CXXFLAGS = $(_gcell_la_CXXFLAGS)
 
-guile/gcell.lo: gcell.lo
-gcell.scm: gcell.i
-gnuradio/gcell-primitive.scm: gcell.scm
+guile/gcell.cc: gnuradio/gcell.scm
+gnuradio/gcell.scm: gcell.i
+gnuradio/gcell-primitive.scm: gnuradio/gcell.scm
 
 -include guile/gcell.d
 
 endif				# end of GUILE
 
-python/gcell.lo:
 gcell.lo: gcell.py gcell.scm
 gcell.py: gcell.i
 
diff --git a/gr-uhd/swig/Makefile.swig.gen b/gr-uhd/swig/Makefile.swig.gen
index 86ead5b00..c0823e5f2 100644
--- a/gr-uhd/swig/Makefile.swig.gen
+++ b/gr-uhd/swig/Makefile.swig.gen
@@ -84,10 +84,10 @@ MOSTLYCLEANFILES += $(DEPDIR)/*.S*
 
 # 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 += uhd_swig.py
-if GUILE
-swig_built_sources += uhd_swig.scm
-endif
+# swig_built_sources += uhd_swig.py
+# if GUILE
+# swig_built_sources += gnuradio/uhd_swig.scm
+# endif
 
 ## Various SWIG variables.  These can be overloaded in the including
 ## Makefile.am by setting the variable value there, then including
@@ -135,15 +135,14 @@ libguile_uhd_swig_la_LIBADD = $(_uhd_swig_la_LIBADD)
 libguile_uhd_swig_la_LDFLAGS = $(_uhd_swig_la_LDFLAGS)
 libguile_uhd_swig_la_CXXFLAGS = $(_uhd_swig_la_CXXFLAGS)
 
-guile/uhd_swig.lo: uhd_swig.lo
-uhd_swig.scm: uhd_swig.i
-gnuradio/uhd_swig-primitive.scm: uhd_swig.scm
+guile/uhd_swig.cc: gnuradio/uhd_swig.scm
+gnuradio/uhd_swig.scm: uhd_swig.i
+gnuradio/uhd_swig-primitive.scm: gnuradio/uhd_swig.scm
 
 -include guile/uhd_swig.d
 
 endif				# end of GUILE
 
-python/uhd_swig.lo:
 uhd_swig.lo: uhd_swig.py uhd_swig.scm
 uhd_swig.py: uhd_swig.i