13 files changed, 89 insertions, 32 deletions
diff --git a/gnuradio-core/src/lib/swig/Makefile.swig.gen b/gnuradio-core/src/lib/swig/Makefile.swig.gen
index 67cefe7d0c..69042f84e1 100644
--- a/gnuradio-core/src/lib/swig/Makefile.swig.gen
+++ b/gnuradio-core/src/lib/swig/Makefile.swig.gen
@@ -128,7 +128,7 @@ gnuradio_core_runtime_scmlib_LTLIBRARIES = libguile-gnuradio_core_runtime.la
 libguile_gnuradio_core_runtime_la_SOURCES = 		\
 	guile/gnuradio_core_runtime.cc			\
 	$(gnuradio_core_runtime_la_swig_sources)
-nobase_gnuradio_core_runtime_scm_DATA = gnuradio/gnuradio_core_runtime.scm gnuradio/gnuradio_core_runtime-primtive.scm
+nobase_gnuradio_core_runtime_scm_DATA = gnuradio/gnuradio_core_runtime.scm gnuradio/gnuradio_core_runtime-primitive.scm
 
 # Guile can use the same flags as python does
 libguile_gnuradio_core_runtime_la_LIBADD = $(_gnuradio_core_runtime_la_LIBADD)
@@ -137,6 +137,9 @@ libguile_gnuradio_core_runtime_la_CXXFLAGS = $(_gnuradio_core_runtime_la_CXXFLAG
 
 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
+
+-include guile/gnuradio_core_runtime.d
 
 endif				# end of GUILE
 
@@ -276,7 +279,7 @@ gnuradio_core_general_scmlib_LTLIBRARIES = libguile-gnuradio_core_general.la
 libguile_gnuradio_core_general_la_SOURCES = 		\
 	guile/gnuradio_core_general.cc			\
 	$(gnuradio_core_general_la_swig_sources)
-nobase_gnuradio_core_general_scm_DATA = gnuradio/gnuradio_core_general.scm gnuradio/gnuradio_core_general-primtive.scm
+nobase_gnuradio_core_general_scm_DATA = gnuradio/gnuradio_core_general.scm gnuradio/gnuradio_core_general-primitive.scm
 
 # Guile can use the same flags as python does
 libguile_gnuradio_core_general_la_LIBADD = $(_gnuradio_core_general_la_LIBADD)
@@ -285,6 +288,9 @@ libguile_gnuradio_core_general_la_CXXFLAGS = $(_gnuradio_core_general_la_CXXFLAG
 
 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
+
+-include guile/gnuradio_core_general.d
 
 endif				# end of GUILE
 
@@ -424,7 +430,7 @@ gnuradio_core_gengen_scmlib_LTLIBRARIES = libguile-gnuradio_core_gengen.la
 libguile_gnuradio_core_gengen_la_SOURCES = 		\
 	guile/gnuradio_core_gengen.cc			\
 	$(gnuradio_core_gengen_la_swig_sources)
-nobase_gnuradio_core_gengen_scm_DATA = gnuradio/gnuradio_core_gengen.scm gnuradio/gnuradio_core_gengen-primtive.scm
+nobase_gnuradio_core_gengen_scm_DATA = gnuradio/gnuradio_core_gengen.scm gnuradio/gnuradio_core_gengen-primitive.scm
 
 # Guile can use the same flags as python does
 libguile_gnuradio_core_gengen_la_LIBADD = $(_gnuradio_core_gengen_la_LIBADD)
@@ -433,6 +439,9 @@ 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
+
+-include guile/gnuradio_core_gengen.d
 
 endif				# end of GUILE
 
@@ -572,7 +581,7 @@ gnuradio_core_filter_scmlib_LTLIBRARIES = libguile-gnuradio_core_filter.la
 libguile_gnuradio_core_filter_la_SOURCES = 		\
 	guile/gnuradio_core_filter.cc			\
 	$(gnuradio_core_filter_la_swig_sources)
-nobase_gnuradio_core_filter_scm_DATA = gnuradio/gnuradio_core_filter.scm gnuradio/gnuradio_core_filter-primtive.scm
+nobase_gnuradio_core_filter_scm_DATA = gnuradio/gnuradio_core_filter.scm gnuradio/gnuradio_core_filter-primitive.scm
 
 # Guile can use the same flags as python does
 libguile_gnuradio_core_filter_la_LIBADD = $(_gnuradio_core_filter_la_LIBADD)
@@ -581,6 +590,9 @@ 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
+
+-include guile/gnuradio_core_filter.d
 
 endif				# end of GUILE
 
@@ -720,7 +732,7 @@ gnuradio_core_io_scmlib_LTLIBRARIES = libguile-gnuradio_core_io.la
 libguile_gnuradio_core_io_la_SOURCES = 		\
 	guile/gnuradio_core_io.cc			\
 	$(gnuradio_core_io_la_swig_sources)
-nobase_gnuradio_core_io_scm_DATA = gnuradio/gnuradio_core_io.scm gnuradio/gnuradio_core_io-primtive.scm
+nobase_gnuradio_core_io_scm_DATA = gnuradio/gnuradio_core_io.scm gnuradio/gnuradio_core_io-primitive.scm
 
 # Guile can use the same flags as python does
 libguile_gnuradio_core_io_la_LIBADD = $(_gnuradio_core_io_la_LIBADD)
@@ -729,6 +741,9 @@ 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
+
+-include guile/gnuradio_core_io.d
 
 endif				# end of GUILE
 
@@ -868,7 +883,7 @@ gnuradio_core_hier_scmlib_LTLIBRARIES = libguile-gnuradio_core_hier.la
 libguile_gnuradio_core_hier_la_SOURCES = 		\
 	guile/gnuradio_core_hier.cc			\
 	$(gnuradio_core_hier_la_swig_sources)
-nobase_gnuradio_core_hier_scm_DATA = gnuradio/gnuradio_core_hier.scm gnuradio/gnuradio_core_hier-primtive.scm
+nobase_gnuradio_core_hier_scm_DATA = gnuradio/gnuradio_core_hier.scm gnuradio/gnuradio_core_hier-primitive.scm
 
 # Guile can use the same flags as python does
 libguile_gnuradio_core_hier_la_LIBADD = $(_gnuradio_core_hier_la_LIBADD)
@@ -877,6 +892,9 @@ 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
+
+-include guile/gnuradio_core_hier.d
 
 endif				# end of GUILE
 
diff --git a/gr-atsc/src/lib/Makefile.swig.gen b/gr-atsc/src/lib/Makefile.swig.gen
index 73db7909b5..2a07d4f1d6 100644
--- a/gr-atsc/src/lib/Makefile.swig.gen
+++ b/gr-atsc/src/lib/Makefile.swig.gen
@@ -46,7 +46,7 @@ atsc_scmlibdir = $(libdir)
 # The scm files for the guile modules get installed where ever guile
 # is installed, usually /usr/share/guile/site/atsc
 # FIXME: determince whether these should be installed with gnuradio.
-atsc_scmdir = $(guiledir)/gnuradio
+atsc_scmdir = $(guiledir)
 
 ## SWIG headers are always installed into the same directory.
 
@@ -128,7 +128,7 @@ atsc_scmlib_LTLIBRARIES = libguile-atsc.la
 libguile_atsc_la_SOURCES = 		\
 	guile/atsc.cc			\
 	$(atsc_la_swig_sources)
-atsc_scm_DATA = atsc.scm
+nobase_atsc_scm_DATA = gnuradio/atsc.scm gnuradio/atsc-primitive.scm
 
 # Guile can use the same flags as python does
 libguile_atsc_la_LIBADD = $(_atsc_la_LIBADD)
@@ -137,6 +137,9 @@ libguile_atsc_la_CXXFLAGS = $(_atsc_la_CXXFLAGS)
 
 guile/atsc.lo: atsc.lo
 atsc.scm: atsc.i
+gnuradio/atsc-primitive.scm: atsc.scm
+
+-include guile/atsc.d
 
 endif				# end of GUILE
 
diff --git a/gr-audio-alsa/src/Makefile.swig.gen b/gr-audio-alsa/src/Makefile.swig.gen
index 8ab5d5442f..59e04e6a9c 100644
--- a/gr-audio-alsa/src/Makefile.swig.gen
+++ b/gr-audio-alsa/src/Makefile.swig.gen
@@ -46,7 +46,7 @@ audio_alsa_scmlibdir = $(libdir)
 # The scm files for the guile modules get installed where ever guile
 # is installed, usually /usr/share/guile/site/audio_alsa
 # FIXME: determince whether these should be installed with gnuradio.
-audio_alsa_scmdir = $(guiledir)/gnuradio
+audio_alsa_scmdir = $(guiledir)
 
 ## SWIG headers are always installed into the same directory.
 
@@ -128,7 +128,7 @@ audio_alsa_scmlib_LTLIBRARIES = libguile-audio_alsa.la
 libguile_audio_alsa_la_SOURCES = 		\
 	guile/audio_alsa.cc			\
 	$(audio_alsa_la_swig_sources)
-audio_alsa_scm_DATA = audio_alsa.scm
+nobase_audio_alsa_scm_DATA = gnuradio/audio_alsa.scm gnuradio/audio_alsa-primitive.scm
 
 # Guile can use the same flags as python does
 libguile_audio_alsa_la_LIBADD = $(_audio_alsa_la_LIBADD)
@@ -137,6 +137,9 @@ 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
+
+-include guile/audio_alsa.d
 
 endif				# end of GUILE
 
diff --git a/gr-audio-oss/src/Makefile.swig.gen b/gr-audio-oss/src/Makefile.swig.gen
index 792a94eb0e..95953e738c 100644
--- a/gr-audio-oss/src/Makefile.swig.gen
+++ b/gr-audio-oss/src/Makefile.swig.gen
@@ -46,7 +46,7 @@ audio_oss_scmlibdir = $(libdir)
 # The scm files for the guile modules get installed where ever guile
 # is installed, usually /usr/share/guile/site/audio_oss
 # FIXME: determince whether these should be installed with gnuradio.
-audio_oss_scmdir = $(guiledir)/gnuradio
+audio_oss_scmdir = $(guiledir)
 
 ## SWIG headers are always installed into the same directory.
 
@@ -128,7 +128,7 @@ audio_oss_scmlib_LTLIBRARIES = libguile-audio_oss.la
 libguile_audio_oss_la_SOURCES = 		\
 	guile/audio_oss.cc			\
 	$(audio_oss_la_swig_sources)
-audio_oss_scm_DATA = audio_oss.scm
+nobase_audio_oss_scm_DATA = gnuradio/audio_oss.scm gnuradio/audio_oss-primitive.scm
 
 # Guile can use the same flags as python does
 libguile_audio_oss_la_LIBADD = $(_audio_oss_la_LIBADD)
@@ -137,6 +137,9 @@ 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
+
+-include guile/audio_oss.d
 
 endif				# end of GUILE
 
diff --git a/gr-cvsd-vocoder/src/lib/Makefile.swig.gen b/gr-cvsd-vocoder/src/lib/Makefile.swig.gen
index b506ae80a4..3aaed9763d 100644
--- a/gr-cvsd-vocoder/src/lib/Makefile.swig.gen
+++ b/gr-cvsd-vocoder/src/lib/Makefile.swig.gen
@@ -46,7 +46,7 @@ cvsd_vocoder_scmlibdir = $(libdir)
 # The scm files for the guile modules get installed where ever guile
 # is installed, usually /usr/share/guile/site/cvsd_vocoder
 # FIXME: determince whether these should be installed with gnuradio.
-cvsd_vocoder_scmdir = $(guiledir)/gnuradio
+cvsd_vocoder_scmdir = $(guiledir)
 
 ## SWIG headers are always installed into the same directory.
 
@@ -128,7 +128,7 @@ cvsd_vocoder_scmlib_LTLIBRARIES = libguile-cvsd_vocoder.la
 libguile_cvsd_vocoder_la_SOURCES = 		\
 	guile/cvsd_vocoder.cc			\
 	$(cvsd_vocoder_la_swig_sources)
-cvsd_vocoder_scm_DATA = cvsd_vocoder.scm
+nobase_cvsd_vocoder_scm_DATA = gnuradio/cvsd_vocoder.scm gnuradio/cvsd_vocoder-primitive.scm
 
 # Guile can use the same flags as python does
 libguile_cvsd_vocoder_la_LIBADD = $(_cvsd_vocoder_la_LIBADD)
@@ -137,6 +137,9 @@ 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
+
+-include guile/cvsd_vocoder.d
 
 endif				# end of GUILE
 
diff --git a/gr-gsm-fr-vocoder/src/lib/Makefile.swig.gen b/gr-gsm-fr-vocoder/src/lib/Makefile.swig.gen
index f20d19cab9..c4a9d909c6 100644
--- a/gr-gsm-fr-vocoder/src/lib/Makefile.swig.gen
+++ b/gr-gsm-fr-vocoder/src/lib/Makefile.swig.gen
@@ -46,7 +46,7 @@ gsm_full_rate_scmlibdir = $(libdir)
 # The scm files for the guile modules get installed where ever guile
 # is installed, usually /usr/share/guile/site/gsm_full_rate
 # FIXME: determince whether these should be installed with gnuradio.
-gsm_full_rate_scmdir = $(guiledir)/gnuradio
+gsm_full_rate_scmdir = $(guiledir)
 
 ## SWIG headers are always installed into the same directory.
 
@@ -128,7 +128,7 @@ gsm_full_rate_scmlib_LTLIBRARIES = libguile-gsm_full_rate.la
 libguile_gsm_full_rate_la_SOURCES = 		\
 	guile/gsm_full_rate.cc			\
 	$(gsm_full_rate_la_swig_sources)
-gsm_full_rate_scm_DATA = gsm_full_rate.scm
+nobase_gsm_full_rate_scm_DATA = gnuradio/gsm_full_rate.scm gnuradio/gsm_full_rate-primitive.scm
 
 # Guile can use the same flags as python does
 libguile_gsm_full_rate_la_LIBADD = $(_gsm_full_rate_la_LIBADD)
@@ -137,6 +137,9 @@ 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
+
+-include guile/gsm_full_rate.d
 
 endif				# end of GUILE
 
diff --git a/gr-msdd6000/src/Makefile.swig.gen b/gr-msdd6000/src/Makefile.swig.gen
index c3a341ecab..43d0e69ae0 100644
--- a/gr-msdd6000/src/Makefile.swig.gen
+++ b/gr-msdd6000/src/Makefile.swig.gen
@@ -46,7 +46,7 @@ msdd_scmlibdir = $(libdir)
 # The scm files for the guile modules get installed where ever guile
 # is installed, usually /usr/share/guile/site/msdd
 # FIXME: determince whether these should be installed with gnuradio.
-msdd_scmdir = $(guiledir)/gnuradio
+msdd_scmdir = $(guiledir)
 
 ## SWIG headers are always installed into the same directory.
 
@@ -128,7 +128,7 @@ msdd_scmlib_LTLIBRARIES = libguile-msdd.la
 libguile_msdd_la_SOURCES = 		\
 	guile/msdd.cc			\
 	$(msdd_la_swig_sources)
-msdd_scm_DATA = msdd.scm
+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)
@@ -137,6 +137,9 @@ libguile_msdd_la_CXXFLAGS = $(_msdd_la_CXXFLAGS)
 
 guile/msdd.lo: msdd.lo
 msdd.scm: msdd.i
+gnuradio/msdd-primitive.scm: msdd.scm
+
+-include guile/msdd.d
 
 endif				# end of GUILE
 
@@ -194,7 +197,7 @@ msdd_rs_scmlibdir = $(libdir)
 # The scm files for the guile modules get installed where ever guile
 # is installed, usually /usr/share/guile/site/msdd_rs
 # FIXME: determince whether these should be installed with gnuradio.
-msdd_rs_scmdir = $(guiledir)/gnuradio
+msdd_rs_scmdir = $(guiledir)
 
 ## SWIG headers are always installed into the same directory.
 
@@ -276,7 +279,7 @@ msdd_rs_scmlib_LTLIBRARIES = libguile-msdd_rs.la
 libguile_msdd_rs_la_SOURCES = 		\
 	guile/msdd_rs.cc			\
 	$(msdd_rs_la_swig_sources)
-msdd_rs_scm_DATA = msdd_rs.scm
+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)
@@ -285,6 +288,9 @@ 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
+
+-include guile/msdd_rs.d
 
 endif				# end of GUILE
 
diff --git a/gr-noaa/swig/Makefile.swig.gen b/gr-noaa/swig/Makefile.swig.gen
index 8f99f0b879..95cb34be16 100644
--- a/gr-noaa/swig/Makefile.swig.gen
+++ b/gr-noaa/swig/Makefile.swig.gen
@@ -46,7 +46,7 @@ noaa_swig_scmlibdir = $(libdir)
 # The scm files for the guile modules get installed where ever guile
 # is installed, usually /usr/share/guile/site/noaa_swig
 # FIXME: determince whether these should be installed with gnuradio.
-noaa_swig_scmdir = $(guiledir)/gnuradio
+noaa_swig_scmdir = $(guiledir)
 
 ## SWIG headers are always installed into the same directory.
 
@@ -128,7 +128,7 @@ noaa_swig_scmlib_LTLIBRARIES = libguile-noaa_swig.la
 libguile_noaa_swig_la_SOURCES = 		\
 	guile/noaa_swig.cc			\
 	$(noaa_swig_la_swig_sources)
-noaa_swig_scm_DATA = noaa_swig.scm
+nobase_noaa_swig_scm_DATA = gnuradio/noaa_swig.scm gnuradio/noaa_swig-primitive.scm
 
 # Guile can use the same flags as python does
 libguile_noaa_swig_la_LIBADD = $(_noaa_swig_la_LIBADD)
@@ -137,6 +137,9 @@ 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
+
+-include guile/noaa_swig.d
 
 endif				# end of GUILE
 
diff --git a/gr-pager/swig/Makefile.swig.gen b/gr-pager/swig/Makefile.swig.gen
index 2d198ee70e..4d0ff3b0e0 100644
--- a/gr-pager/swig/Makefile.swig.gen
+++ b/gr-pager/swig/Makefile.swig.gen
@@ -46,7 +46,7 @@ pager_swig_scmlibdir = $(libdir)
 # The scm files for the guile modules get installed where ever guile
 # is installed, usually /usr/share/guile/site/pager_swig
 # FIXME: determince whether these should be installed with gnuradio.
-pager_swig_scmdir = $(guiledir)/gnuradio
+pager_swig_scmdir = $(guiledir)
 
 ## SWIG headers are always installed into the same directory.
 
@@ -128,7 +128,7 @@ pager_swig_scmlib_LTLIBRARIES = libguile-pager_swig.la
 libguile_pager_swig_la_SOURCES = 		\
 	guile/pager_swig.cc			\
 	$(pager_swig_la_swig_sources)
-pager_swig_scm_DATA = pager_swig.scm
+nobase_pager_swig_scm_DATA = gnuradio/pager_swig.scm gnuradio/pager_swig-primitive.scm
 
 # Guile can use the same flags as python does
 libguile_pager_swig_la_LIBADD = $(_pager_swig_la_LIBADD)
@@ -137,6 +137,9 @@ 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
+
+-include guile/pager_swig.d
 
 endif				# end of GUILE
 
diff --git a/gr-radio-astronomy/src/lib/Makefile.swig.gen b/gr-radio-astronomy/src/lib/Makefile.swig.gen
index d427b3c11a..0a734aa3b0 100644
--- a/gr-radio-astronomy/src/lib/Makefile.swig.gen
+++ b/gr-radio-astronomy/src/lib/Makefile.swig.gen
@@ -46,7 +46,7 @@ ra_scmlibdir = $(libdir)
 # The scm files for the guile modules get installed where ever guile
 # is installed, usually /usr/share/guile/site/ra
 # FIXME: determince whether these should be installed with gnuradio.
-ra_scmdir = $(guiledir)/gnuradio
+ra_scmdir = $(guiledir)
 
 ## SWIG headers are always installed into the same directory.
 
@@ -128,7 +128,7 @@ ra_scmlib_LTLIBRARIES = libguile-ra.la
 libguile_ra_la_SOURCES = 		\
 	guile/ra.cc			\
 	$(ra_la_swig_sources)
-ra_scm_DATA = ra.scm
+nobase_ra_scm_DATA = gnuradio/ra.scm gnuradio/ra-primitive.scm
 
 # Guile can use the same flags as python does
 libguile_ra_la_LIBADD = $(_ra_la_LIBADD)
@@ -137,6 +137,9 @@ libguile_ra_la_CXXFLAGS = $(_ra_la_CXXFLAGS)
 
 guile/ra.lo: ra.lo
 ra.scm: ra.i
+gnuradio/ra-primitive.scm: ra.scm
+
+-include guile/ra.d
 
 endif				# end of GUILE
 
diff --git a/gr-trellis/src/lib/Makefile.swig.gen b/gr-trellis/src/lib/Makefile.swig.gen
index c43717d4bc..ec6f97ecb6 100644
--- a/gr-trellis/src/lib/Makefile.swig.gen
+++ b/gr-trellis/src/lib/Makefile.swig.gen
@@ -46,7 +46,7 @@ trellis_scmlibdir = $(libdir)
 # The scm files for the guile modules get installed where ever guile
 # is installed, usually /usr/share/guile/site/trellis
 # FIXME: determince whether these should be installed with gnuradio.
-trellis_scmdir = $(guiledir)/gnuradio
+trellis_scmdir = $(guiledir)
 
 ## SWIG headers are always installed into the same directory.
 
@@ -128,7 +128,7 @@ trellis_scmlib_LTLIBRARIES = libguile-trellis.la
 libguile_trellis_la_SOURCES = 		\
 	guile/trellis.cc			\
 	$(trellis_la_swig_sources)
-trellis_scm_DATA = trellis.scm
+nobase_trellis_scm_DATA = gnuradio/trellis.scm gnuradio/trellis-primitive.scm
 
 # Guile can use the same flags as python does
 libguile_trellis_la_LIBADD = $(_trellis_la_LIBADD)
@@ -137,6 +137,9 @@ libguile_trellis_la_CXXFLAGS = $(_trellis_la_CXXFLAGS)
 
 guile/trellis.lo: trellis.lo
 trellis.scm: trellis.i
+gnuradio/trellis-primitive.scm: trellis.scm
+
+-include guile/trellis.d
 
 endif				# end of GUILE
 
diff --git a/gr-usrp2/src/Makefile.swig.gen b/gr-usrp2/src/Makefile.swig.gen
index 932ed53b02..4b748939fc 100644
--- a/gr-usrp2/src/Makefile.swig.gen
+++ b/gr-usrp2/src/Makefile.swig.gen
@@ -46,7 +46,7 @@ usrp2_scmlibdir = $(libdir)
 # The scm files for the guile modules get installed where ever guile
 # is installed, usually /usr/share/guile/site/usrp2
 # FIXME: determince whether these should be installed with gnuradio.
-usrp2_scmdir = $(guiledir)/gnuradio
+usrp2_scmdir = $(guiledir)
 
 ## SWIG headers are always installed into the same directory.
 
@@ -128,7 +128,7 @@ usrp2_scmlib_LTLIBRARIES = libguile-usrp2.la
 libguile_usrp2_la_SOURCES = 		\
 	guile/usrp2.cc			\
 	$(usrp2_la_swig_sources)
-usrp2_scm_DATA = usrp2.scm
+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)
@@ -137,6 +137,9 @@ libguile_usrp2_la_CXXFLAGS = $(_usrp2_la_CXXFLAGS)
 
 guile/usrp2.lo: usrp2.lo
 usrp2.scm: usrp2.i
+gnuradio/usrp2-primitive.scm: usrp2.scm
+
+-include guile/usrp2.d
 
 endif				# end of GUILE
 
diff --git a/gr-video-sdl/src/Makefile.swig.gen b/gr-video-sdl/src/Makefile.swig.gen
index 0c29596af7..54d9e37fc3 100644
--- a/gr-video-sdl/src/Makefile.swig.gen
+++ b/gr-video-sdl/src/Makefile.swig.gen
@@ -46,7 +46,7 @@ video_sdl_scmlibdir = $(libdir)
 # The scm files for the guile modules get installed where ever guile
 # is installed, usually /usr/share/guile/site/video_sdl
 # FIXME: determince whether these should be installed with gnuradio.
-video_sdl_scmdir = $(guiledir)/gnuradio
+video_sdl_scmdir = $(guiledir)
 
 ## SWIG headers are always installed into the same directory.
 
@@ -128,7 +128,7 @@ video_sdl_scmlib_LTLIBRARIES = libguile-video_sdl.la
 libguile_video_sdl_la_SOURCES = 		\
 	guile/video_sdl.cc			\
 	$(video_sdl_la_swig_sources)
-video_sdl_scm_DATA = video_sdl.scm
+nobase_video_sdl_scm_DATA = gnuradio/video_sdl.scm gnuradio/video_sdl-primitive.scm
 
 # Guile can use the same flags as python does
 libguile_video_sdl_la_LIBADD = $(_video_sdl_la_LIBADD)
@@ -137,6 +137,9 @@ 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
+
+-include guile/video_sdl.d
 
 endif				# end of GUILE