16 files changed, 154 insertions, 176 deletions
diff --git a/gnuradio-core/src/lib/swig/Makefile.swig.gen b/gnuradio-core/src/lib/swig/Makefile.swig.gen
index 69042f84e1..a92ff22314 100644
--- a/gnuradio-core/src/lib/swig/Makefile.swig.gen
+++ b/gnuradio-core/src/lib/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 += gnuradio_core_runtime.py
-if GUILE
-swig_built_sources += gnuradio_core_runtime.scm
-endif
+# 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
@@ -135,15 +135,14 @@ 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)
 
-guile/gnuradio_core_runtime.lo: gnuradio_core_runtime.lo
-gnuradio_core_runtime.scm: gnuradio_core_runtime.i
-gnuradio/gnuradio_core_runtime-primitive.scm: gnuradio_core_runtime.scm
+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 guile/gnuradio_core_runtime.d
 
 endif				# end of GUILE
 
-python/gnuradio_core_runtime.lo:
 gnuradio_core_runtime.lo: gnuradio_core_runtime.py gnuradio_core_runtime.scm
 gnuradio_core_runtime.py: gnuradio_core_runtime.i
 
@@ -235,10 +234,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 += gnuradio_core_general.py
-if GUILE
-swig_built_sources += gnuradio_core_general.scm
-endif
+# 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
@@ -286,15 +285,14 @@ 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)
 
-guile/gnuradio_core_general.lo: gnuradio_core_general.lo
-gnuradio_core_general.scm: gnuradio_core_general.i
-gnuradio/gnuradio_core_general-primitive.scm: gnuradio_core_general.scm
+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 guile/gnuradio_core_general.d
 
 endif				# end of GUILE
 
-python/gnuradio_core_general.lo:
 gnuradio_core_general.lo: gnuradio_core_general.py gnuradio_core_general.scm
 gnuradio_core_general.py: gnuradio_core_general.i
 
@@ -386,10 +384,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 += gnuradio_core_gengen.py
-if GUILE
-swig_built_sources += gnuradio_core_gengen.scm
-endif
+# 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
@@ -437,15 +435,14 @@ 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)
 
-guile/gnuradio_core_gengen.lo: gnuradio_core_gengen.lo
-gnuradio_core_gengen.scm: gnuradio_core_gengen.i
-gnuradio/gnuradio_core_gengen-primitive.scm: gnuradio_core_gengen.scm
+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 guile/gnuradio_core_gengen.d
 
 endif				# end of GUILE
 
-python/gnuradio_core_gengen.lo:
 gnuradio_core_gengen.lo: gnuradio_core_gengen.py gnuradio_core_gengen.scm
 gnuradio_core_gengen.py: gnuradio_core_gengen.i
 
@@ -537,10 +534,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 += gnuradio_core_filter.py
-if GUILE
-swig_built_sources += gnuradio_core_filter.scm
-endif
+# 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
@@ -588,15 +585,14 @@ 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)
 
-guile/gnuradio_core_filter.lo: gnuradio_core_filter.lo
-gnuradio_core_filter.scm: gnuradio_core_filter.i
-gnuradio/gnuradio_core_filter-primitive.scm: gnuradio_core_filter.scm
+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 guile/gnuradio_core_filter.d
 
 endif				# end of GUILE
 
-python/gnuradio_core_filter.lo:
 gnuradio_core_filter.lo: gnuradio_core_filter.py gnuradio_core_filter.scm
 gnuradio_core_filter.py: gnuradio_core_filter.i
 
@@ -688,10 +684,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 += gnuradio_core_io.py
-if GUILE
-swig_built_sources += gnuradio_core_io.scm
-endif
+# 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
@@ -739,15 +735,14 @@ 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)
 
-guile/gnuradio_core_io.lo: gnuradio_core_io.lo
-gnuradio_core_io.scm: gnuradio_core_io.i
-gnuradio/gnuradio_core_io-primitive.scm: gnuradio_core_io.scm
+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 guile/gnuradio_core_io.d
 
 endif				# end of GUILE
 
-python/gnuradio_core_io.lo:
 gnuradio_core_io.lo: gnuradio_core_io.py gnuradio_core_io.scm
 gnuradio_core_io.py: gnuradio_core_io.i
 
@@ -839,10 +834,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 += gnuradio_core_hier.py
-if GUILE
-swig_built_sources += gnuradio_core_hier.scm
-endif
+# 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
@@ -890,15 +885,14 @@ 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)
 
-guile/gnuradio_core_hier.lo: gnuradio_core_hier.lo
-gnuradio_core_hier.scm: gnuradio_core_hier.i
-gnuradio/gnuradio_core_hier-primitive.scm: gnuradio_core_hier.scm
+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 guile/gnuradio_core_hier.d
 
 endif				# end of GUILE
 
-python/gnuradio_core_hier.lo:
 gnuradio_core_hier.lo: gnuradio_core_hier.py gnuradio_core_hier.scm
 gnuradio_core_hier.py: gnuradio_core_hier.i
 
diff --git a/gr-atsc/src/lib/Makefile.swig.gen b/gr-atsc/src/lib/Makefile.swig.gen
index 2a07d4f1d6..f4667c5c6a 100644
--- a/gr-atsc/src/lib/Makefile.swig.gen
+++ b/gr-atsc/src/lib/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 += atsc.py
-if GUILE
-swig_built_sources += atsc.scm
-endif
+# swig_built_sources += atsc.py
+# if GUILE
+# swig_built_sources += gnuradio/atsc.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_atsc_la_LIBADD = $(_atsc_la_LIBADD)
 libguile_atsc_la_LDFLAGS = $(_atsc_la_LDFLAGS)
 libguile_atsc_la_CXXFLAGS = $(_atsc_la_CXXFLAGS)
 
-guile/atsc.lo: atsc.lo
-atsc.scm: atsc.i
-gnuradio/atsc-primitive.scm: atsc.scm
+guile/atsc.cc: gnuradio/atsc.scm
+gnuradio/atsc.scm: atsc.i
+gnuradio/atsc-primitive.scm: gnuradio/atsc.scm
 
 -include guile/atsc.d
 
 endif				# end of GUILE
 
-python/atsc.lo:
 atsc.lo: atsc.py atsc.scm
 atsc.py: atsc.i
 
diff --git a/gr-audio-alsa/src/Makefile.swig.gen b/gr-audio-alsa/src/Makefile.swig.gen
index 59e04e6a9c..930e122d0f 100644
--- a/gr-audio-alsa/src/Makefile.swig.gen
+++ b/gr-audio-alsa/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_alsa.py
-if GUILE
-swig_built_sources += audio_alsa.scm
-endif
+# swig_built_sources += audio_alsa.py
+# if GUILE
+# swig_built_sources += gnuradio/audio_alsa.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_alsa_la_LIBADD = $(_audio_alsa_la_LIBADD)
 libguile_audio_alsa_la_LDFLAGS = $(_audio_alsa_la_LDFLAGS)
 libguile_audio_alsa_la_CXXFLAGS = $(_audio_alsa_la_CXXFLAGS)
 
-guile/audio_alsa.lo: audio_alsa.lo
-audio_alsa.scm: audio_alsa.i
-gnuradio/audio_alsa-primitive.scm: audio_alsa.scm
+guile/audio_alsa.cc: gnuradio/audio_alsa.scm
+gnuradio/audio_alsa.scm: audio_alsa.i
+gnuradio/audio_alsa-primitive.scm: gnuradio/audio_alsa.scm
 
 -include guile/audio_alsa.d
 
 endif				# end of GUILE
 
-python/audio_alsa.lo:
 audio_alsa.lo: audio_alsa.py audio_alsa.scm
 audio_alsa.py: audio_alsa.i
 
diff --git a/gr-audio-oss/src/Makefile.swig.gen b/gr-audio-oss/src/Makefile.swig.gen
index 95953e738c..38f2b0e7d1 100644
--- a/gr-audio-oss/src/Makefile.swig.gen
+++ b/gr-audio-oss/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_oss.py
-if GUILE
-swig_built_sources += audio_oss.scm
-endif
+# swig_built_sources += audio_oss.py
+# if GUILE
+# swig_built_sources += gnuradio/audio_oss.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_oss_la_LIBADD = $(_audio_oss_la_LIBADD)
 libguile_audio_oss_la_LDFLAGS = $(_audio_oss_la_LDFLAGS)
 libguile_audio_oss_la_CXXFLAGS = $(_audio_oss_la_CXXFLAGS)
 
-guile/audio_oss.lo: audio_oss.lo
-audio_oss.scm: audio_oss.i
-gnuradio/audio_oss-primitive.scm: audio_oss.scm
+guile/audio_oss.cc: gnuradio/audio_oss.scm
+gnuradio/audio_oss.scm: audio_oss.i
+gnuradio/audio_oss-primitive.scm: gnuradio/audio_oss.scm
 
 -include guile/audio_oss.d
 
 endif				# end of GUILE
 
-python/audio_oss.lo:
 audio_oss.lo: audio_oss.py audio_oss.scm
 audio_oss.py: audio_oss.i
 
diff --git a/gr-cvsd-vocoder/src/lib/Makefile.swig.gen b/gr-cvsd-vocoder/src/lib/Makefile.swig.gen
index 3aaed9763d..0748596f3a 100644
--- a/gr-cvsd-vocoder/src/lib/Makefile.swig.gen
+++ b/gr-cvsd-vocoder/src/lib/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 += cvsd_vocoder.py
-if GUILE
-swig_built_sources += cvsd_vocoder.scm
-endif
+# swig_built_sources += cvsd_vocoder.py
+# if GUILE
+# swig_built_sources += gnuradio/cvsd_vocoder.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_cvsd_vocoder_la_LIBADD = $(_cvsd_vocoder_la_LIBADD)
 libguile_cvsd_vocoder_la_LDFLAGS = $(_cvsd_vocoder_la_LDFLAGS)
 libguile_cvsd_vocoder_la_CXXFLAGS = $(_cvsd_vocoder_la_CXXFLAGS)
 
-guile/cvsd_vocoder.lo: cvsd_vocoder.lo
-cvsd_vocoder.scm: cvsd_vocoder.i
-gnuradio/cvsd_vocoder-primitive.scm: cvsd_vocoder.scm
+guile/cvsd_vocoder.cc: gnuradio/cvsd_vocoder.scm
+gnuradio/cvsd_vocoder.scm: cvsd_vocoder.i
+gnuradio/cvsd_vocoder-primitive.scm: gnuradio/cvsd_vocoder.scm
 
 -include guile/cvsd_vocoder.d
 
 endif				# end of GUILE
 
-python/cvsd_vocoder.lo:
 cvsd_vocoder.lo: cvsd_vocoder.py cvsd_vocoder.scm
 cvsd_vocoder.py: cvsd_vocoder.i
 
diff --git a/gr-gsm-fr-vocoder/src/lib/Makefile.swig.gen b/gr-gsm-fr-vocoder/src/lib/Makefile.swig.gen
index c4a9d909c6..5b3c2d3d61 100644
--- a/gr-gsm-fr-vocoder/src/lib/Makefile.swig.gen
+++ b/gr-gsm-fr-vocoder/src/lib/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 += gsm_full_rate.py
-if GUILE
-swig_built_sources += gsm_full_rate.scm
-endif
+# swig_built_sources += gsm_full_rate.py
+# if GUILE
+# swig_built_sources += gnuradio/gsm_full_rate.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_gsm_full_rate_la_LIBADD = $(_gsm_full_rate_la_LIBADD)
 libguile_gsm_full_rate_la_LDFLAGS = $(_gsm_full_rate_la_LDFLAGS)
 libguile_gsm_full_rate_la_CXXFLAGS = $(_gsm_full_rate_la_CXXFLAGS)
 
-guile/gsm_full_rate.lo: gsm_full_rate.lo
-gsm_full_rate.scm: gsm_full_rate.i
-gnuradio/gsm_full_rate-primitive.scm: gsm_full_rate.scm
+guile/gsm_full_rate.cc: gnuradio/gsm_full_rate.scm
+gnuradio/gsm_full_rate.scm: gsm_full_rate.i
+gnuradio/gsm_full_rate-primitive.scm: gnuradio/gsm_full_rate.scm
 
 -include guile/gsm_full_rate.d
 
 endif				# end of GUILE
 
-python/gsm_full_rate.lo:
 gsm_full_rate.lo: gsm_full_rate.py gsm_full_rate.scm
 gsm_full_rate.py: gsm_full_rate.i
 
diff --git a/gr-msdd6000/src/Makefile.swig.gen b/gr-msdd6000/src/Makefile.swig.gen
index 43d0e69ae0..ba3850cd87 100644
--- a/gr-msdd6000/src/Makefile.swig.gen
+++ b/gr-msdd6000/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 += msdd.py
-if GUILE
-swig_built_sources += msdd.scm
-endif
+# 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
@@ -135,15 +135,14 @@ libguile_msdd_la_LIBADD = $(_msdd_la_LIBADD)
 libguile_msdd_la_LDFLAGS = $(_msdd_la_LDFLAGS)
 libguile_msdd_la_CXXFLAGS = $(_msdd_la_CXXFLAGS)
 
-guile/msdd.lo: msdd.lo
-msdd.scm: msdd.i
-gnuradio/msdd-primitive.scm: msdd.scm
+guile/msdd.cc: gnuradio/msdd.scm
+gnuradio/msdd.scm: msdd.i
+gnuradio/msdd-primitive.scm: gnuradio/msdd.scm
 
 -include guile/msdd.d
 
 endif				# end of GUILE
 
-python/msdd.lo:
 msdd.lo: msdd.py msdd.scm
 msdd.py: msdd.i
 
@@ -235,10 +234,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 += msdd_rs.py
-if GUILE
-swig_built_sources += msdd_rs.scm
-endif
+# 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
@@ -286,15 +285,14 @@ 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)
 
-guile/msdd_rs.lo: msdd_rs.lo
-msdd_rs.scm: msdd_rs.i
-gnuradio/msdd_rs-primitive.scm: msdd_rs.scm
+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 guile/msdd_rs.d
 
 endif				# end of GUILE
 
-python/msdd_rs.lo:
 msdd_rs.lo: msdd_rs.py msdd_rs.scm
 msdd_rs.py: msdd_rs.i
 
diff --git a/gr-noaa/swig/Makefile.swig.gen b/gr-noaa/swig/Makefile.swig.gen
index 95cb34be16..7e02878536 100644
--- a/gr-noaa/swig/Makefile.swig.gen
+++ b/gr-noaa/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 += noaa_swig.py
-if GUILE
-swig_built_sources += noaa_swig.scm
-endif
+# swig_built_sources += noaa_swig.py
+# if GUILE
+# swig_built_sources += gnuradio/noaa_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_noaa_swig_la_LIBADD = $(_noaa_swig_la_LIBADD)
 libguile_noaa_swig_la_LDFLAGS = $(_noaa_swig_la_LDFLAGS)
 libguile_noaa_swig_la_CXXFLAGS = $(_noaa_swig_la_CXXFLAGS)
 
-guile/noaa_swig.lo: noaa_swig.lo
-noaa_swig.scm: noaa_swig.i
-gnuradio/noaa_swig-primitive.scm: noaa_swig.scm
+guile/noaa_swig.cc: gnuradio/noaa_swig.scm
+gnuradio/noaa_swig.scm: noaa_swig.i
+gnuradio/noaa_swig-primitive.scm: gnuradio/noaa_swig.scm
 
 -include guile/noaa_swig.d
 
 endif				# end of GUILE
 
-python/noaa_swig.lo:
 noaa_swig.lo: noaa_swig.py noaa_swig.scm
 noaa_swig.py: noaa_swig.i
 
diff --git a/gr-pager/swig/Makefile.swig.gen b/gr-pager/swig/Makefile.swig.gen
index 4d0ff3b0e0..3a719394b8 100644
--- a/gr-pager/swig/Makefile.swig.gen
+++ b/gr-pager/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 += pager_swig.py
-if GUILE
-swig_built_sources += pager_swig.scm
-endif
+# swig_built_sources += pager_swig.py
+# if GUILE
+# swig_built_sources += gnuradio/pager_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_pager_swig_la_LIBADD = $(_pager_swig_la_LIBADD)
 libguile_pager_swig_la_LDFLAGS = $(_pager_swig_la_LDFLAGS)
 libguile_pager_swig_la_CXXFLAGS = $(_pager_swig_la_CXXFLAGS)
 
-guile/pager_swig.lo: pager_swig.lo
-pager_swig.scm: pager_swig.i
-gnuradio/pager_swig-primitive.scm: pager_swig.scm
+guile/pager_swig.cc: gnuradio/pager_swig.scm
+gnuradio/pager_swig.scm: pager_swig.i
+gnuradio/pager_swig-primitive.scm: gnuradio/pager_swig.scm
 
 -include guile/pager_swig.d
 
 endif				# end of GUILE
 
-python/pager_swig.lo:
 pager_swig.lo: pager_swig.py pager_swig.scm
 pager_swig.py: pager_swig.i
 
diff --git a/gr-qtgui/src/lib/Makefile.swig.gen b/gr-qtgui/src/lib/Makefile.swig.gen
index 52c8a74738..aeb0af3042 100644
--- a/gr-qtgui/src/lib/Makefile.swig.gen
+++ b/gr-qtgui/src/lib/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 += qtgui.py
-if GUILE
-swig_built_sources += qtgui.scm
-endif
+# swig_built_sources += qtgui.py
+# if GUILE
+# swig_built_sources += gnuradio/qtgui.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_qtgui_la_LIBADD = $(_qtgui_la_LIBADD)
 libguile_qtgui_la_LDFLAGS = $(_qtgui_la_LDFLAGS)
 libguile_qtgui_la_CXXFLAGS = $(_qtgui_la_CXXFLAGS)
 
-guile/qtgui.lo: qtgui.lo
-qtgui.scm: qtgui.i
-gnuradio/qtgui-primitive.scm: qtgui.scm
+guile/qtgui.cc: gnuradio/qtgui.scm
+gnuradio/qtgui.scm: qtgui.i
+gnuradio/qtgui-primitive.scm: gnuradio/qtgui.scm
 
 -include guile/qtgui.d
 
 endif				# end of GUILE
 
-python/qtgui.lo:
 qtgui.lo: qtgui.py qtgui.scm
 qtgui.py: qtgui.i
 
diff --git a/gr-radio-astronomy/src/lib/Makefile.swig.gen b/gr-radio-astronomy/src/lib/Makefile.swig.gen
index 0a734aa3b0..82af254d3b 100644
--- a/gr-radio-astronomy/src/lib/Makefile.swig.gen
+++ b/gr-radio-astronomy/src/lib/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 += ra.py
-if GUILE
-swig_built_sources += ra.scm
-endif
+# swig_built_sources += ra.py
+# if GUILE
+# swig_built_sources += gnuradio/ra.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_ra_la_LIBADD = $(_ra_la_LIBADD)
 libguile_ra_la_LDFLAGS = $(_ra_la_LDFLAGS)
 libguile_ra_la_CXXFLAGS = $(_ra_la_CXXFLAGS)
 
-guile/ra.lo: ra.lo
-ra.scm: ra.i
-gnuradio/ra-primitive.scm: ra.scm
+guile/ra.cc: gnuradio/ra.scm
+gnuradio/ra.scm: ra.i
+gnuradio/ra-primitive.scm: gnuradio/ra.scm
 
 -include guile/ra.d
 
 endif				# end of GUILE
 
-python/ra.lo:
 ra.lo: ra.py ra.scm
 ra.py: ra.i
 
diff --git a/gr-trellis/src/lib/Makefile.swig.gen b/gr-trellis/src/lib/Makefile.swig.gen
index ec6f97ecb6..4417d49095 100644
--- a/gr-trellis/src/lib/Makefile.swig.gen
+++ b/gr-trellis/src/lib/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 += trellis.py
-if GUILE
-swig_built_sources += trellis.scm
-endif
+# swig_built_sources += trellis.py
+# if GUILE
+# swig_built_sources += gnuradio/trellis.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_trellis_la_LIBADD = $(_trellis_la_LIBADD)
 libguile_trellis_la_LDFLAGS = $(_trellis_la_LDFLAGS)
 libguile_trellis_la_CXXFLAGS = $(_trellis_la_CXXFLAGS)
 
-guile/trellis.lo: trellis.lo
-trellis.scm: trellis.i
-gnuradio/trellis-primitive.scm: trellis.scm
+guile/trellis.cc: gnuradio/trellis.scm
+gnuradio/trellis.scm: trellis.i
+gnuradio/trellis-primitive.scm: gnuradio/trellis.scm
 
 -include guile/trellis.d
 
 endif				# end of GUILE
 
-python/trellis.lo:
 trellis.lo: trellis.py trellis.scm
 trellis.py: trellis.i
 
diff --git a/gr-usrp/src/Makefile.swig.gen b/gr-usrp/src/Makefile.swig.gen
index 7099b0bd9e..c5ead816ef 100644
--- a/gr-usrp/src/Makefile.swig.gen
+++ b/gr-usrp/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 += usrp_swig.py
-if GUILE
-swig_built_sources += usrp_swig.scm
-endif
+# swig_built_sources += usrp_swig.py
+# if GUILE
+# swig_built_sources += gnuradio/usrp_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_usrp_swig_la_LIBADD = $(_usrp_swig_la_LIBADD)
 libguile_usrp_swig_la_LDFLAGS = $(_usrp_swig_la_LDFLAGS)
 libguile_usrp_swig_la_CXXFLAGS = $(_usrp_swig_la_CXXFLAGS)
 
-guile/usrp_swig.lo: usrp_swig.lo
-usrp_swig.scm: usrp_swig.i
-gnuradio/usrp_swig-primitive.scm: usrp_swig.scm
+guile/usrp_swig.cc: gnuradio/usrp_swig.scm
+gnuradio/usrp_swig.scm: usrp_swig.i
+gnuradio/usrp_swig-primitive.scm: gnuradio/usrp_swig.scm
 
 -include guile/usrp_swig.d
 
 endif				# end of GUILE
 
-python/usrp_swig.lo:
 usrp_swig.lo: usrp_swig.py usrp_swig.scm
 usrp_swig.py: usrp_swig.i
 
diff --git a/gr-usrp2/src/Makefile.swig.gen b/gr-usrp2/src/Makefile.swig.gen
index 4b748939fc..72abdef923 100644
--- a/gr-usrp2/src/Makefile.swig.gen
+++ b/gr-usrp2/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 += usrp2.py
-if GUILE
-swig_built_sources += usrp2.scm
-endif
+# 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
@@ -135,15 +135,14 @@ libguile_usrp2_la_LIBADD = $(_usrp2_la_LIBADD)
 libguile_usrp2_la_LDFLAGS = $(_usrp2_la_LDFLAGS)
 libguile_usrp2_la_CXXFLAGS = $(_usrp2_la_CXXFLAGS)
 
-guile/usrp2.lo: usrp2.lo
-usrp2.scm: usrp2.i
-gnuradio/usrp2-primitive.scm: usrp2.scm
+guile/usrp2.cc: gnuradio/usrp2.scm
+gnuradio/usrp2.scm: usrp2.i
+gnuradio/usrp2-primitive.scm: gnuradio/usrp2.scm
 
 -include guile/usrp2.d
 
 endif				# end of GUILE
 
-python/usrp2.lo:
 usrp2.lo: usrp2.py usrp2.scm
 usrp2.py: usrp2.i
 
diff --git a/gr-video-sdl/src/Makefile.swig.gen b/gr-video-sdl/src/Makefile.swig.gen
index 54d9e37fc3..6a8e6e040e 100644
--- a/gr-video-sdl/src/Makefile.swig.gen
+++ b/gr-video-sdl/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 += video_sdl.py
-if GUILE
-swig_built_sources += video_sdl.scm
-endif
+# swig_built_sources += video_sdl.py
+# if GUILE
+# swig_built_sources += gnuradio/video_sdl.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_video_sdl_la_LIBADD = $(_video_sdl_la_LIBADD)
 libguile_video_sdl_la_LDFLAGS = $(_video_sdl_la_LDFLAGS)
 libguile_video_sdl_la_CXXFLAGS = $(_video_sdl_la_CXXFLAGS)
 
-guile/video_sdl.lo: video_sdl.lo
-video_sdl.scm: video_sdl.i
-gnuradio/video_sdl-primitive.scm: video_sdl.scm
+guile/video_sdl.cc: gnuradio/video_sdl.scm
+gnuradio/video_sdl.scm: video_sdl.i
+gnuradio/video_sdl-primitive.scm: gnuradio/video_sdl.scm
 
 -include guile/video_sdl.d
 
 endif				# end of GUILE
 
-python/video_sdl.lo:
 video_sdl.lo: video_sdl.py video_sdl.scm
 video_sdl.py: video_sdl.i
 
diff --git a/usrp/host/swig/Makefile.swig.gen b/usrp/host/swig/Makefile.swig.gen
index 16e23dccd9..7b778a11b9 100644
--- a/usrp/host/swig/Makefile.swig.gen
+++ b/usrp/host/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 += usrp_prims.py
-if GUILE
-swig_built_sources += usrp_prims.scm
-endif
+# swig_built_sources += usrp_prims.py
+# if GUILE
+# swig_built_sources += gnuradio/usrp_prims.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_usrp_prims_la_LIBADD = $(_usrp_prims_la_LIBADD)
 libguile_usrp_prims_la_LDFLAGS = $(_usrp_prims_la_LDFLAGS)
 libguile_usrp_prims_la_CXXFLAGS = $(_usrp_prims_la_CXXFLAGS)
 
-guile/usrp_prims.lo: usrp_prims.lo
-usrp_prims.scm: usrp_prims.i
-gnuradio/usrp_prims-primitive.scm: usrp_prims.scm
+guile/usrp_prims.cc: gnuradio/usrp_prims.scm
+gnuradio/usrp_prims.scm: usrp_prims.i
+gnuradio/usrp_prims-primitive.scm: gnuradio/usrp_prims.scm
 
 -include guile/usrp_prims.d
 
 endif				# end of GUILE
 
-python/usrp_prims.lo:
 usrp_prims.lo: usrp_prims.py usrp_prims.scm
 usrp_prims.py: usrp_prims.i