diff options
28 files changed, 32 insertions, 32 deletions
diff --git a/Makefile.swig.gen.t b/Makefile.swig.gen.t index 7b88322b8..4d37e0e21 100644 --- a/Makefile.swig.gen.t +++ b/Makefile.swig.gen.t @@ -115,20 +115,20 @@ endif # end of if python if GUILE @NAME@_scmlib_LTLIBRARIES = \ - libguile-@NAME@.la -libguile_@NAME@_la_SOURCES = \ + libguile-gnuradio-@NAME@.la +libguile_gnuradio_@NAME@_la_SOURCES = \ guile/@NAME@.cc \ $(@NAME@_la_swig_sources) nobase_@NAME@_scm_DATA = \ gnuradio/@NAME@.scm \ gnuradio/@NAME@-primitive.scm -libguile_@NAME@_la_LIBADD = \ +libguile_gnuradio_@NAME@_la_LIBADD = \ $(STD_SWIG_LA_LIB_ADD) \ $(@NAME@_la_swig_libadd) -libguile_@NAME@_la_LDFLAGS = \ +libguile_gnuradio_@NAME@_la_LDFLAGS = \ $(STD_SWIG_LA_LD_FLAGS) \ $(@NAME@_la_swig_ldflags) -libguile_@NAME@_la_CXXFLAGS = \ +libguile_gnuradio_@NAME@_la_CXXFLAGS = \ $(STD_SWIG_CXX_FLAGS) \ -I$(top_builddir) \ $(@NAME@_la_swig_cxxflags) diff --git a/gnuradio-core/src/lib/swig/gnuradio_core_filter.i b/gnuradio-core/src/lib/swig/gnuradio_core_filter.i index 0acbfa3a6..d7262f140 100644 --- a/gnuradio-core/src/lib/swig/gnuradio_core_filter.i +++ b/gnuradio-core/src/lib/swig/gnuradio_core_filter.i @@ -31,7 +31,7 @@ #if SWIGGUILE %scheme %{ -(load-extension "libguile-gnuradio_core_filter" "scm_init_gnuradio_gnuradio_core_filter_module") +(load-extension "libguile-gnuradio-gnuradio_core_filter" "scm_init_gnuradio_gnuradio_core_filter_module") %} %goops %{ diff --git a/gnuradio-core/src/lib/swig/gnuradio_core_general.i b/gnuradio-core/src/lib/swig/gnuradio_core_general.i index 759a65459..e381f3509 100644 --- a/gnuradio-core/src/lib/swig/gnuradio_core_general.i +++ b/gnuradio-core/src/lib/swig/gnuradio_core_general.i @@ -51,7 +51,7 @@ #if SWIGGUILE %scheme %{ -(load-extension "libguile-gnuradio_core_general" "scm_init_gnuradio_gnuradio_core_general_module") +(load-extension "libguile-gnuradio-gnuradio_core_general" "scm_init_gnuradio_gnuradio_core_general_module") %} %goops %{ diff --git a/gnuradio-core/src/lib/swig/gnuradio_core_gengen.i b/gnuradio-core/src/lib/swig/gnuradio_core_gengen.i index c08109173..d9fe6672a 100644 --- a/gnuradio-core/src/lib/swig/gnuradio_core_gengen.i +++ b/gnuradio-core/src/lib/swig/gnuradio_core_gengen.i @@ -31,7 +31,7 @@ #if SWIGGUILE %scheme %{ -(load-extension "libguile-gnuradio_core_gengen" "scm_init_gnuradio_gnuradio_core_gengen_module") +(load-extension "libguile-gnuradio-gnuradio_core_gengen" "scm_init_gnuradio_gnuradio_core_gengen_module") %} %goops %{ diff --git a/gnuradio-core/src/lib/swig/gnuradio_core_hier.i b/gnuradio-core/src/lib/swig/gnuradio_core_hier.i index 6d7a38321..2869fd56b 100644 --- a/gnuradio-core/src/lib/swig/gnuradio_core_hier.i +++ b/gnuradio-core/src/lib/swig/gnuradio_core_hier.i @@ -31,7 +31,7 @@ #if SWIGGUILE %scheme %{ -(load-extension "libguile-gnuradio_core_hier" "scm_init_gnuradio_gnuradio_core_hier_module") +(load-extension "libguile-gnuradio-gnuradio_core_hier" "scm_init_gnuradio_gnuradio_core_hier_module") %} %goops %{ diff --git a/gnuradio-core/src/lib/swig/gnuradio_core_io.i b/gnuradio-core/src/lib/swig/gnuradio_core_io.i index 936522ada..c8d818660 100644 --- a/gnuradio-core/src/lib/swig/gnuradio_core_io.i +++ b/gnuradio-core/src/lib/swig/gnuradio_core_io.i @@ -31,7 +31,7 @@ #if SWIGGUILE %scheme %{ -(load-extension "libguile-gnuradio_core_io" "scm_init_gnuradio_gnuradio_core_io_module") +(load-extension "libguile-gnuradio-gnuradio_core_io" "scm_init_gnuradio_gnuradio_core_io_module") %} %goops %{ diff --git a/gnuradio-core/src/lib/swig/gnuradio_core_runtime.i b/gnuradio-core/src/lib/swig/gnuradio_core_runtime.i index bb10b36b2..78b717d22 100644 --- a/gnuradio-core/src/lib/swig/gnuradio_core_runtime.i +++ b/gnuradio-core/src/lib/swig/gnuradio_core_runtime.i @@ -34,7 +34,7 @@ #if SWIGGUILE %scheme %{ -(load-extension "libguile-gnuradio_core_runtime" "scm_init_gnuradio_gnuradio_core_runtime_module") +(load-extension "libguile-gnuradio-gnuradio_core_runtime" "scm_init_gnuradio_gnuradio_core_runtime_module") %} %goops %{ diff --git a/gr-audio-alsa/src/audio_alsa.i b/gr-audio-alsa/src/audio_alsa.i index c650bd948..64550f788 100644 --- a/gr-audio-alsa/src/audio_alsa.i +++ b/gr-audio-alsa/src/audio_alsa.i @@ -76,7 +76,7 @@ class audio_alsa_sink : public gr_sync_block { #if SWIGGUILE %scheme %{ -(load-extension "libguile-audio_alsa" "scm_init_gnuradio_audio_alsa_module") +(load-extension "libguile-gnuradio-audio_alsa" "scm_init_gnuradio_audio_alsa_module") %} %goops %{ diff --git a/gr-audio-jack/src/audio_jack.i b/gr-audio-jack/src/audio_jack.i index b61f67b5e..565a7270e 100644 --- a/gr-audio-jack/src/audio_jack.i +++ b/gr-audio-jack/src/audio_jack.i @@ -76,7 +76,7 @@ class audio_jack_sink : public gr_sync_block { #if SWIGGUILE %scheme %{ -(load-extension "libguile-audio_jack" "scm_init_gnuradio_audio_jack_module") +(load-extension "libguile-gnuradio-audio_jack" "scm_init_gnuradio_audio_jack_module") %} %goops %{ diff --git a/gr-audio-oss/src/audio_oss.i b/gr-audio-oss/src/audio_oss.i index 4e54f8f91..b7758ab0c 100644 --- a/gr-audio-oss/src/audio_oss.i +++ b/gr-audio-oss/src/audio_oss.i @@ -66,7 +66,7 @@ class audio_oss_source : public gr_sync_block { #if SWIGGUILE %scheme %{ -(load-extension "libguile-audio_oss" "scm_init_gnuradio_audio_oss_module") +(load-extension "libguile-gnuradio-audio_oss" "scm_init_gnuradio_audio_oss_module") %} %goops %{ diff --git a/gr-audio-osx/src/audio_osx.i b/gr-audio-osx/src/audio_osx.i index 2e724900b..98038a607 100644 --- a/gr-audio-osx/src/audio_osx.i +++ b/gr-audio-osx/src/audio_osx.i @@ -91,7 +91,7 @@ class audio_osx_source : public gr_sync_block { #if SWIGGUILE %scheme %{ -(load-extension "libguile-audio_osx" "scm_init_gnuradio_audio_osx_module") +(load-extension "libguile-gnuradio-audio_osx" "scm_init_gnuradio_audio_osx_module") %} %goops %{ diff --git a/gr-audio-portaudio/src/audio_portaudio.i b/gr-audio-portaudio/src/audio_portaudio.i index 65a1ef60e..7da4afead 100644 --- a/gr-audio-portaudio/src/audio_portaudio.i +++ b/gr-audio-portaudio/src/audio_portaudio.i @@ -73,7 +73,7 @@ class audio_portaudio_sink : public gr_sync_block { #if SWIGGUILE %scheme %{ -(load-extension "libguile-audio_portaudio" "scm_init_gnuradio_audio_portaudio_module") +(load-extension "libguile-gnuradio-audio_portaudio" "scm_init_gnuradio_audio_portaudio_module") %} %goops %{ diff --git a/gr-audio-windows/src/audio_windows.i b/gr-audio-windows/src/audio_windows.i index e8a1ba2c9..b4b5e566b 100644 --- a/gr-audio-windows/src/audio_windows.i +++ b/gr-audio-windows/src/audio_windows.i @@ -64,7 +64,7 @@ class audio_windows_source : public gr_sync_block { #if SWIGGUILE %scheme %{ -(load-extension "libguile-audio_windows" "scm_init_gnuradio_audio_windows_module") +(load-extension "libguile-gnuradio-audio_windows" "scm_init_gnuradio_audio_windows_module") %} %goops %{ diff --git a/gr-comedi/src/comedi.i b/gr-comedi/src/comedi.i index 499ccc598..dadb57e90 100644 --- a/gr-comedi/src/comedi.i +++ b/gr-comedi/src/comedi.i @@ -72,7 +72,7 @@ class comedi_sink_s : public gr_sync_block { #if SWIGGUILE %scheme %{ -(load-extension "libguile-comedi" "scm_init_gnuradio_comedi_module") +(load-extension "libguile-gnuradio-comedi" "scm_init_gnuradio_comedi_module") %} %goops %{ diff --git a/gr-cvsd-vocoder/src/lib/cvsd_vocoder.i b/gr-cvsd-vocoder/src/lib/cvsd_vocoder.i index 6d85648d4..32d78d519 100644 --- a/gr-cvsd-vocoder/src/lib/cvsd_vocoder.i +++ b/gr-cvsd-vocoder/src/lib/cvsd_vocoder.i @@ -82,7 +82,7 @@ private: #if SWIGGUILE %scheme %{ -(load-extension "libguile-cvsd_vocoder" "scm_init_gnuradio_cvsd_vocoder_module") +(load-extension "libguile-gnuradio-cvsd_vocoder" "scm_init_gnuradio_cvsd_vocoder_module") %} %goops %{ diff --git a/gr-gcell/src/gcell.i b/gr-gcell/src/gcell.i index dfffcc188..f600a258e 100644 --- a/gr-gcell/src/gcell.i +++ b/gr-gcell/src/gcell.i @@ -31,7 +31,7 @@ #if SWIGGUILE %scheme %{ -(load-extension "libguile-gcell" "scm_init_gnuradio_gcell_module") +(load-extension "libguile-gnuradio-gcell" "scm_init_gnuradio_gcell_module") %} %goops %{ diff --git a/gr-gsm-fr-vocoder/src/lib/gsm_full_rate.i b/gr-gsm-fr-vocoder/src/lib/gsm_full_rate.i index ceea3e35b..bbbb9e4fb 100644 --- a/gr-gsm-fr-vocoder/src/lib/gsm_full_rate.i +++ b/gr-gsm-fr-vocoder/src/lib/gsm_full_rate.i @@ -49,7 +49,7 @@ public: #if SWIGGUILE %scheme %{ -(load-extension "libguile-gsm_full_rate" "scm_init_gnuradio_gsm_full_rate_module") +(load-extension "libguile-gnuradio-gsm_full_rate" "scm_init_gnuradio_gsm_full_rate_module") %} %goops %{ diff --git a/gr-howto-write-a-block/swig/howto.i b/gr-howto-write-a-block/swig/howto.i index 9a37ea228..868df5739 100644 --- a/gr-howto-write-a-block/swig/howto.i +++ b/gr-howto-write-a-block/swig/howto.i @@ -12,7 +12,7 @@ #if SWIGGUILE %scheme %{ -(load-extension "libguile-howto" "scm_init_gnuradio_howto_module") +(load-extension "libguile-gnuradio-howto" "scm_init_gnuradio_howto_module") %} %goops %{ diff --git a/gr-msdd6000/src/msdd_rs.i b/gr-msdd6000/src/msdd_rs.i index 462863b24..f4555edbd 100644 --- a/gr-msdd6000/src/msdd_rs.i +++ b/gr-msdd6000/src/msdd_rs.i @@ -94,7 +94,7 @@ class msdd_rs_source_simple : public gr_sync_block { #if SWIGGUILE %scheme %{ -(load-extension "libguile-msdd_rs" "scm_init_gnuradio_msdd_rs_module") +(load-extension "libguile-gnuradio-msdd_rs" "scm_init_gnuradio_msdd_rs_module") %} %goops %{ diff --git a/gr-noaa/swig/noaa_swig.i b/gr-noaa/swig/noaa_swig.i index ea6c3d362..92d6804e4 100644 --- a/gr-noaa/swig/noaa_swig.i +++ b/gr-noaa/swig/noaa_swig.i @@ -34,7 +34,7 @@ #if SWIGGUILE %scheme %{ -(load-extension "libguile-noaa_swig" "scm_init_gnuradio_noaa_swig_module") +(load-extension "libguile-gnuradio-noaa_swig" "scm_init_gnuradio_noaa_swig_module") %} %goops %{ diff --git a/gr-pager/swig/pager_swig.i b/gr-pager/swig/pager_swig.i index 5561c26fc..b202242b0 100644 --- a/gr-pager/swig/pager_swig.i +++ b/gr-pager/swig/pager_swig.i @@ -37,7 +37,7 @@ #if SWIGGUILE %scheme %{ -(load-extension "libguile-pager_swig" "scm_init_gnuradio_pager_swig_module") +(load-extension "libguile-gnuradio-pager_swig" "scm_init_gnuradio_pager_swig_module") %} %goops %{ diff --git a/gr-qtgui/src/lib/qtgui.i b/gr-qtgui/src/lib/qtgui.i index 65ff948d0..063e78806 100644 --- a/gr-qtgui/src/lib/qtgui.i +++ b/gr-qtgui/src/lib/qtgui.i @@ -122,7 +122,7 @@ public: #if SWIGGUILE %scheme %{ -(load-extension "libguile-qtgui" "scm_init_gnuradio_qtgui_module") +(load-extension "libguile-gnuradio-qtgui" "scm_init_gnuradio_qtgui_module") %} %goops %{ diff --git a/gr-radio-astronomy/src/lib/ra.i b/gr-radio-astronomy/src/lib/ra.i index 3378eae61..e5a4d5544 100644 --- a/gr-radio-astronomy/src/lib/ra.i +++ b/gr-radio-astronomy/src/lib/ra.i @@ -58,7 +58,7 @@ #if SWIGGUILE %scheme %{ -(load-extension "libguile-ra" "scm_init_gnuradio_ra_module") +(load-extension "libguile-gnuradio-ra" "scm_init_gnuradio_ra_module") %} %goops %{ diff --git a/gr-trellis/src/lib/trellis.i b/gr-trellis/src/lib/trellis.i index 63b4c2659..32b7a0a00 100644 --- a/gr-trellis/src/lib/trellis.i +++ b/gr-trellis/src/lib/trellis.i @@ -46,7 +46,7 @@ #if SWIGGUILE %scheme %{ -(load-extension "libguile-trellis" "scm_init_gnuradio_trellis_module") +(load-extension "libguile-gnuradio-trellis" "scm_init_gnuradio_trellis_module") %} %goops %{ diff --git a/gr-uhd/swig/uhd_swig.i b/gr-uhd/swig/uhd_swig.i index 7344f7a72..c7664157b 100644 --- a/gr-uhd/swig/uhd_swig.i +++ b/gr-uhd/swig/uhd_swig.i @@ -122,7 +122,7 @@ static const size_t ALL_MBOARDS; #if SWIGGUILE %scheme %{ -(load-extension "libguile-uhd_swig" "scm_init_gnuradio_uhd_swig_module") +(load-extension "libguile-gnuradio-uhd_swig" "scm_init_gnuradio_uhd_swig_module") %} %goops %{ diff --git a/gr-usrp/src/usrp_swig.i b/gr-usrp/src/usrp_swig.i index 32f2cb41e..b18aa50f7 100644 --- a/gr-usrp/src/usrp_swig.i +++ b/gr-usrp/src/usrp_swig.i @@ -147,7 +147,7 @@ usrp_source_s_sptr.pick_rx_subdevice = __pick_rx_subdevice #if SWIGGUILE %scheme %{ -(load-extension "libguile-usrp_swig" "scm_init_gnuradio_usrp_swig_module") +(load-extension "libguile-gnuradio-usrp_swig" "scm_init_gnuradio_usrp_swig_module") %} %goops %{ diff --git a/gr-usrp2/src/usrp2.i b/gr-usrp2/src/usrp2.i index 0555f086c..c30fb7216 100644 --- a/gr-usrp2/src/usrp2.i +++ b/gr-usrp2/src/usrp2.i @@ -353,7 +353,7 @@ usrp2_sink_16sc_sptr.read_gpio = __read_gpio #if SWIGGUILE %scheme %{ -(load-extension "libguile-usrp2" "scm_init_gnuradio_usrp2_module") +(load-extension "libguile-gnuradio-usrp2" "scm_init_gnuradio_usrp2_module") %} %goops %{ diff --git a/gr-video-sdl/src/video_sdl.i b/gr-video-sdl/src/video_sdl.i index d609c71af..c4f7e89a8 100644 --- a/gr-video-sdl/src/video_sdl.i +++ b/gr-video-sdl/src/video_sdl.i @@ -63,7 +63,7 @@ class video_sdl_sink_s : public gr_sync_block { #if SWIGGUILE %scheme %{ -(load-extension "libguile-video_sdl" "scm_init_gnuradio_video_sdl_module") +(load-extension "libguile-gnuradio-video_sdl" "scm_init_gnuradio_video_sdl_module") %} %goops %{ |