Regenerated Makefile.swig.gen's

23 files changed, 145 insertions, 145 deletions

diff --git a/gnuradio-core/src/lib/swig/Makefile.swig.gen b/gnuradio-core/src/lib/swig/Makefile.swig.gen
index 160fc8fd8..0c3247565 100644
--- a/gnuradio-core/src/lib/swig/Makefile.swig.gen
+++ b/gnuradio-core/src/lib/swig/Makefile.swig.gen
@@ -115,20 +115,20 @@ endif		# end of if python
 if GUILE
 
 gnuradio_core_runtime_scmlib_LTLIBRARIES = 		\
-	libguile-gnuradio_core_runtime.la
-libguile_gnuradio_core_runtime_la_SOURCES =		\
+	libguile-gnuradio-gnuradio_core_runtime.la
+libguile_gnuradio_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-primitive.scm
-libguile_gnuradio_core_runtime_la_LIBADD = 		\
+libguile_gnuradio_gnuradio_core_runtime_la_LIBADD = 	\
 	$(STD_SWIG_LA_LIB_ADD)		\
 	$(gnuradio_core_runtime_la_swig_libadd)
-libguile_gnuradio_core_runtime_la_LDFLAGS = 		\
+libguile_gnuradio_gnuradio_core_runtime_la_LDFLAGS = 	\
 	$(STD_SWIG_LA_LD_FLAGS)		\
 	$(gnuradio_core_runtime_la_swig_ldflags)
-libguile_gnuradio_core_runtime_la_CXXFLAGS = 		\
+libguile_gnuradio_gnuradio_core_runtime_la_CXXFLAGS = 	\
 	$(STD_SWIG_CXX_FLAGS)		\
 	-I$(top_builddir) 		\
 	$(gnuradio_core_runtime_la_swig_cxxflags)
@@ -260,20 +260,20 @@ endif		# end of if python
 if GUILE
 
 gnuradio_core_general_scmlib_LTLIBRARIES = 		\
-	libguile-gnuradio_core_general.la
-libguile_gnuradio_core_general_la_SOURCES =		\
+	libguile-gnuradio-gnuradio_core_general.la
+libguile_gnuradio_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-primitive.scm
-libguile_gnuradio_core_general_la_LIBADD = 		\
+libguile_gnuradio_gnuradio_core_general_la_LIBADD = 	\
 	$(STD_SWIG_LA_LIB_ADD)		\
 	$(gnuradio_core_general_la_swig_libadd)
-libguile_gnuradio_core_general_la_LDFLAGS = 		\
+libguile_gnuradio_gnuradio_core_general_la_LDFLAGS = 	\
 	$(STD_SWIG_LA_LD_FLAGS)		\
 	$(gnuradio_core_general_la_swig_ldflags)
-libguile_gnuradio_core_general_la_CXXFLAGS = 		\
+libguile_gnuradio_gnuradio_core_general_la_CXXFLAGS = 	\
 	$(STD_SWIG_CXX_FLAGS)		\
 	-I$(top_builddir) 		\
 	$(gnuradio_core_general_la_swig_cxxflags)
@@ -405,20 +405,20 @@ endif		# end of if python
 if GUILE
 
 gnuradio_core_gengen_scmlib_LTLIBRARIES = 		\
-	libguile-gnuradio_core_gengen.la
-libguile_gnuradio_core_gengen_la_SOURCES =		\
+	libguile-gnuradio-gnuradio_core_gengen.la
+libguile_gnuradio_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-primitive.scm
-libguile_gnuradio_core_gengen_la_LIBADD = 		\
+libguile_gnuradio_gnuradio_core_gengen_la_LIBADD = 	\
 	$(STD_SWIG_LA_LIB_ADD)		\
 	$(gnuradio_core_gengen_la_swig_libadd)
-libguile_gnuradio_core_gengen_la_LDFLAGS = 		\
+libguile_gnuradio_gnuradio_core_gengen_la_LDFLAGS = 	\
 	$(STD_SWIG_LA_LD_FLAGS)		\
 	$(gnuradio_core_gengen_la_swig_ldflags)
-libguile_gnuradio_core_gengen_la_CXXFLAGS = 		\
+libguile_gnuradio_gnuradio_core_gengen_la_CXXFLAGS = 	\
 	$(STD_SWIG_CXX_FLAGS)		\
 	-I$(top_builddir) 		\
 	$(gnuradio_core_gengen_la_swig_cxxflags)
@@ -550,20 +550,20 @@ endif		# end of if python
 if GUILE
 
 gnuradio_core_filter_scmlib_LTLIBRARIES = 		\
-	libguile-gnuradio_core_filter.la
-libguile_gnuradio_core_filter_la_SOURCES =		\
+	libguile-gnuradio-gnuradio_core_filter.la
+libguile_gnuradio_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-primitive.scm
-libguile_gnuradio_core_filter_la_LIBADD = 		\
+libguile_gnuradio_gnuradio_core_filter_la_LIBADD = 	\
 	$(STD_SWIG_LA_LIB_ADD)		\
 	$(gnuradio_core_filter_la_swig_libadd)
-libguile_gnuradio_core_filter_la_LDFLAGS = 		\
+libguile_gnuradio_gnuradio_core_filter_la_LDFLAGS = 	\
 	$(STD_SWIG_LA_LD_FLAGS)		\
 	$(gnuradio_core_filter_la_swig_ldflags)
-libguile_gnuradio_core_filter_la_CXXFLAGS = 		\
+libguile_gnuradio_gnuradio_core_filter_la_CXXFLAGS = 	\
 	$(STD_SWIG_CXX_FLAGS)		\
 	-I$(top_builddir) 		\
 	$(gnuradio_core_filter_la_swig_cxxflags)
@@ -695,20 +695,20 @@ endif		# end of if python
 if GUILE
 
 gnuradio_core_io_scmlib_LTLIBRARIES = 		\
-	libguile-gnuradio_core_io.la
-libguile_gnuradio_core_io_la_SOURCES =		\
+	libguile-gnuradio-gnuradio_core_io.la
+libguile_gnuradio_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-primitive.scm
-libguile_gnuradio_core_io_la_LIBADD = 		\
+libguile_gnuradio_gnuradio_core_io_la_LIBADD = 	\
 	$(STD_SWIG_LA_LIB_ADD)		\
 	$(gnuradio_core_io_la_swig_libadd)
-libguile_gnuradio_core_io_la_LDFLAGS = 		\
+libguile_gnuradio_gnuradio_core_io_la_LDFLAGS = 	\
 	$(STD_SWIG_LA_LD_FLAGS)		\
 	$(gnuradio_core_io_la_swig_ldflags)
-libguile_gnuradio_core_io_la_CXXFLAGS = 		\
+libguile_gnuradio_gnuradio_core_io_la_CXXFLAGS = 	\
 	$(STD_SWIG_CXX_FLAGS)		\
 	-I$(top_builddir) 		\
 	$(gnuradio_core_io_la_swig_cxxflags)
@@ -840,20 +840,20 @@ endif		# end of if python
 if GUILE
 
 gnuradio_core_hier_scmlib_LTLIBRARIES = 		\
-	libguile-gnuradio_core_hier.la
-libguile_gnuradio_core_hier_la_SOURCES =		\
+	libguile-gnuradio-gnuradio_core_hier.la
+libguile_gnuradio_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-primitive.scm
-libguile_gnuradio_core_hier_la_LIBADD = 		\
+libguile_gnuradio_gnuradio_core_hier_la_LIBADD = 	\
 	$(STD_SWIG_LA_LIB_ADD)		\
 	$(gnuradio_core_hier_la_swig_libadd)
-libguile_gnuradio_core_hier_la_LDFLAGS = 		\
+libguile_gnuradio_gnuradio_core_hier_la_LDFLAGS = 	\
 	$(STD_SWIG_LA_LD_FLAGS)		\
 	$(gnuradio_core_hier_la_swig_ldflags)
-libguile_gnuradio_core_hier_la_CXXFLAGS = 		\
+libguile_gnuradio_gnuradio_core_hier_la_CXXFLAGS = 	\
 	$(STD_SWIG_CXX_FLAGS)		\
 	-I$(top_builddir) 		\
 	$(gnuradio_core_hier_la_swig_cxxflags)
diff --git a/gr-atsc/src/lib/Makefile.swig.gen b/gr-atsc/src/lib/Makefile.swig.gen
index b39a56ad6..7dbb98b46 100644
--- a/gr-atsc/src/lib/Makefile.swig.gen
+++ b/gr-atsc/src/lib/Makefile.swig.gen
@@ -115,20 +115,20 @@ endif		# end of if python
 if GUILE
 
 atsc_scmlib_LTLIBRARIES = 		\
-	libguile-atsc.la
-libguile_atsc_la_SOURCES =		\
+	libguile-gnuradio-atsc.la
+libguile_gnuradio_atsc_la_SOURCES =	\
 	guile/atsc.cc			\
 	$(atsc_la_swig_sources)
 nobase_atsc_scm_DATA = 		\
 	gnuradio/atsc.scm 		\
 	gnuradio/atsc-primitive.scm
-libguile_atsc_la_LIBADD = 		\
+libguile_gnuradio_atsc_la_LIBADD = 	\
 	$(STD_SWIG_LA_LIB_ADD)		\
 	$(atsc_la_swig_libadd)
-libguile_atsc_la_LDFLAGS = 		\
+libguile_gnuradio_atsc_la_LDFLAGS = 	\
 	$(STD_SWIG_LA_LD_FLAGS)		\
 	$(atsc_la_swig_ldflags)
-libguile_atsc_la_CXXFLAGS = 		\
+libguile_gnuradio_atsc_la_CXXFLAGS = 	\
 	$(STD_SWIG_CXX_FLAGS)		\
 	-I$(top_builddir) 		\
 	$(atsc_la_swig_cxxflags)
diff --git a/gr-audio-alsa/src/Makefile.swig.gen b/gr-audio-alsa/src/Makefile.swig.gen
index f80c90d51..c231a4784 100644
--- a/gr-audio-alsa/src/Makefile.swig.gen
+++ b/gr-audio-alsa/src/Makefile.swig.gen
@@ -115,20 +115,20 @@ endif		# end of if python
 if GUILE
 
 audio_alsa_scmlib_LTLIBRARIES = 		\
-	libguile-audio_alsa.la
-libguile_audio_alsa_la_SOURCES =		\
+	libguile-gnuradio-audio_alsa.la
+libguile_gnuradio_audio_alsa_la_SOURCES =	\
 	guile/audio_alsa.cc			\
 	$(audio_alsa_la_swig_sources)
 nobase_audio_alsa_scm_DATA = 		\
 	gnuradio/audio_alsa.scm 		\
 	gnuradio/audio_alsa-primitive.scm
-libguile_audio_alsa_la_LIBADD = 		\
+libguile_gnuradio_audio_alsa_la_LIBADD = 	\
 	$(STD_SWIG_LA_LIB_ADD)		\
 	$(audio_alsa_la_swig_libadd)
-libguile_audio_alsa_la_LDFLAGS = 		\
+libguile_gnuradio_audio_alsa_la_LDFLAGS = 	\
 	$(STD_SWIG_LA_LD_FLAGS)		\
 	$(audio_alsa_la_swig_ldflags)
-libguile_audio_alsa_la_CXXFLAGS = 		\
+libguile_gnuradio_audio_alsa_la_CXXFLAGS = 	\
 	$(STD_SWIG_CXX_FLAGS)		\
 	-I$(top_builddir) 		\
 	$(audio_alsa_la_swig_cxxflags)
diff --git a/gr-audio-jack/src/Makefile.swig.gen b/gr-audio-jack/src/Makefile.swig.gen
index b8b410d4c..9ca8140d4 100644
--- a/gr-audio-jack/src/Makefile.swig.gen
+++ b/gr-audio-jack/src/Makefile.swig.gen
@@ -115,20 +115,20 @@ endif		# end of if python
 if GUILE
 
 audio_jack_scmlib_LTLIBRARIES = 		\
-	libguile-audio_jack.la
-libguile_audio_jack_la_SOURCES =		\
+	libguile-gnuradio-audio_jack.la
+libguile_gnuradio_audio_jack_la_SOURCES =	\
 	guile/audio_jack.cc			\
 	$(audio_jack_la_swig_sources)
 nobase_audio_jack_scm_DATA = 		\
 	gnuradio/audio_jack.scm 		\
 	gnuradio/audio_jack-primitive.scm
-libguile_audio_jack_la_LIBADD = 		\
+libguile_gnuradio_audio_jack_la_LIBADD = 	\
 	$(STD_SWIG_LA_LIB_ADD)		\
 	$(audio_jack_la_swig_libadd)
-libguile_audio_jack_la_LDFLAGS = 		\
+libguile_gnuradio_audio_jack_la_LDFLAGS = 	\
 	$(STD_SWIG_LA_LD_FLAGS)		\
 	$(audio_jack_la_swig_ldflags)
-libguile_audio_jack_la_CXXFLAGS = 		\
+libguile_gnuradio_audio_jack_la_CXXFLAGS = 	\
 	$(STD_SWIG_CXX_FLAGS)		\
 	-I$(top_builddir) 		\
 	$(audio_jack_la_swig_cxxflags)
diff --git a/gr-audio-oss/src/Makefile.swig.gen b/gr-audio-oss/src/Makefile.swig.gen
index 6a5bb9975..ecb03acce 100644
--- a/gr-audio-oss/src/Makefile.swig.gen
+++ b/gr-audio-oss/src/Makefile.swig.gen
@@ -115,20 +115,20 @@ endif		# end of if python
 if GUILE
 
 audio_oss_scmlib_LTLIBRARIES = 		\
-	libguile-audio_oss.la
-libguile_audio_oss_la_SOURCES =		\
+	libguile-gnuradio-audio_oss.la
+libguile_gnuradio_audio_oss_la_SOURCES =	\
 	guile/audio_oss.cc			\
 	$(audio_oss_la_swig_sources)
 nobase_audio_oss_scm_DATA = 		\
 	gnuradio/audio_oss.scm 		\
 	gnuradio/audio_oss-primitive.scm
-libguile_audio_oss_la_LIBADD = 		\
+libguile_gnuradio_audio_oss_la_LIBADD = 	\
 	$(STD_SWIG_LA_LIB_ADD)		\
 	$(audio_oss_la_swig_libadd)
-libguile_audio_oss_la_LDFLAGS = 		\
+libguile_gnuradio_audio_oss_la_LDFLAGS = 	\
 	$(STD_SWIG_LA_LD_FLAGS)		\
 	$(audio_oss_la_swig_ldflags)
-libguile_audio_oss_la_CXXFLAGS = 		\
+libguile_gnuradio_audio_oss_la_CXXFLAGS = 	\
 	$(STD_SWIG_CXX_FLAGS)		\
 	-I$(top_builddir) 		\
 	$(audio_oss_la_swig_cxxflags)
diff --git a/gr-audio-osx/src/Makefile.swig.gen b/gr-audio-osx/src/Makefile.swig.gen
index f7c779f15..532433083 100644
--- a/gr-audio-osx/src/Makefile.swig.gen
+++ b/gr-audio-osx/src/Makefile.swig.gen
@@ -115,20 +115,20 @@ endif		# end of if python
 if GUILE
 
 audio_osx_scmlib_LTLIBRARIES = 		\
-	libguile-audio_osx.la
-libguile_audio_osx_la_SOURCES =		\
+	libguile-gnuradio-audio_osx.la
+libguile_gnuradio_audio_osx_la_SOURCES =	\
 	guile/audio_osx.cc			\
 	$(audio_osx_la_swig_sources)
 nobase_audio_osx_scm_DATA = 		\
 	gnuradio/audio_osx.scm 		\
 	gnuradio/audio_osx-primitive.scm
-libguile_audio_osx_la_LIBADD = 		\
+libguile_gnuradio_audio_osx_la_LIBADD = 	\
 	$(STD_SWIG_LA_LIB_ADD)		\
 	$(audio_osx_la_swig_libadd)
-libguile_audio_osx_la_LDFLAGS = 		\
+libguile_gnuradio_audio_osx_la_LDFLAGS = 	\
 	$(STD_SWIG_LA_LD_FLAGS)		\
 	$(audio_osx_la_swig_ldflags)
-libguile_audio_osx_la_CXXFLAGS = 		\
+libguile_gnuradio_audio_osx_la_CXXFLAGS = 	\
 	$(STD_SWIG_CXX_FLAGS)		\
 	-I$(top_builddir) 		\
 	$(audio_osx_la_swig_cxxflags)
diff --git a/gr-audio-portaudio/src/Makefile.swig.gen b/gr-audio-portaudio/src/Makefile.swig.gen
index bc51844dd..32c2e54e1 100644
--- a/gr-audio-portaudio/src/Makefile.swig.gen
+++ b/gr-audio-portaudio/src/Makefile.swig.gen
@@ -115,20 +115,20 @@ endif		# end of if python
 if GUILE
 
 audio_portaudio_scmlib_LTLIBRARIES = 		\
-	libguile-audio_portaudio.la
-libguile_audio_portaudio_la_SOURCES =		\
+	libguile-gnuradio-audio_portaudio.la
+libguile_gnuradio_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
-libguile_audio_portaudio_la_LIBADD = 		\
+libguile_gnuradio_audio_portaudio_la_LIBADD = 	\
 	$(STD_SWIG_LA_LIB_ADD)		\
 	$(audio_portaudio_la_swig_libadd)
-libguile_audio_portaudio_la_LDFLAGS = 		\
+libguile_gnuradio_audio_portaudio_la_LDFLAGS = 	\
 	$(STD_SWIG_LA_LD_FLAGS)		\
 	$(audio_portaudio_la_swig_ldflags)
-libguile_audio_portaudio_la_CXXFLAGS = 		\
+libguile_gnuradio_audio_portaudio_la_CXXFLAGS = 	\
 	$(STD_SWIG_CXX_FLAGS)		\
 	-I$(top_builddir) 		\
 	$(audio_portaudio_la_swig_cxxflags)
diff --git a/gr-audio-windows/src/Makefile.swig.gen b/gr-audio-windows/src/Makefile.swig.gen
index d17305f8a..cc21f30bc 100644
--- a/gr-audio-windows/src/Makefile.swig.gen
+++ b/gr-audio-windows/src/Makefile.swig.gen
@@ -115,20 +115,20 @@ endif		# end of if python
 if GUILE
 
 audio_windows_scmlib_LTLIBRARIES = 		\
-	libguile-audio_windows.la
-libguile_audio_windows_la_SOURCES =		\
+	libguile-gnuradio-audio_windows.la
+libguile_gnuradio_audio_windows_la_SOURCES =	\
 	guile/audio_windows.cc			\
 	$(audio_windows_la_swig_sources)
 nobase_audio_windows_scm_DATA = 		\
 	gnuradio/audio_windows.scm 		\
 	gnuradio/audio_windows-primitive.scm
-libguile_audio_windows_la_LIBADD = 		\
+libguile_gnuradio_audio_windows_la_LIBADD = 	\
 	$(STD_SWIG_LA_LIB_ADD)		\
 	$(audio_windows_la_swig_libadd)
-libguile_audio_windows_la_LDFLAGS = 		\
+libguile_gnuradio_audio_windows_la_LDFLAGS = 	\
 	$(STD_SWIG_LA_LD_FLAGS)		\
 	$(audio_windows_la_swig_ldflags)
-libguile_audio_windows_la_CXXFLAGS = 		\
+libguile_gnuradio_audio_windows_la_CXXFLAGS = 	\
 	$(STD_SWIG_CXX_FLAGS)		\
 	-I$(top_builddir) 		\
 	$(audio_windows_la_swig_cxxflags)
diff --git a/gr-comedi/src/Makefile.swig.gen b/gr-comedi/src/Makefile.swig.gen
index 9b34dacce..cf55aa8ad 100644
--- a/gr-comedi/src/Makefile.swig.gen
+++ b/gr-comedi/src/Makefile.swig.gen
@@ -115,20 +115,20 @@ endif		# end of if python
 if GUILE
 
 comedi_scmlib_LTLIBRARIES = 		\
-	libguile-comedi.la
-libguile_comedi_la_SOURCES =		\
+	libguile-gnuradio-comedi.la
+libguile_gnuradio_comedi_la_SOURCES =	\
 	guile/comedi.cc			\
 	$(comedi_la_swig_sources)
 nobase_comedi_scm_DATA = 		\
 	gnuradio/comedi.scm 		\
 	gnuradio/comedi-primitive.scm
-libguile_comedi_la_LIBADD = 		\
+libguile_gnuradio_comedi_la_LIBADD = 	\
 	$(STD_SWIG_LA_LIB_ADD)		\
 	$(comedi_la_swig_libadd)
-libguile_comedi_la_LDFLAGS = 		\
+libguile_gnuradio_comedi_la_LDFLAGS = 	\
 	$(STD_SWIG_LA_LD_FLAGS)		\
 	$(comedi_la_swig_ldflags)
-libguile_comedi_la_CXXFLAGS = 		\
+libguile_gnuradio_comedi_la_CXXFLAGS = 	\
 	$(STD_SWIG_CXX_FLAGS)		\
 	-I$(top_builddir) 		\
 	$(comedi_la_swig_cxxflags)
diff --git a/gr-cvsd-vocoder/src/lib/Makefile.swig.gen b/gr-cvsd-vocoder/src/lib/Makefile.swig.gen
index bacbee2cb..e23427a0f 100644
--- a/gr-cvsd-vocoder/src/lib/Makefile.swig.gen
+++ b/gr-cvsd-vocoder/src/lib/Makefile.swig.gen
@@ -115,20 +115,20 @@ endif		# end of if python
 if GUILE
 
 cvsd_vocoder_scmlib_LTLIBRARIES = 		\
-	libguile-cvsd_vocoder.la
-libguile_cvsd_vocoder_la_SOURCES =		\
+	libguile-gnuradio-cvsd_vocoder.la
+libguile_gnuradio_cvsd_vocoder_la_SOURCES =	\
 	guile/cvsd_vocoder.cc			\
 	$(cvsd_vocoder_la_swig_sources)
 nobase_cvsd_vocoder_scm_DATA = 		\
 	gnuradio/cvsd_vocoder.scm 		\
 	gnuradio/cvsd_vocoder-primitive.scm
-libguile_cvsd_vocoder_la_LIBADD = 		\
+libguile_gnuradio_cvsd_vocoder_la_LIBADD = 	\
 	$(STD_SWIG_LA_LIB_ADD)		\
 	$(cvsd_vocoder_la_swig_libadd)
-libguile_cvsd_vocoder_la_LDFLAGS = 		\
+libguile_gnuradio_cvsd_vocoder_la_LDFLAGS = 	\
 	$(STD_SWIG_LA_LD_FLAGS)		\
 	$(cvsd_vocoder_la_swig_ldflags)
-libguile_cvsd_vocoder_la_CXXFLAGS = 		\
+libguile_gnuradio_cvsd_vocoder_la_CXXFLAGS = 	\
 	$(STD_SWIG_CXX_FLAGS)		\
 	-I$(top_builddir) 		\
 	$(cvsd_vocoder_la_swig_cxxflags)
diff --git a/gr-gcell/src/Makefile.swig.gen b/gr-gcell/src/Makefile.swig.gen
index 2b87af6b6..dcd8bdefb 100644
--- a/gr-gcell/src/Makefile.swig.gen
+++ b/gr-gcell/src/Makefile.swig.gen
@@ -115,20 +115,20 @@ endif		# end of if python
 if GUILE
 
 gcell_scmlib_LTLIBRARIES = 		\
-	libguile-gcell.la
-libguile_gcell_la_SOURCES =		\
+	libguile-gnuradio-gcell.la
+libguile_gnuradio_gcell_la_SOURCES =	\
 	guile/gcell.cc			\
 	$(gcell_la_swig_sources)
 nobase_gcell_scm_DATA = 		\
 	gnuradio/gcell.scm 		\
 	gnuradio/gcell-primitive.scm
-libguile_gcell_la_LIBADD = 		\
+libguile_gnuradio_gcell_la_LIBADD = 	\
 	$(STD_SWIG_LA_LIB_ADD)		\
 	$(gcell_la_swig_libadd)
-libguile_gcell_la_LDFLAGS = 		\
+libguile_gnuradio_gcell_la_LDFLAGS = 	\
 	$(STD_SWIG_LA_LD_FLAGS)		\
 	$(gcell_la_swig_ldflags)
-libguile_gcell_la_CXXFLAGS = 		\
+libguile_gnuradio_gcell_la_CXXFLAGS = 	\
 	$(STD_SWIG_CXX_FLAGS)		\
 	-I$(top_builddir) 		\
 	$(gcell_la_swig_cxxflags)
diff --git a/gr-gsm-fr-vocoder/src/lib/Makefile.swig.gen b/gr-gsm-fr-vocoder/src/lib/Makefile.swig.gen
index 58bb83cae..77776abd8 100644
--- a/gr-gsm-fr-vocoder/src/lib/Makefile.swig.gen
+++ b/gr-gsm-fr-vocoder/src/lib/Makefile.swig.gen
@@ -115,20 +115,20 @@ endif		# end of if python
 if GUILE
 
 gsm_full_rate_scmlib_LTLIBRARIES = 		\
-	libguile-gsm_full_rate.la
-libguile_gsm_full_rate_la_SOURCES =		\
+	libguile-gnuradio-gsm_full_rate.la
+libguile_gnuradio_gsm_full_rate_la_SOURCES =	\
 	guile/gsm_full_rate.cc			\
 	$(gsm_full_rate_la_swig_sources)
 nobase_gsm_full_rate_scm_DATA = 		\
 	gnuradio/gsm_full_rate.scm 		\
 	gnuradio/gsm_full_rate-primitive.scm
-libguile_gsm_full_rate_la_LIBADD = 		\
+libguile_gnuradio_gsm_full_rate_la_LIBADD = 	\
 	$(STD_SWIG_LA_LIB_ADD)		\
 	$(gsm_full_rate_la_swig_libadd)
-libguile_gsm_full_rate_la_LDFLAGS = 		\
+libguile_gnuradio_gsm_full_rate_la_LDFLAGS = 	\
 	$(STD_SWIG_LA_LD_FLAGS)		\
 	$(gsm_full_rate_la_swig_ldflags)
-libguile_gsm_full_rate_la_CXXFLAGS = 		\
+libguile_gnuradio_gsm_full_rate_la_CXXFLAGS = 	\
 	$(STD_SWIG_CXX_FLAGS)		\
 	-I$(top_builddir) 		\
 	$(gsm_full_rate_la_swig_cxxflags)
diff --git a/gr-msdd6000/src/Makefile.swig.gen b/gr-msdd6000/src/Makefile.swig.gen
index 1c7da3f6e..dbf137334 100644
--- a/gr-msdd6000/src/Makefile.swig.gen
+++ b/gr-msdd6000/src/Makefile.swig.gen
@@ -115,20 +115,20 @@ endif		# end of if python
 if GUILE
 
 msdd_scmlib_LTLIBRARIES = 		\
-	libguile-msdd.la
-libguile_msdd_la_SOURCES =		\
+	libguile-gnuradio-msdd.la
+libguile_gnuradio_msdd_la_SOURCES =	\
 	guile/msdd.cc			\
 	$(msdd_la_swig_sources)
 nobase_msdd_scm_DATA = 		\
 	gnuradio/msdd.scm 		\
 	gnuradio/msdd-primitive.scm
-libguile_msdd_la_LIBADD = 		\
+libguile_gnuradio_msdd_la_LIBADD = 	\
 	$(STD_SWIG_LA_LIB_ADD)		\
 	$(msdd_la_swig_libadd)
-libguile_msdd_la_LDFLAGS = 		\
+libguile_gnuradio_msdd_la_LDFLAGS = 	\
 	$(STD_SWIG_LA_LD_FLAGS)		\
 	$(msdd_la_swig_ldflags)
-libguile_msdd_la_CXXFLAGS = 		\
+libguile_gnuradio_msdd_la_CXXFLAGS = 	\
 	$(STD_SWIG_CXX_FLAGS)		\
 	-I$(top_builddir) 		\
 	$(msdd_la_swig_cxxflags)
@@ -260,20 +260,20 @@ endif		# end of if python
 if GUILE
 
 msdd_rs_scmlib_LTLIBRARIES = 		\
-	libguile-msdd_rs.la
-libguile_msdd_rs_la_SOURCES =		\
+	libguile-gnuradio-msdd_rs.la
+libguile_gnuradio_msdd_rs_la_SOURCES =	\
 	guile/msdd_rs.cc			\
 	$(msdd_rs_la_swig_sources)
 nobase_msdd_rs_scm_DATA = 		\
 	gnuradio/msdd_rs.scm 		\
 	gnuradio/msdd_rs-primitive.scm
-libguile_msdd_rs_la_LIBADD = 		\
+libguile_gnuradio_msdd_rs_la_LIBADD = 	\
 	$(STD_SWIG_LA_LIB_ADD)		\
 	$(msdd_rs_la_swig_libadd)
-libguile_msdd_rs_la_LDFLAGS = 		\
+libguile_gnuradio_msdd_rs_la_LDFLAGS = 	\
 	$(STD_SWIG_LA_LD_FLAGS)		\
 	$(msdd_rs_la_swig_ldflags)
-libguile_msdd_rs_la_CXXFLAGS = 		\
+libguile_gnuradio_msdd_rs_la_CXXFLAGS = 	\
 	$(STD_SWIG_CXX_FLAGS)		\
 	-I$(top_builddir) 		\
 	$(msdd_rs_la_swig_cxxflags)
diff --git a/gr-noaa/swig/Makefile.swig.gen b/gr-noaa/swig/Makefile.swig.gen
index 227a0b489..f5e778811 100644
--- a/gr-noaa/swig/Makefile.swig.gen
+++ b/gr-noaa/swig/Makefile.swig.gen
@@ -115,20 +115,20 @@ endif		# end of if python
 if GUILE
 
 noaa_swig_scmlib_LTLIBRARIES = 		\
-	libguile-noaa_swig.la
-libguile_noaa_swig_la_SOURCES =		\
+	libguile-gnuradio-noaa_swig.la
+libguile_gnuradio_noaa_swig_la_SOURCES =	\
 	guile/noaa_swig.cc			\
 	$(noaa_swig_la_swig_sources)
 nobase_noaa_swig_scm_DATA = 		\
 	gnuradio/noaa_swig.scm 		\
 	gnuradio/noaa_swig-primitive.scm
-libguile_noaa_swig_la_LIBADD = 		\
+libguile_gnuradio_noaa_swig_la_LIBADD = 	\
 	$(STD_SWIG_LA_LIB_ADD)		\
 	$(noaa_swig_la_swig_libadd)
-libguile_noaa_swig_la_LDFLAGS = 		\
+libguile_gnuradio_noaa_swig_la_LDFLAGS = 	\
 	$(STD_SWIG_LA_LD_FLAGS)		\
 	$(noaa_swig_la_swig_ldflags)
-libguile_noaa_swig_la_CXXFLAGS = 		\
+libguile_gnuradio_noaa_swig_la_CXXFLAGS = 	\
 	$(STD_SWIG_CXX_FLAGS)		\
 	-I$(top_builddir) 		\
 	$(noaa_swig_la_swig_cxxflags)
diff --git a/gr-pager/swig/Makefile.swig.gen b/gr-pager/swig/Makefile.swig.gen
index 1b74c3be7..70d215384 100644
--- a/gr-pager/swig/Makefile.swig.gen
+++ b/gr-pager/swig/Makefile.swig.gen
@@ -115,20 +115,20 @@ endif		# end of if python
 if GUILE
 
 pager_swig_scmlib_LTLIBRARIES = 		\
-	libguile-pager_swig.la
-libguile_pager_swig_la_SOURCES =		\
+	libguile-gnuradio-pager_swig.la
+libguile_gnuradio_pager_swig_la_SOURCES =	\
 	guile/pager_swig.cc			\
 	$(pager_swig_la_swig_sources)
 nobase_pager_swig_scm_DATA = 		\
 	gnuradio/pager_swig.scm 		\
 	gnuradio/pager_swig-primitive.scm
-libguile_pager_swig_la_LIBADD = 		\
+libguile_gnuradio_pager_swig_la_LIBADD = 	\
 	$(STD_SWIG_LA_LIB_ADD)		\
 	$(pager_swig_la_swig_libadd)
-libguile_pager_swig_la_LDFLAGS = 		\
+libguile_gnuradio_pager_swig_la_LDFLAGS = 	\
 	$(STD_SWIG_LA_LD_FLAGS)		\
 	$(pager_swig_la_swig_ldflags)
-libguile_pager_swig_la_CXXFLAGS = 		\
+libguile_gnuradio_pager_swig_la_CXXFLAGS = 	\
 	$(STD_SWIG_CXX_FLAGS)		\
 	-I$(top_builddir) 		\
 	$(pager_swig_la_swig_cxxflags)
diff --git a/gr-qtgui/src/lib/Makefile.swig.gen b/gr-qtgui/src/lib/Makefile.swig.gen
index 3b8ef3617..9c4c0b58c 100644
--- a/gr-qtgui/src/lib/Makefile.swig.gen
+++ b/gr-qtgui/src/lib/Makefile.swig.gen
@@ -115,20 +115,20 @@ endif		# end of if python
 if GUILE
 
 qtgui_scmlib_LTLIBRARIES = 		\
-	libguile-qtgui.la
-libguile_qtgui_la_SOURCES =		\
+	libguile-gnuradio-qtgui.la
+libguile_gnuradio_qtgui_la_SOURCES =	\
 	guile/qtgui.cc			\
 	$(qtgui_la_swig_sources)
 nobase_qtgui_scm_DATA = 		\
 	gnuradio/qtgui.scm 		\
 	gnuradio/qtgui-primitive.scm
-libguile_qtgui_la_LIBADD = 		\
+libguile_gnuradio_qtgui_la_LIBADD = 	\
 	$(STD_SWIG_LA_LIB_ADD)		\
 	$(qtgui_la_swig_libadd)
-libguile_qtgui_la_LDFLAGS = 		\
+libguile_gnuradio_qtgui_la_LDFLAGS = 	\
 	$(STD_SWIG_LA_LD_FLAGS)		\
 	$(qtgui_la_swig_ldflags)
-libguile_qtgui_la_CXXFLAGS = 		\
+libguile_gnuradio_qtgui_la_CXXFLAGS = 	\
 	$(STD_SWIG_CXX_FLAGS)		\
 	-I$(top_builddir) 		\
 	$(qtgui_la_swig_cxxflags)
diff --git a/gr-radio-astronomy/src/lib/Makefile.swig.gen b/gr-radio-astronomy/src/lib/Makefile.swig.gen
index 7170f1e77..d560e3919 100644
--- a/gr-radio-astronomy/src/lib/Makefile.swig.gen
+++ b/gr-radio-astronomy/src/lib/Makefile.swig.gen
@@ -115,20 +115,20 @@ endif		# end of if python
 if GUILE
 
 ra_scmlib_LTLIBRARIES = 		\
-	libguile-ra.la
-libguile_ra_la_SOURCES =		\
+	libguile-gnuradio-ra.la
+libguile_gnuradio_ra_la_SOURCES =	\
 	guile/ra.cc			\
 	$(ra_la_swig_sources)
 nobase_ra_scm_DATA = 		\
 	gnuradio/ra.scm 		\
 	gnuradio/ra-primitive.scm
-libguile_ra_la_LIBADD = 		\
+libguile_gnuradio_ra_la_LIBADD = 	\
 	$(STD_SWIG_LA_LIB_ADD)		\
 	$(ra_la_swig_libadd)
-libguile_ra_la_LDFLAGS = 		\
+libguile_gnuradio_ra_la_LDFLAGS = 	\
 	$(STD_SWIG_LA_LD_FLAGS)		\
 	$(ra_la_swig_ldflags)
-libguile_ra_la_CXXFLAGS = 		\
+libguile_gnuradio_ra_la_CXXFLAGS = 	\
 	$(STD_SWIG_CXX_FLAGS)		\
 	-I$(top_builddir) 		\
 	$(ra_la_swig_cxxflags)
diff --git a/gr-trellis/src/lib/Makefile.swig.gen b/gr-trellis/src/lib/Makefile.swig.gen
index 32127c7c5..784c146cf 100644
--- a/gr-trellis/src/lib/Makefile.swig.gen
+++ b/gr-trellis/src/lib/Makefile.swig.gen
@@ -115,20 +115,20 @@ endif		# end of if python
 if GUILE
 
 trellis_scmlib_LTLIBRARIES = 		\
-	libguile-trellis.la
-libguile_trellis_la_SOURCES =		\
+	libguile-gnuradio-trellis.la
+libguile_gnuradio_trellis_la_SOURCES =	\
 	guile/trellis.cc			\
 	$(trellis_la_swig_sources)
 nobase_trellis_scm_DATA = 		\
 	gnuradio/trellis.scm 		\
 	gnuradio/trellis-primitive.scm
-libguile_trellis_la_LIBADD = 		\
+libguile_gnuradio_trellis_la_LIBADD = 	\
 	$(STD_SWIG_LA_LIB_ADD)		\
 	$(trellis_la_swig_libadd)
-libguile_trellis_la_LDFLAGS = 		\
+libguile_gnuradio_trellis_la_LDFLAGS = 	\
 	$(STD_SWIG_LA_LD_FLAGS)		\
 	$(trellis_la_swig_ldflags)
-libguile_trellis_la_CXXFLAGS = 		\
+libguile_gnuradio_trellis_la_CXXFLAGS = 	\
 	$(STD_SWIG_CXX_FLAGS)		\
 	-I$(top_builddir) 		\
 	$(trellis_la_swig_cxxflags)
diff --git a/gr-uhd/swig/Makefile.swig.gen b/gr-uhd/swig/Makefile.swig.gen
index 782800c9b..b73ccd3c4 100644
--- a/gr-uhd/swig/Makefile.swig.gen
+++ b/gr-uhd/swig/Makefile.swig.gen
@@ -115,20 +115,20 @@ endif		# end of if python
 if GUILE
 
 uhd_swig_scmlib_LTLIBRARIES = 		\
-	libguile-uhd_swig.la
-libguile_uhd_swig_la_SOURCES =		\
+	libguile-gnuradio-uhd_swig.la
+libguile_gnuradio_uhd_swig_la_SOURCES =	\
 	guile/uhd_swig.cc			\
 	$(uhd_swig_la_swig_sources)
 nobase_uhd_swig_scm_DATA = 		\
 	gnuradio/uhd_swig.scm 		\
 	gnuradio/uhd_swig-primitive.scm
-libguile_uhd_swig_la_LIBADD = 		\
+libguile_gnuradio_uhd_swig_la_LIBADD = 	\
 	$(STD_SWIG_LA_LIB_ADD)		\
 	$(uhd_swig_la_swig_libadd)
-libguile_uhd_swig_la_LDFLAGS = 		\
+libguile_gnuradio_uhd_swig_la_LDFLAGS = 	\
 	$(STD_SWIG_LA_LD_FLAGS)		\
 	$(uhd_swig_la_swig_ldflags)
-libguile_uhd_swig_la_CXXFLAGS = 		\
+libguile_gnuradio_uhd_swig_la_CXXFLAGS = 	\
 	$(STD_SWIG_CXX_FLAGS)		\
 	-I$(top_builddir) 		\
 	$(uhd_swig_la_swig_cxxflags)
diff --git a/gr-usrp/src/Makefile.swig.gen b/gr-usrp/src/Makefile.swig.gen
index 789b4f06a..c122d6dd9 100644
--- a/gr-usrp/src/Makefile.swig.gen
+++ b/gr-usrp/src/Makefile.swig.gen
@@ -115,20 +115,20 @@ endif		# end of if python
 if GUILE
 
 usrp_swig_scmlib_LTLIBRARIES = 		\
-	libguile-usrp_swig.la
-libguile_usrp_swig_la_SOURCES =		\
+	libguile-gnuradio-usrp_swig.la
+libguile_gnuradio_usrp_swig_la_SOURCES =	\
 	guile/usrp_swig.cc			\
 	$(usrp_swig_la_swig_sources)
 nobase_usrp_swig_scm_DATA = 		\
 	gnuradio/usrp_swig.scm 		\
 	gnuradio/usrp_swig-primitive.scm
-libguile_usrp_swig_la_LIBADD = 		\
+libguile_gnuradio_usrp_swig_la_LIBADD = 	\
 	$(STD_SWIG_LA_LIB_ADD)		\
 	$(usrp_swig_la_swig_libadd)
-libguile_usrp_swig_la_LDFLAGS = 		\
+libguile_gnuradio_usrp_swig_la_LDFLAGS = 	\
 	$(STD_SWIG_LA_LD_FLAGS)		\
 	$(usrp_swig_la_swig_ldflags)
-libguile_usrp_swig_la_CXXFLAGS = 		\
+libguile_gnuradio_usrp_swig_la_CXXFLAGS = 	\
 	$(STD_SWIG_CXX_FLAGS)		\
 	-I$(top_builddir) 		\
 	$(usrp_swig_la_swig_cxxflags)
diff --git a/gr-usrp2/src/Makefile.swig.gen b/gr-usrp2/src/Makefile.swig.gen
index aad223071..73d5b15a8 100644
--- a/gr-usrp2/src/Makefile.swig.gen
+++ b/gr-usrp2/src/Makefile.swig.gen
@@ -115,20 +115,20 @@ endif		# end of if python
 if GUILE
 
 usrp2_scmlib_LTLIBRARIES = 		\
-	libguile-usrp2.la
-libguile_usrp2_la_SOURCES =		\
+	libguile-gnuradio-usrp2.la
+libguile_gnuradio_usrp2_la_SOURCES =	\
 	guile/usrp2.cc			\
 	$(usrp2_la_swig_sources)
 nobase_usrp2_scm_DATA = 		\
 	gnuradio/usrp2.scm 		\
 	gnuradio/usrp2-primitive.scm
-libguile_usrp2_la_LIBADD = 		\
+libguile_gnuradio_usrp2_la_LIBADD = 	\
 	$(STD_SWIG_LA_LIB_ADD)		\
 	$(usrp2_la_swig_libadd)
-libguile_usrp2_la_LDFLAGS = 		\
+libguile_gnuradio_usrp2_la_LDFLAGS = 	\
 	$(STD_SWIG_LA_LD_FLAGS)		\
 	$(usrp2_la_swig_ldflags)
-libguile_usrp2_la_CXXFLAGS = 		\
+libguile_gnuradio_usrp2_la_CXXFLAGS = 	\
 	$(STD_SWIG_CXX_FLAGS)		\
 	-I$(top_builddir) 		\
 	$(usrp2_la_swig_cxxflags)
diff --git a/gr-video-sdl/src/Makefile.swig.gen b/gr-video-sdl/src/Makefile.swig.gen
index 257676392..d69203f79 100644
--- a/gr-video-sdl/src/Makefile.swig.gen
+++ b/gr-video-sdl/src/Makefile.swig.gen
@@ -115,20 +115,20 @@ endif		# end of if python
 if GUILE
 
 video_sdl_scmlib_LTLIBRARIES = 		\
-	libguile-video_sdl.la
-libguile_video_sdl_la_SOURCES =		\
+	libguile-gnuradio-video_sdl.la
+libguile_gnuradio_video_sdl_la_SOURCES =	\
 	guile/video_sdl.cc			\
 	$(video_sdl_la_swig_sources)
 nobase_video_sdl_scm_DATA = 		\
 	gnuradio/video_sdl.scm 		\
 	gnuradio/video_sdl-primitive.scm
-libguile_video_sdl_la_LIBADD = 		\
+libguile_gnuradio_video_sdl_la_LIBADD = 	\
 	$(STD_SWIG_LA_LIB_ADD)		\
 	$(video_sdl_la_swig_libadd)
-libguile_video_sdl_la_LDFLAGS = 		\
+libguile_gnuradio_video_sdl_la_LDFLAGS = 	\
 	$(STD_SWIG_LA_LD_FLAGS)		\
 	$(video_sdl_la_swig_ldflags)
-libguile_video_sdl_la_CXXFLAGS = 		\
+libguile_gnuradio_video_sdl_la_CXXFLAGS = 	\
 	$(STD_SWIG_CXX_FLAGS)		\
 	-I$(top_builddir) 		\
 	$(video_sdl_la_swig_cxxflags)
diff --git a/usrp/host/swig/Makefile.swig.gen b/usrp/host/swig/Makefile.swig.gen
index 7c910eb67..b4cc97caa 100644
--- a/usrp/host/swig/Makefile.swig.gen
+++ b/usrp/host/swig/Makefile.swig.gen
@@ -115,20 +115,20 @@ endif		# end of if python
 if GUILE
 
 usrp_prims_scmlib_LTLIBRARIES = 		\
-	libguile-usrp_prims.la
-libguile_usrp_prims_la_SOURCES =		\
+	libguile-gnuradio-usrp_prims.la
+libguile_gnuradio_usrp_prims_la_SOURCES =	\
 	guile/usrp_prims.cc			\
 	$(usrp_prims_la_swig_sources)
 nobase_usrp_prims_scm_DATA = 		\
 	gnuradio/usrp_prims.scm 		\
 	gnuradio/usrp_prims-primitive.scm
-libguile_usrp_prims_la_LIBADD = 		\
+libguile_gnuradio_usrp_prims_la_LIBADD = 	\
 	$(STD_SWIG_LA_LIB_ADD)		\
 	$(usrp_prims_la_swig_libadd)
-libguile_usrp_prims_la_LDFLAGS = 		\
+libguile_gnuradio_usrp_prims_la_LDFLAGS = 	\
 	$(STD_SWIG_LA_LD_FLAGS)		\
 	$(usrp_prims_la_swig_ldflags)
-libguile_usrp_prims_la_CXXFLAGS = 		\
+libguile_gnuradio_usrp_prims_la_CXXFLAGS = 	\
 	$(STD_SWIG_CXX_FLAGS)		\
 	-I$(top_builddir) 		\
 	$(usrp_prims_la_swig_cxxflags)