diff options
23 files changed, 174 insertions, 174 deletions
diff --git a/gnuradio-core/src/lib/swig/Makefile.swig.gen b/gnuradio-core/src/lib/swig/Makefile.swig.gen index 032d13857..39afc8973 100644 --- a/gnuradio-core/src/lib/swig/Makefile.swig.gen +++ b/gnuradio-core/src/lib/swig/Makefile.swig.gen @@ -41,7 +41,7 @@ gnuradio_swig_py_runtime_pylibdir = $(pyexecdir)/$(gnuradio_swig_py_runtime_pyli # The .so libraries for the guile modules get installed whereever guile # is installed, usually /usr/lib/guile/gnuradio/ # FIXME: determince whether these should be installed with gnuradio. -gnuradio_swig_py_runtime_scmlibdir = $(libdir)/guile/gnuradio +gnuradio_swig_py_runtime_scmlibdir = $(libdir) # The scm files for the guile modules get installed where ever guile # is installed, usually /usr/share/guile/site/gnuradio_swig_py_runtime @@ -124,16 +124,16 @@ gnuradio_swig_py_runtime_python_PYTHON = \ $(gnuradio_swig_py_runtime) if GUILE -gnuradio_swig_py_runtime_scmlib_LTLIBRARIES = gnuradio_swig_py_runtime_guile.la -gnuradio_swig_py_runtime_guile_la_SOURCES = \ +gnuradio_swig_py_runtime_scmlib_LTLIBRARIES = libguile-gnuradio_swig_py_runtime.la +libguile_gnuradio_swig_py_runtime_la_SOURCES = \ guile/gnuradio_swig_py_runtime.cc \ $(gnuradio_swig_py_runtime_la_swig_sources) gnuradio_swig_py_runtime_scm_DATA = gnuradio_swig_py_runtime.scm # Guile can use the same flags as python does -gnuradio_swig_py_runtime_guile_la_LIBADD = $(_gnuradio_swig_py_runtime_la_LIBADD) -gnuradio_swig_py_runtime_guile_la_LDFLAGS = $(_gnuradio_swig_py_runtime_la_LDFLAGS) -gnuradio_swig_py_runtime_guile_la_CXXFLAGS = $(_gnuradio_swig_py_runtime_la_CXXFLAGS) +libguile_gnuradio_swig_py_runtime_la_LIBADD = $(_gnuradio_swig_py_runtime_la_LIBADD) +libguile_gnuradio_swig_py_runtime_la_LDFLAGS = $(_gnuradio_swig_py_runtime_la_LDFLAGS) +libguile_gnuradio_swig_py_runtime_la_CXXFLAGS = $(_gnuradio_swig_py_runtime_la_CXXFLAGS) guile/gnuradio_swig_py_runtime.lo: gnuradio_swig_py_runtime.lo gnuradio_swig_py_runtime.scm: gnuradio_swig_py_runtime.i @@ -189,7 +189,7 @@ gnuradio_swig_py_general_pylibdir = $(pyexecdir)/$(gnuradio_swig_py_general_pyli # The .so libraries for the guile modules get installed whereever guile # is installed, usually /usr/lib/guile/gnuradio/ # FIXME: determince whether these should be installed with gnuradio. -gnuradio_swig_py_general_scmlibdir = $(libdir)/guile/gnuradio +gnuradio_swig_py_general_scmlibdir = $(libdir) # The scm files for the guile modules get installed where ever guile # is installed, usually /usr/share/guile/site/gnuradio_swig_py_general @@ -272,16 +272,16 @@ gnuradio_swig_py_general_python_PYTHON = \ $(gnuradio_swig_py_general) if GUILE -gnuradio_swig_py_general_scmlib_LTLIBRARIES = gnuradio_swig_py_general_guile.la -gnuradio_swig_py_general_guile_la_SOURCES = \ +gnuradio_swig_py_general_scmlib_LTLIBRARIES = libguile-gnuradio_swig_py_general.la +libguile_gnuradio_swig_py_general_la_SOURCES = \ guile/gnuradio_swig_py_general.cc \ $(gnuradio_swig_py_general_la_swig_sources) gnuradio_swig_py_general_scm_DATA = gnuradio_swig_py_general.scm # Guile can use the same flags as python does -gnuradio_swig_py_general_guile_la_LIBADD = $(_gnuradio_swig_py_general_la_LIBADD) -gnuradio_swig_py_general_guile_la_LDFLAGS = $(_gnuradio_swig_py_general_la_LDFLAGS) -gnuradio_swig_py_general_guile_la_CXXFLAGS = $(_gnuradio_swig_py_general_la_CXXFLAGS) +libguile_gnuradio_swig_py_general_la_LIBADD = $(_gnuradio_swig_py_general_la_LIBADD) +libguile_gnuradio_swig_py_general_la_LDFLAGS = $(_gnuradio_swig_py_general_la_LDFLAGS) +libguile_gnuradio_swig_py_general_la_CXXFLAGS = $(_gnuradio_swig_py_general_la_CXXFLAGS) guile/gnuradio_swig_py_general.lo: gnuradio_swig_py_general.lo gnuradio_swig_py_general.scm: gnuradio_swig_py_general.i @@ -337,7 +337,7 @@ gnuradio_swig_py_gengen_pylibdir = $(pyexecdir)/$(gnuradio_swig_py_gengen_pylibd # The .so libraries for the guile modules get installed whereever guile # is installed, usually /usr/lib/guile/gnuradio/ # FIXME: determince whether these should be installed with gnuradio. -gnuradio_swig_py_gengen_scmlibdir = $(libdir)/guile/gnuradio +gnuradio_swig_py_gengen_scmlibdir = $(libdir) # The scm files for the guile modules get installed where ever guile # is installed, usually /usr/share/guile/site/gnuradio_swig_py_gengen @@ -420,16 +420,16 @@ gnuradio_swig_py_gengen_python_PYTHON = \ $(gnuradio_swig_py_gengen) if GUILE -gnuradio_swig_py_gengen_scmlib_LTLIBRARIES = gnuradio_swig_py_gengen_guile.la -gnuradio_swig_py_gengen_guile_la_SOURCES = \ +gnuradio_swig_py_gengen_scmlib_LTLIBRARIES = libguile-gnuradio_swig_py_gengen.la +libguile_gnuradio_swig_py_gengen_la_SOURCES = \ guile/gnuradio_swig_py_gengen.cc \ $(gnuradio_swig_py_gengen_la_swig_sources) gnuradio_swig_py_gengen_scm_DATA = gnuradio_swig_py_gengen.scm # Guile can use the same flags as python does -gnuradio_swig_py_gengen_guile_la_LIBADD = $(_gnuradio_swig_py_gengen_la_LIBADD) -gnuradio_swig_py_gengen_guile_la_LDFLAGS = $(_gnuradio_swig_py_gengen_la_LDFLAGS) -gnuradio_swig_py_gengen_guile_la_CXXFLAGS = $(_gnuradio_swig_py_gengen_la_CXXFLAGS) +libguile_gnuradio_swig_py_gengen_la_LIBADD = $(_gnuradio_swig_py_gengen_la_LIBADD) +libguile_gnuradio_swig_py_gengen_la_LDFLAGS = $(_gnuradio_swig_py_gengen_la_LDFLAGS) +libguile_gnuradio_swig_py_gengen_la_CXXFLAGS = $(_gnuradio_swig_py_gengen_la_CXXFLAGS) guile/gnuradio_swig_py_gengen.lo: gnuradio_swig_py_gengen.lo gnuradio_swig_py_gengen.scm: gnuradio_swig_py_gengen.i @@ -485,7 +485,7 @@ gnuradio_swig_py_filter_pylibdir = $(pyexecdir)/$(gnuradio_swig_py_filter_pylibd # The .so libraries for the guile modules get installed whereever guile # is installed, usually /usr/lib/guile/gnuradio/ # FIXME: determince whether these should be installed with gnuradio. -gnuradio_swig_py_filter_scmlibdir = $(libdir)/guile/gnuradio +gnuradio_swig_py_filter_scmlibdir = $(libdir) # The scm files for the guile modules get installed where ever guile # is installed, usually /usr/share/guile/site/gnuradio_swig_py_filter @@ -568,16 +568,16 @@ gnuradio_swig_py_filter_python_PYTHON = \ $(gnuradio_swig_py_filter) if GUILE -gnuradio_swig_py_filter_scmlib_LTLIBRARIES = gnuradio_swig_py_filter_guile.la -gnuradio_swig_py_filter_guile_la_SOURCES = \ +gnuradio_swig_py_filter_scmlib_LTLIBRARIES = libguile-gnuradio_swig_py_filter.la +libguile_gnuradio_swig_py_filter_la_SOURCES = \ guile/gnuradio_swig_py_filter.cc \ $(gnuradio_swig_py_filter_la_swig_sources) gnuradio_swig_py_filter_scm_DATA = gnuradio_swig_py_filter.scm # Guile can use the same flags as python does -gnuradio_swig_py_filter_guile_la_LIBADD = $(_gnuradio_swig_py_filter_la_LIBADD) -gnuradio_swig_py_filter_guile_la_LDFLAGS = $(_gnuradio_swig_py_filter_la_LDFLAGS) -gnuradio_swig_py_filter_guile_la_CXXFLAGS = $(_gnuradio_swig_py_filter_la_CXXFLAGS) +libguile_gnuradio_swig_py_filter_la_LIBADD = $(_gnuradio_swig_py_filter_la_LIBADD) +libguile_gnuradio_swig_py_filter_la_LDFLAGS = $(_gnuradio_swig_py_filter_la_LDFLAGS) +libguile_gnuradio_swig_py_filter_la_CXXFLAGS = $(_gnuradio_swig_py_filter_la_CXXFLAGS) guile/gnuradio_swig_py_filter.lo: gnuradio_swig_py_filter.lo gnuradio_swig_py_filter.scm: gnuradio_swig_py_filter.i @@ -633,7 +633,7 @@ gnuradio_swig_py_io_pylibdir = $(pyexecdir)/$(gnuradio_swig_py_io_pylibdir_categ # The .so libraries for the guile modules get installed whereever guile # is installed, usually /usr/lib/guile/gnuradio/ # FIXME: determince whether these should be installed with gnuradio. -gnuradio_swig_py_io_scmlibdir = $(libdir)/guile/gnuradio +gnuradio_swig_py_io_scmlibdir = $(libdir) # The scm files for the guile modules get installed where ever guile # is installed, usually /usr/share/guile/site/gnuradio_swig_py_io @@ -716,16 +716,16 @@ gnuradio_swig_py_io_python_PYTHON = \ $(gnuradio_swig_py_io) if GUILE -gnuradio_swig_py_io_scmlib_LTLIBRARIES = gnuradio_swig_py_io_guile.la -gnuradio_swig_py_io_guile_la_SOURCES = \ +gnuradio_swig_py_io_scmlib_LTLIBRARIES = libguile-gnuradio_swig_py_io.la +libguile_gnuradio_swig_py_io_la_SOURCES = \ guile/gnuradio_swig_py_io.cc \ $(gnuradio_swig_py_io_la_swig_sources) gnuradio_swig_py_io_scm_DATA = gnuradio_swig_py_io.scm # Guile can use the same flags as python does -gnuradio_swig_py_io_guile_la_LIBADD = $(_gnuradio_swig_py_io_la_LIBADD) -gnuradio_swig_py_io_guile_la_LDFLAGS = $(_gnuradio_swig_py_io_la_LDFLAGS) -gnuradio_swig_py_io_guile_la_CXXFLAGS = $(_gnuradio_swig_py_io_la_CXXFLAGS) +libguile_gnuradio_swig_py_io_la_LIBADD = $(_gnuradio_swig_py_io_la_LIBADD) +libguile_gnuradio_swig_py_io_la_LDFLAGS = $(_gnuradio_swig_py_io_la_LDFLAGS) +libguile_gnuradio_swig_py_io_la_CXXFLAGS = $(_gnuradio_swig_py_io_la_CXXFLAGS) guile/gnuradio_swig_py_io.lo: gnuradio_swig_py_io.lo gnuradio_swig_py_io.scm: gnuradio_swig_py_io.i @@ -781,7 +781,7 @@ gnuradio_swig_py_hier_pylibdir = $(pyexecdir)/$(gnuradio_swig_py_hier_pylibdir_c # The .so libraries for the guile modules get installed whereever guile # is installed, usually /usr/lib/guile/gnuradio/ # FIXME: determince whether these should be installed with gnuradio. -gnuradio_swig_py_hier_scmlibdir = $(libdir)/guile/gnuradio +gnuradio_swig_py_hier_scmlibdir = $(libdir) # The scm files for the guile modules get installed where ever guile # is installed, usually /usr/share/guile/site/gnuradio_swig_py_hier @@ -864,16 +864,16 @@ gnuradio_swig_py_hier_python_PYTHON = \ $(gnuradio_swig_py_hier) if GUILE -gnuradio_swig_py_hier_scmlib_LTLIBRARIES = gnuradio_swig_py_hier_guile.la -gnuradio_swig_py_hier_guile_la_SOURCES = \ +gnuradio_swig_py_hier_scmlib_LTLIBRARIES = libguile-gnuradio_swig_py_hier.la +libguile_gnuradio_swig_py_hier_la_SOURCES = \ guile/gnuradio_swig_py_hier.cc \ $(gnuradio_swig_py_hier_la_swig_sources) gnuradio_swig_py_hier_scm_DATA = gnuradio_swig_py_hier.scm # Guile can use the same flags as python does -gnuradio_swig_py_hier_guile_la_LIBADD = $(_gnuradio_swig_py_hier_la_LIBADD) -gnuradio_swig_py_hier_guile_la_LDFLAGS = $(_gnuradio_swig_py_hier_la_LDFLAGS) -gnuradio_swig_py_hier_guile_la_CXXFLAGS = $(_gnuradio_swig_py_hier_la_CXXFLAGS) +libguile_gnuradio_swig_py_hier_la_LIBADD = $(_gnuradio_swig_py_hier_la_LIBADD) +libguile_gnuradio_swig_py_hier_la_LDFLAGS = $(_gnuradio_swig_py_hier_la_LDFLAGS) +libguile_gnuradio_swig_py_hier_la_CXXFLAGS = $(_gnuradio_swig_py_hier_la_CXXFLAGS) guile/gnuradio_swig_py_hier.lo: gnuradio_swig_py_hier.lo gnuradio_swig_py_hier.scm: gnuradio_swig_py_hier.i diff --git a/gr-atsc/src/lib/Makefile.swig.gen b/gr-atsc/src/lib/Makefile.swig.gen index feb978673..73db7909b 100644 --- a/gr-atsc/src/lib/Makefile.swig.gen +++ b/gr-atsc/src/lib/Makefile.swig.gen @@ -41,7 +41,7 @@ atsc_pylibdir = $(pyexecdir)/$(atsc_pylibdir_category) # The .so libraries for the guile modules get installed whereever guile # is installed, usually /usr/lib/guile/gnuradio/ # FIXME: determince whether these should be installed with gnuradio. -atsc_scmlibdir = $(libdir)/guile/gnuradio +atsc_scmlibdir = $(libdir) # The scm files for the guile modules get installed where ever guile # is installed, usually /usr/share/guile/site/atsc @@ -124,16 +124,16 @@ atsc_python_PYTHON = \ $(atsc) if GUILE -atsc_scmlib_LTLIBRARIES = atsc_guile.la -atsc_guile_la_SOURCES = \ +atsc_scmlib_LTLIBRARIES = libguile-atsc.la +libguile_atsc_la_SOURCES = \ guile/atsc.cc \ $(atsc_la_swig_sources) atsc_scm_DATA = atsc.scm # Guile can use the same flags as python does -atsc_guile_la_LIBADD = $(_atsc_la_LIBADD) -atsc_guile_la_LDFLAGS = $(_atsc_la_LDFLAGS) -atsc_guile_la_CXXFLAGS = $(_atsc_la_CXXFLAGS) +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 diff --git a/gr-audio-alsa/src/Makefile.swig.gen b/gr-audio-alsa/src/Makefile.swig.gen index 6ba31a113..8ab5d5442 100644 --- a/gr-audio-alsa/src/Makefile.swig.gen +++ b/gr-audio-alsa/src/Makefile.swig.gen @@ -41,7 +41,7 @@ audio_alsa_pylibdir = $(pyexecdir)/$(audio_alsa_pylibdir_category) # The .so libraries for the guile modules get installed whereever guile # is installed, usually /usr/lib/guile/gnuradio/ # FIXME: determince whether these should be installed with gnuradio. -audio_alsa_scmlibdir = $(libdir)/guile/gnuradio +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 @@ -124,16 +124,16 @@ audio_alsa_python_PYTHON = \ $(audio_alsa) if GUILE -audio_alsa_scmlib_LTLIBRARIES = audio_alsa_guile.la -audio_alsa_guile_la_SOURCES = \ +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 # Guile can use the same flags as python does -audio_alsa_guile_la_LIBADD = $(_audio_alsa_la_LIBADD) -audio_alsa_guile_la_LDFLAGS = $(_audio_alsa_la_LDFLAGS) -audio_alsa_guile_la_CXXFLAGS = $(_audio_alsa_la_CXXFLAGS) +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 diff --git a/gr-audio-jack/src/Makefile.swig.gen b/gr-audio-jack/src/Makefile.swig.gen index 5da7fce3e..46e6681c1 100644 --- a/gr-audio-jack/src/Makefile.swig.gen +++ b/gr-audio-jack/src/Makefile.swig.gen @@ -41,7 +41,7 @@ audio_jack_pylibdir = $(pyexecdir)/$(audio_jack_pylibdir_category) # The .so libraries for the guile modules get installed whereever guile # is installed, usually /usr/lib/guile/gnuradio/ # FIXME: determince whether these should be installed with gnuradio. -audio_jack_scmlibdir = $(libdir)/guile/gnuradio +audio_jack_scmlibdir = $(libdir) # The scm files for the guile modules get installed where ever guile # is installed, usually /usr/share/guile/site/audio_jack @@ -124,16 +124,16 @@ audio_jack_python_PYTHON = \ $(audio_jack) if GUILE -audio_jack_scmlib_LTLIBRARIES = audio_jack_guile.la -audio_jack_guile_la_SOURCES = \ +audio_jack_scmlib_LTLIBRARIES = libguile-audio_jack.la +libguile_audio_jack_la_SOURCES = \ guile/audio_jack.cc \ $(audio_jack_la_swig_sources) audio_jack_scm_DATA = audio_jack.scm # Guile can use the same flags as python does -audio_jack_guile_la_LIBADD = $(_audio_jack_la_LIBADD) -audio_jack_guile_la_LDFLAGS = $(_audio_jack_la_LDFLAGS) -audio_jack_guile_la_CXXFLAGS = $(_audio_jack_la_CXXFLAGS) +libguile_audio_jack_la_LIBADD = $(_audio_jack_la_LIBADD) +libguile_audio_jack_la_LDFLAGS = $(_audio_jack_la_LDFLAGS) +libguile_audio_jack_la_CXXFLAGS = $(_audio_jack_la_CXXFLAGS) guile/audio_jack.lo: audio_jack.lo audio_jack.scm: audio_jack.i diff --git a/gr-audio-oss/src/Makefile.swig.gen b/gr-audio-oss/src/Makefile.swig.gen index 9262ca432..792a94eb0 100644 --- a/gr-audio-oss/src/Makefile.swig.gen +++ b/gr-audio-oss/src/Makefile.swig.gen @@ -41,7 +41,7 @@ audio_oss_pylibdir = $(pyexecdir)/$(audio_oss_pylibdir_category) # The .so libraries for the guile modules get installed whereever guile # is installed, usually /usr/lib/guile/gnuradio/ # FIXME: determince whether these should be installed with gnuradio. -audio_oss_scmlibdir = $(libdir)/guile/gnuradio +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 @@ -124,16 +124,16 @@ audio_oss_python_PYTHON = \ $(audio_oss) if GUILE -audio_oss_scmlib_LTLIBRARIES = audio_oss_guile.la -audio_oss_guile_la_SOURCES = \ +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 # Guile can use the same flags as python does -audio_oss_guile_la_LIBADD = $(_audio_oss_la_LIBADD) -audio_oss_guile_la_LDFLAGS = $(_audio_oss_la_LDFLAGS) -audio_oss_guile_la_CXXFLAGS = $(_audio_oss_la_CXXFLAGS) +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 diff --git a/gr-audio-osx/src/Makefile.swig.gen b/gr-audio-osx/src/Makefile.swig.gen index c4a55ccca..cbb887fec 100644 --- a/gr-audio-osx/src/Makefile.swig.gen +++ b/gr-audio-osx/src/Makefile.swig.gen @@ -41,7 +41,7 @@ audio_osx_pylibdir = $(pyexecdir)/$(audio_osx_pylibdir_category) # The .so libraries for the guile modules get installed whereever guile # is installed, usually /usr/lib/guile/gnuradio/ # FIXME: determince whether these should be installed with gnuradio. -audio_osx_scmlibdir = $(libdir)/guile/gnuradio +audio_osx_scmlibdir = $(libdir) # The scm files for the guile modules get installed where ever guile # is installed, usually /usr/share/guile/site/audio_osx @@ -124,16 +124,16 @@ audio_osx_python_PYTHON = \ $(audio_osx) if GUILE -audio_osx_scmlib_LTLIBRARIES = audio_osx_guile.la -audio_osx_guile_la_SOURCES = \ +audio_osx_scmlib_LTLIBRARIES = libguile-audio_osx.la +libguile_audio_osx_la_SOURCES = \ guile/audio_osx.cc \ $(audio_osx_la_swig_sources) audio_osx_scm_DATA = audio_osx.scm # Guile can use the same flags as python does -audio_osx_guile_la_LIBADD = $(_audio_osx_la_LIBADD) -audio_osx_guile_la_LDFLAGS = $(_audio_osx_la_LDFLAGS) -audio_osx_guile_la_CXXFLAGS = $(_audio_osx_la_CXXFLAGS) +libguile_audio_osx_la_LIBADD = $(_audio_osx_la_LIBADD) +libguile_audio_osx_la_LDFLAGS = $(_audio_osx_la_LDFLAGS) +libguile_audio_osx_la_CXXFLAGS = $(_audio_osx_la_CXXFLAGS) guile/audio_osx.lo: audio_osx.lo audio_osx.scm: audio_osx.i diff --git a/gr-audio-portaudio/src/Makefile.swig.gen b/gr-audio-portaudio/src/Makefile.swig.gen index 17d4624de..a76a9c90c 100644 --- a/gr-audio-portaudio/src/Makefile.swig.gen +++ b/gr-audio-portaudio/src/Makefile.swig.gen @@ -41,7 +41,7 @@ audio_portaudio_pylibdir = $(pyexecdir)/$(audio_portaudio_pylibdir_category) # The .so libraries for the guile modules get installed whereever guile # is installed, usually /usr/lib/guile/gnuradio/ # FIXME: determince whether these should be installed with gnuradio. -audio_portaudio_scmlibdir = $(libdir)/guile/gnuradio +audio_portaudio_scmlibdir = $(libdir) # The scm files for the guile modules get installed where ever guile # is installed, usually /usr/share/guile/site/audio_portaudio @@ -124,16 +124,16 @@ audio_portaudio_python_PYTHON = \ $(audio_portaudio) if GUILE -audio_portaudio_scmlib_LTLIBRARIES = audio_portaudio_guile.la -audio_portaudio_guile_la_SOURCES = \ +audio_portaudio_scmlib_LTLIBRARIES = libguile-audio_portaudio.la +libguile_audio_portaudio_la_SOURCES = \ guile/audio_portaudio.cc \ $(audio_portaudio_la_swig_sources) audio_portaudio_scm_DATA = audio_portaudio.scm # Guile can use the same flags as python does -audio_portaudio_guile_la_LIBADD = $(_audio_portaudio_la_LIBADD) -audio_portaudio_guile_la_LDFLAGS = $(_audio_portaudio_la_LDFLAGS) -audio_portaudio_guile_la_CXXFLAGS = $(_audio_portaudio_la_CXXFLAGS) +libguile_audio_portaudio_la_LIBADD = $(_audio_portaudio_la_LIBADD) +libguile_audio_portaudio_la_LDFLAGS = $(_audio_portaudio_la_LDFLAGS) +libguile_audio_portaudio_la_CXXFLAGS = $(_audio_portaudio_la_CXXFLAGS) guile/audio_portaudio.lo: audio_portaudio.lo audio_portaudio.scm: audio_portaudio.i diff --git a/gr-audio-windows/src/Makefile.swig.gen b/gr-audio-windows/src/Makefile.swig.gen index 5646fd553..96858310f 100644 --- a/gr-audio-windows/src/Makefile.swig.gen +++ b/gr-audio-windows/src/Makefile.swig.gen @@ -41,7 +41,7 @@ audio_windows_pylibdir = $(pyexecdir)/$(audio_windows_pylibdir_category) # The .so libraries for the guile modules get installed whereever guile # is installed, usually /usr/lib/guile/gnuradio/ # FIXME: determince whether these should be installed with gnuradio. -audio_windows_scmlibdir = $(libdir)/guile/gnuradio +audio_windows_scmlibdir = $(libdir) # The scm files for the guile modules get installed where ever guile # is installed, usually /usr/share/guile/site/audio_windows @@ -124,16 +124,16 @@ audio_windows_python_PYTHON = \ $(audio_windows) if GUILE -audio_windows_scmlib_LTLIBRARIES = audio_windows_guile.la -audio_windows_guile_la_SOURCES = \ +audio_windows_scmlib_LTLIBRARIES = libguile-audio_windows.la +libguile_audio_windows_la_SOURCES = \ guile/audio_windows.cc \ $(audio_windows_la_swig_sources) audio_windows_scm_DATA = audio_windows.scm # Guile can use the same flags as python does -audio_windows_guile_la_LIBADD = $(_audio_windows_la_LIBADD) -audio_windows_guile_la_LDFLAGS = $(_audio_windows_la_LDFLAGS) -audio_windows_guile_la_CXXFLAGS = $(_audio_windows_la_CXXFLAGS) +libguile_audio_windows_la_LIBADD = $(_audio_windows_la_LIBADD) +libguile_audio_windows_la_LDFLAGS = $(_audio_windows_la_LDFLAGS) +libguile_audio_windows_la_CXXFLAGS = $(_audio_windows_la_CXXFLAGS) guile/audio_windows.lo: audio_windows.lo audio_windows.scm: audio_windows.i diff --git a/gr-comedi/src/Makefile.swig.gen b/gr-comedi/src/Makefile.swig.gen index 841f51805..4bda07800 100644 --- a/gr-comedi/src/Makefile.swig.gen +++ b/gr-comedi/src/Makefile.swig.gen @@ -41,7 +41,7 @@ comedi_pylibdir = $(pyexecdir)/$(comedi_pylibdir_category) # The .so libraries for the guile modules get installed whereever guile # is installed, usually /usr/lib/guile/gnuradio/ # FIXME: determince whether these should be installed with gnuradio. -comedi_scmlibdir = $(libdir)/guile/gnuradio +comedi_scmlibdir = $(libdir) # The scm files for the guile modules get installed where ever guile # is installed, usually /usr/share/guile/site/comedi @@ -124,16 +124,16 @@ comedi_python_PYTHON = \ $(comedi) if GUILE -comedi_scmlib_LTLIBRARIES = comedi_guile.la -comedi_guile_la_SOURCES = \ +comedi_scmlib_LTLIBRARIES = libguile-comedi.la +libguile_comedi_la_SOURCES = \ guile/comedi.cc \ $(comedi_la_swig_sources) comedi_scm_DATA = comedi.scm # Guile can use the same flags as python does -comedi_guile_la_LIBADD = $(_comedi_la_LIBADD) -comedi_guile_la_LDFLAGS = $(_comedi_la_LDFLAGS) -comedi_guile_la_CXXFLAGS = $(_comedi_la_CXXFLAGS) +libguile_comedi_la_LIBADD = $(_comedi_la_LIBADD) +libguile_comedi_la_LDFLAGS = $(_comedi_la_LDFLAGS) +libguile_comedi_la_CXXFLAGS = $(_comedi_la_CXXFLAGS) guile/comedi.lo: comedi.lo comedi.scm: comedi.i diff --git a/gr-cvsd-vocoder/src/lib/Makefile.swig.gen b/gr-cvsd-vocoder/src/lib/Makefile.swig.gen index e14c6573c..b506ae80a 100644 --- a/gr-cvsd-vocoder/src/lib/Makefile.swig.gen +++ b/gr-cvsd-vocoder/src/lib/Makefile.swig.gen @@ -41,7 +41,7 @@ cvsd_vocoder_pylibdir = $(pyexecdir)/$(cvsd_vocoder_pylibdir_category) # The .so libraries for the guile modules get installed whereever guile # is installed, usually /usr/lib/guile/gnuradio/ # FIXME: determince whether these should be installed with gnuradio. -cvsd_vocoder_scmlibdir = $(libdir)/guile/gnuradio +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 @@ -124,16 +124,16 @@ cvsd_vocoder_python_PYTHON = \ $(cvsd_vocoder) if GUILE -cvsd_vocoder_scmlib_LTLIBRARIES = cvsd_vocoder_guile.la -cvsd_vocoder_guile_la_SOURCES = \ +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 # Guile can use the same flags as python does -cvsd_vocoder_guile_la_LIBADD = $(_cvsd_vocoder_la_LIBADD) -cvsd_vocoder_guile_la_LDFLAGS = $(_cvsd_vocoder_la_LDFLAGS) -cvsd_vocoder_guile_la_CXXFLAGS = $(_cvsd_vocoder_la_CXXFLAGS) +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 diff --git a/gr-gcell/src/Makefile.swig.gen b/gr-gcell/src/Makefile.swig.gen index fae7e4b7d..43821f5f2 100644 --- a/gr-gcell/src/Makefile.swig.gen +++ b/gr-gcell/src/Makefile.swig.gen @@ -41,7 +41,7 @@ gcell_pylibdir = $(pyexecdir)/$(gcell_pylibdir_category) # The .so libraries for the guile modules get installed whereever guile # is installed, usually /usr/lib/guile/gnuradio/ # FIXME: determince whether these should be installed with gnuradio. -gcell_scmlibdir = $(libdir)/guile/gnuradio +gcell_scmlibdir = $(libdir) # The scm files for the guile modules get installed where ever guile # is installed, usually /usr/share/guile/site/gcell @@ -124,16 +124,16 @@ gcell_python_PYTHON = \ $(gcell) if GUILE -gcell_scmlib_LTLIBRARIES = gcell_guile.la -gcell_guile_la_SOURCES = \ +gcell_scmlib_LTLIBRARIES = libguile-gcell.la +libguile_gcell_la_SOURCES = \ guile/gcell.cc \ $(gcell_la_swig_sources) gcell_scm_DATA = gcell.scm # Guile can use the same flags as python does -gcell_guile_la_LIBADD = $(_gcell_la_LIBADD) -gcell_guile_la_LDFLAGS = $(_gcell_la_LDFLAGS) -gcell_guile_la_CXXFLAGS = $(_gcell_la_CXXFLAGS) +libguile_gcell_la_LIBADD = $(_gcell_la_LIBADD) +libguile_gcell_la_LDFLAGS = $(_gcell_la_LDFLAGS) +libguile_gcell_la_CXXFLAGS = $(_gcell_la_CXXFLAGS) guile/gcell.lo: gcell.lo gcell.scm: gcell.i diff --git a/gr-gsm-fr-vocoder/src/lib/Makefile.swig.gen b/gr-gsm-fr-vocoder/src/lib/Makefile.swig.gen index 5ff23b78b..f20d19cab 100644 --- a/gr-gsm-fr-vocoder/src/lib/Makefile.swig.gen +++ b/gr-gsm-fr-vocoder/src/lib/Makefile.swig.gen @@ -41,7 +41,7 @@ gsm_full_rate_pylibdir = $(pyexecdir)/$(gsm_full_rate_pylibdir_category) # The .so libraries for the guile modules get installed whereever guile # is installed, usually /usr/lib/guile/gnuradio/ # FIXME: determince whether these should be installed with gnuradio. -gsm_full_rate_scmlibdir = $(libdir)/guile/gnuradio +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 @@ -124,16 +124,16 @@ gsm_full_rate_python_PYTHON = \ $(gsm_full_rate) if GUILE -gsm_full_rate_scmlib_LTLIBRARIES = gsm_full_rate_guile.la -gsm_full_rate_guile_la_SOURCES = \ +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 # Guile can use the same flags as python does -gsm_full_rate_guile_la_LIBADD = $(_gsm_full_rate_la_LIBADD) -gsm_full_rate_guile_la_LDFLAGS = $(_gsm_full_rate_la_LDFLAGS) -gsm_full_rate_guile_la_CXXFLAGS = $(_gsm_full_rate_la_CXXFLAGS) +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 diff --git a/gr-msdd6000/src/Makefile.swig.gen b/gr-msdd6000/src/Makefile.swig.gen index c62140a08..c3a341eca 100644 --- a/gr-msdd6000/src/Makefile.swig.gen +++ b/gr-msdd6000/src/Makefile.swig.gen @@ -41,7 +41,7 @@ msdd_pylibdir = $(pyexecdir)/$(msdd_pylibdir_category) # The .so libraries for the guile modules get installed whereever guile # is installed, usually /usr/lib/guile/gnuradio/ # FIXME: determince whether these should be installed with gnuradio. -msdd_scmlibdir = $(libdir)/guile/gnuradio +msdd_scmlibdir = $(libdir) # The scm files for the guile modules get installed where ever guile # is installed, usually /usr/share/guile/site/msdd @@ -124,16 +124,16 @@ msdd_python_PYTHON = \ $(msdd) if GUILE -msdd_scmlib_LTLIBRARIES = msdd_guile.la -msdd_guile_la_SOURCES = \ +msdd_scmlib_LTLIBRARIES = libguile-msdd.la +libguile_msdd_la_SOURCES = \ guile/msdd.cc \ $(msdd_la_swig_sources) msdd_scm_DATA = msdd.scm # Guile can use the same flags as python does -msdd_guile_la_LIBADD = $(_msdd_la_LIBADD) -msdd_guile_la_LDFLAGS = $(_msdd_la_LDFLAGS) -msdd_guile_la_CXXFLAGS = $(_msdd_la_CXXFLAGS) +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 @@ -189,7 +189,7 @@ msdd_rs_pylibdir = $(pyexecdir)/$(msdd_rs_pylibdir_category) # The .so libraries for the guile modules get installed whereever guile # is installed, usually /usr/lib/guile/gnuradio/ # FIXME: determince whether these should be installed with gnuradio. -msdd_rs_scmlibdir = $(libdir)/guile/gnuradio +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 @@ -272,16 +272,16 @@ msdd_rs_python_PYTHON = \ $(msdd_rs) if GUILE -msdd_rs_scmlib_LTLIBRARIES = msdd_rs_guile.la -msdd_rs_guile_la_SOURCES = \ +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 # Guile can use the same flags as python does -msdd_rs_guile_la_LIBADD = $(_msdd_rs_la_LIBADD) -msdd_rs_guile_la_LDFLAGS = $(_msdd_rs_la_LDFLAGS) -msdd_rs_guile_la_CXXFLAGS = $(_msdd_rs_la_CXXFLAGS) +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 diff --git a/gr-noaa/swig/Makefile.swig.gen b/gr-noaa/swig/Makefile.swig.gen index 8b7049e1e..8f99f0b87 100644 --- a/gr-noaa/swig/Makefile.swig.gen +++ b/gr-noaa/swig/Makefile.swig.gen @@ -41,7 +41,7 @@ noaa_swig_pylibdir = $(pyexecdir)/$(noaa_swig_pylibdir_category) # The .so libraries for the guile modules get installed whereever guile # is installed, usually /usr/lib/guile/gnuradio/ # FIXME: determince whether these should be installed with gnuradio. -noaa_swig_scmlibdir = $(libdir)/guile/gnuradio +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 @@ -124,16 +124,16 @@ noaa_swig_python_PYTHON = \ $(noaa_swig) if GUILE -noaa_swig_scmlib_LTLIBRARIES = noaa_swig_guile.la -noaa_swig_guile_la_SOURCES = \ +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 # Guile can use the same flags as python does -noaa_swig_guile_la_LIBADD = $(_noaa_swig_la_LIBADD) -noaa_swig_guile_la_LDFLAGS = $(_noaa_swig_la_LDFLAGS) -noaa_swig_guile_la_CXXFLAGS = $(_noaa_swig_la_CXXFLAGS) +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 diff --git a/gr-pager/swig/Makefile.swig.gen b/gr-pager/swig/Makefile.swig.gen index 93d9fcdc0..2d198ee70 100644 --- a/gr-pager/swig/Makefile.swig.gen +++ b/gr-pager/swig/Makefile.swig.gen @@ -41,7 +41,7 @@ pager_swig_pylibdir = $(pyexecdir)/$(pager_swig_pylibdir_category) # The .so libraries for the guile modules get installed whereever guile # is installed, usually /usr/lib/guile/gnuradio/ # FIXME: determince whether these should be installed with gnuradio. -pager_swig_scmlibdir = $(libdir)/guile/gnuradio +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 @@ -124,16 +124,16 @@ pager_swig_python_PYTHON = \ $(pager_swig) if GUILE -pager_swig_scmlib_LTLIBRARIES = pager_swig_guile.la -pager_swig_guile_la_SOURCES = \ +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 # Guile can use the same flags as python does -pager_swig_guile_la_LIBADD = $(_pager_swig_la_LIBADD) -pager_swig_guile_la_LDFLAGS = $(_pager_swig_la_LDFLAGS) -pager_swig_guile_la_CXXFLAGS = $(_pager_swig_la_CXXFLAGS) +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 diff --git a/gr-qtgui/src/lib/Makefile.swig.gen b/gr-qtgui/src/lib/Makefile.swig.gen index 866dd3e6f..b6551eadb 100644 --- a/gr-qtgui/src/lib/Makefile.swig.gen +++ b/gr-qtgui/src/lib/Makefile.swig.gen @@ -41,7 +41,7 @@ qtgui_pylibdir = $(pyexecdir)/$(qtgui_pylibdir_category) # The .so libraries for the guile modules get installed whereever guile # is installed, usually /usr/lib/guile/gnuradio/ # FIXME: determince whether these should be installed with gnuradio. -qtgui_scmlibdir = $(libdir)/guile/gnuradio +qtgui_scmlibdir = $(libdir) # The scm files for the guile modules get installed where ever guile # is installed, usually /usr/share/guile/site/qtgui @@ -124,16 +124,16 @@ qtgui_python_PYTHON = \ $(qtgui) if GUILE -qtgui_scmlib_LTLIBRARIES = qtgui_guile.la -qtgui_guile_la_SOURCES = \ +qtgui_scmlib_LTLIBRARIES = libguile-qtgui.la +libguile_qtgui_la_SOURCES = \ guile/qtgui.cc \ $(qtgui_la_swig_sources) qtgui_scm_DATA = qtgui.scm # Guile can use the same flags as python does -qtgui_guile_la_LIBADD = $(_qtgui_la_LIBADD) -qtgui_guile_la_LDFLAGS = $(_qtgui_la_LDFLAGS) -qtgui_guile_la_CXXFLAGS = $(_qtgui_la_CXXFLAGS) +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 diff --git a/gr-radio-astronomy/src/lib/Makefile.swig.gen b/gr-radio-astronomy/src/lib/Makefile.swig.gen index f83f4c58e..d427b3c11 100644 --- a/gr-radio-astronomy/src/lib/Makefile.swig.gen +++ b/gr-radio-astronomy/src/lib/Makefile.swig.gen @@ -41,7 +41,7 @@ ra_pylibdir = $(pyexecdir)/$(ra_pylibdir_category) # The .so libraries for the guile modules get installed whereever guile # is installed, usually /usr/lib/guile/gnuradio/ # FIXME: determince whether these should be installed with gnuradio. -ra_scmlibdir = $(libdir)/guile/gnuradio +ra_scmlibdir = $(libdir) # The scm files for the guile modules get installed where ever guile # is installed, usually /usr/share/guile/site/ra @@ -124,16 +124,16 @@ ra_python_PYTHON = \ $(ra) if GUILE -ra_scmlib_LTLIBRARIES = ra_guile.la -ra_guile_la_SOURCES = \ +ra_scmlib_LTLIBRARIES = libguile-ra.la +libguile_ra_la_SOURCES = \ guile/ra.cc \ $(ra_la_swig_sources) ra_scm_DATA = ra.scm # Guile can use the same flags as python does -ra_guile_la_LIBADD = $(_ra_la_LIBADD) -ra_guile_la_LDFLAGS = $(_ra_la_LDFLAGS) -ra_guile_la_CXXFLAGS = $(_ra_la_CXXFLAGS) +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 diff --git a/gr-trellis/src/lib/Makefile.swig.gen b/gr-trellis/src/lib/Makefile.swig.gen index 62762fa13..c43717d4b 100644 --- a/gr-trellis/src/lib/Makefile.swig.gen +++ b/gr-trellis/src/lib/Makefile.swig.gen @@ -41,7 +41,7 @@ trellis_pylibdir = $(pyexecdir)/$(trellis_pylibdir_category) # The .so libraries for the guile modules get installed whereever guile # is installed, usually /usr/lib/guile/gnuradio/ # FIXME: determince whether these should be installed with gnuradio. -trellis_scmlibdir = $(libdir)/guile/gnuradio +trellis_scmlibdir = $(libdir) # The scm files for the guile modules get installed where ever guile # is installed, usually /usr/share/guile/site/trellis @@ -124,16 +124,16 @@ trellis_python_PYTHON = \ $(trellis) if GUILE -trellis_scmlib_LTLIBRARIES = trellis_guile.la -trellis_guile_la_SOURCES = \ +trellis_scmlib_LTLIBRARIES = libguile-trellis.la +libguile_trellis_la_SOURCES = \ guile/trellis.cc \ $(trellis_la_swig_sources) trellis_scm_DATA = trellis.scm # Guile can use the same flags as python does -trellis_guile_la_LIBADD = $(_trellis_la_LIBADD) -trellis_guile_la_LDFLAGS = $(_trellis_la_LDFLAGS) -trellis_guile_la_CXXFLAGS = $(_trellis_la_CXXFLAGS) +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 diff --git a/gr-uhd/swig/Makefile.swig.gen b/gr-uhd/swig/Makefile.swig.gen index e06723814..88ed33834 100644 --- a/gr-uhd/swig/Makefile.swig.gen +++ b/gr-uhd/swig/Makefile.swig.gen @@ -41,7 +41,7 @@ uhd_swig_pylibdir = $(pyexecdir)/$(uhd_swig_pylibdir_category) # The .so libraries for the guile modules get installed whereever guile # is installed, usually /usr/lib/guile/gnuradio/ # FIXME: determince whether these should be installed with gnuradio. -uhd_swig_scmlibdir = $(libdir)/guile/gnuradio +uhd_swig_scmlibdir = $(libdir) # The scm files for the guile modules get installed where ever guile # is installed, usually /usr/share/guile/site/uhd_swig @@ -124,16 +124,16 @@ uhd_swig_python_PYTHON = \ $(uhd_swig) if GUILE -uhd_swig_scmlib_LTLIBRARIES = uhd_swig_guile.la -uhd_swig_guile_la_SOURCES = \ +uhd_swig_scmlib_LTLIBRARIES = libguile-uhd_swig.la +libguile_uhd_swig_la_SOURCES = \ guile/uhd_swig.cc \ $(uhd_swig_la_swig_sources) uhd_swig_scm_DATA = uhd_swig.scm # Guile can use the same flags as python does -uhd_swig_guile_la_LIBADD = $(_uhd_swig_la_LIBADD) -uhd_swig_guile_la_LDFLAGS = $(_uhd_swig_la_LDFLAGS) -uhd_swig_guile_la_CXXFLAGS = $(_uhd_swig_la_CXXFLAGS) +libguile_uhd_swig_la_LIBADD = $(_uhd_swig_la_LIBADD) +libguile_uhd_swig_la_LDFLAGS = $(_uhd_swig_la_LDFLAGS) +libguile_uhd_swig_la_CXXFLAGS = $(_uhd_swig_la_CXXFLAGS) guile/uhd_swig.lo: uhd_swig.lo uhd_swig.scm: uhd_swig.i diff --git a/gr-usrp/src/Makefile.swig.gen b/gr-usrp/src/Makefile.swig.gen index 19a777224..72a4285d6 100644 --- a/gr-usrp/src/Makefile.swig.gen +++ b/gr-usrp/src/Makefile.swig.gen @@ -41,7 +41,7 @@ usrp_swig_pylibdir = $(pyexecdir)/$(usrp_swig_pylibdir_category) # The .so libraries for the guile modules get installed whereever guile # is installed, usually /usr/lib/guile/gnuradio/ # FIXME: determince whether these should be installed with gnuradio. -usrp_swig_scmlibdir = $(libdir)/guile/gnuradio +usrp_swig_scmlibdir = $(libdir) # The scm files for the guile modules get installed where ever guile # is installed, usually /usr/share/guile/site/usrp_swig @@ -124,16 +124,16 @@ usrp_swig_python_PYTHON = \ $(usrp_swig) if GUILE -usrp_swig_scmlib_LTLIBRARIES = usrp_swig_guile.la -usrp_swig_guile_la_SOURCES = \ +usrp_swig_scmlib_LTLIBRARIES = libguile-usrp_swig.la +libguile_usrp_swig_la_SOURCES = \ guile/usrp_swig.cc \ $(usrp_swig_la_swig_sources) usrp_swig_scm_DATA = usrp_swig.scm # Guile can use the same flags as python does -usrp_swig_guile_la_LIBADD = $(_usrp_swig_la_LIBADD) -usrp_swig_guile_la_LDFLAGS = $(_usrp_swig_la_LDFLAGS) -usrp_swig_guile_la_CXXFLAGS = $(_usrp_swig_la_CXXFLAGS) +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 diff --git a/gr-usrp2/src/Makefile.swig.gen b/gr-usrp2/src/Makefile.swig.gen index 753a7b254..932ed53b0 100644 --- a/gr-usrp2/src/Makefile.swig.gen +++ b/gr-usrp2/src/Makefile.swig.gen @@ -41,7 +41,7 @@ usrp2_pylibdir = $(pyexecdir)/$(usrp2_pylibdir_category) # The .so libraries for the guile modules get installed whereever guile # is installed, usually /usr/lib/guile/gnuradio/ # FIXME: determince whether these should be installed with gnuradio. -usrp2_scmlibdir = $(libdir)/guile/gnuradio +usrp2_scmlibdir = $(libdir) # The scm files for the guile modules get installed where ever guile # is installed, usually /usr/share/guile/site/usrp2 @@ -124,16 +124,16 @@ usrp2_python_PYTHON = \ $(usrp2) if GUILE -usrp2_scmlib_LTLIBRARIES = usrp2_guile.la -usrp2_guile_la_SOURCES = \ +usrp2_scmlib_LTLIBRARIES = libguile-usrp2.la +libguile_usrp2_la_SOURCES = \ guile/usrp2.cc \ $(usrp2_la_swig_sources) usrp2_scm_DATA = usrp2.scm # Guile can use the same flags as python does -usrp2_guile_la_LIBADD = $(_usrp2_la_LIBADD) -usrp2_guile_la_LDFLAGS = $(_usrp2_la_LDFLAGS) -usrp2_guile_la_CXXFLAGS = $(_usrp2_la_CXXFLAGS) +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 diff --git a/gr-video-sdl/src/Makefile.swig.gen b/gr-video-sdl/src/Makefile.swig.gen index 15db36a84..0c29596af 100644 --- a/gr-video-sdl/src/Makefile.swig.gen +++ b/gr-video-sdl/src/Makefile.swig.gen @@ -41,7 +41,7 @@ video_sdl_pylibdir = $(pyexecdir)/$(video_sdl_pylibdir_category) # The .so libraries for the guile modules get installed whereever guile # is installed, usually /usr/lib/guile/gnuradio/ # FIXME: determince whether these should be installed with gnuradio. -video_sdl_scmlibdir = $(libdir)/guile/gnuradio +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 @@ -124,16 +124,16 @@ video_sdl_python_PYTHON = \ $(video_sdl) if GUILE -video_sdl_scmlib_LTLIBRARIES = video_sdl_guile.la -video_sdl_guile_la_SOURCES = \ +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 # Guile can use the same flags as python does -video_sdl_guile_la_LIBADD = $(_video_sdl_la_LIBADD) -video_sdl_guile_la_LDFLAGS = $(_video_sdl_la_LDFLAGS) -video_sdl_guile_la_CXXFLAGS = $(_video_sdl_la_CXXFLAGS) +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 diff --git a/usrp/host/swig/Makefile.swig.gen b/usrp/host/swig/Makefile.swig.gen index 830552a2c..32fbfa35e 100644 --- a/usrp/host/swig/Makefile.swig.gen +++ b/usrp/host/swig/Makefile.swig.gen @@ -41,7 +41,7 @@ usrp_prims_pylibdir = $(pyexecdir)/$(usrp_prims_pylibdir_category) # The .so libraries for the guile modules get installed whereever guile # is installed, usually /usr/lib/guile/gnuradio/ # FIXME: determince whether these should be installed with gnuradio. -usrp_prims_scmlibdir = $(libdir)/guile/gnuradio +usrp_prims_scmlibdir = $(libdir) # The scm files for the guile modules get installed where ever guile # is installed, usually /usr/share/guile/site/usrp_prims @@ -124,16 +124,16 @@ usrp_prims_python_PYTHON = \ $(usrp_prims) if GUILE -usrp_prims_scmlib_LTLIBRARIES = usrp_prims_guile.la -usrp_prims_guile_la_SOURCES = \ +usrp_prims_scmlib_LTLIBRARIES = libguile-usrp_prims.la +libguile_usrp_prims_la_SOURCES = \ guile/usrp_prims.cc \ $(usrp_prims_la_swig_sources) usrp_prims_scm_DATA = usrp_prims.scm # Guile can use the same flags as python does -usrp_prims_guile_la_LIBADD = $(_usrp_prims_la_LIBADD) -usrp_prims_guile_la_LDFLAGS = $(_usrp_prims_la_LDFLAGS) -usrp_prims_guile_la_CXXFLAGS = $(_usrp_prims_la_CXXFLAGS) +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 |