Missed a few: s/_swig_py_/_/

8 files changed, 14 insertions, 16 deletions

diff --git a/gnuradio-core/src/lib/swig/Makefile.am b/gnuradio-core/src/lib/swig/Makefile.am
index 9e0d2f69e..fb8577f72 100644
--- a/gnuradio-core/src/lib/swig/Makefile.am
+++ b/gnuradio-core/src/lib/swig/Makefile.am
@@ -55,7 +55,7 @@ if GUILE
 # This is the top level guile file, which loads all the other scm files
 # for gnuradio. This has to be installed top level to be found in the
 # default search path.
-grguile_DATA = gnuradio_swig.scm
+grguile_DATA = gnuradio_core.scm
 endif
 
 
diff --git a/gnuradio-core/src/lib/swig/gnuradio_swig_guile.scm b/gnuradio-core/src/lib/swig/gnuradio_core.scm
index d08840071..2aae2d1d8 100644
--- a/gnuradio-core/src/lib/swig/gnuradio_swig_guile.scm
+++ b/gnuradio-core/src/lib/swig/gnuradio_core.scm
@@ -24,11 +24,9 @@
 ;; (set! %load-path (append %load-path '("/usr/lib/guile/gnuradio")))
 ;; (set! %load-path (append %load-path '("/usr/share/gnuradio")))
 
-(load "gnuradio/gnuradio_swig_py_filter.scm")
-(load "gnuradio/gnuradio_swig_py_io.scm")
-(load "gnuradio/gnuradio_swig_py_runtime.scm")
-(load "gnuradio/gnuradio_swig_py_general.scm")
-(load "gnuradio/gnuradio_swig_py_gengen.scm")
-
-;; FIXME: this don't load for some reason cause of issues with the .so files
-;; (load "gnuradio/gnuradio_swig_py_heir.scm")
+(load "gnuradio/gnuradio_core_filter.scm")
+(load "gnuradio/gnuradio_core_io.scm")
+(load "gnuradio/gnuradio_core_runtime.scm")
+(load "gnuradio/gnuradio_core_general.scm")
+(load "gnuradio/gnuradio_core_gengen.scm")
+(load "gnuradio/gnuradio_core_hier.scm")
diff --git a/gnuradio-core/src/lib/swig/gnuradio_core_filter.i b/gnuradio-core/src/lib/swig/gnuradio_core_filter.i
index d9751d0f1..b03996b76 100644
--- a/gnuradio-core/src/lib/swig/gnuradio_core_filter.i
+++ b/gnuradio-core/src/lib/swig/gnuradio_core_filter.i
@@ -20,7 +20,7 @@
  */
 
 #ifndef SWIGIMPORTED
-%module(directors="1") gnuradio_swig_py_filter
+%module(directors="1") gnuradio_core_filter
 #endif
 
  //%feature("autodoc", "1");		// generate python docstrings
diff --git a/gnuradio-core/src/lib/swig/gnuradio_core_general.i b/gnuradio-core/src/lib/swig/gnuradio_core_general.i
index 07ef90e34..a82f1f5b3 100644
--- a/gnuradio-core/src/lib/swig/gnuradio_core_general.i
+++ b/gnuradio-core/src/lib/swig/gnuradio_core_general.i
@@ -20,7 +20,7 @@
  */
 
 #ifndef SWIGIMPORTED
-%module(directors="1") gnuradio_swig_py_general
+%module(directors="1") gnuradio_core_general
 #endif
 
  //%feature("autodoc", "1");		// generate python docstrings
diff --git a/gnuradio-core/src/lib/swig/gnuradio_core_gengen.i b/gnuradio-core/src/lib/swig/gnuradio_core_gengen.i
index ea78d8af6..e6f9ebcf4 100644
--- a/gnuradio-core/src/lib/swig/gnuradio_core_gengen.i
+++ b/gnuradio-core/src/lib/swig/gnuradio_core_gengen.i
@@ -20,7 +20,7 @@
  */
 
 #ifndef SWIGIMPORTED
-%module(directors="1") gnuradio_swig_py_gengen
+%module(directors="1") gnuradio_core_gengen
 #endif
 
  //%feature("autodoc", "1");		// generate python docstrings
diff --git a/gnuradio-core/src/lib/swig/gnuradio_core_hier.i b/gnuradio-core/src/lib/swig/gnuradio_core_hier.i
index f69b80334..0da432ce0 100644
--- a/gnuradio-core/src/lib/swig/gnuradio_core_hier.i
+++ b/gnuradio-core/src/lib/swig/gnuradio_core_hier.i
@@ -20,7 +20,7 @@
  */
 
 #ifndef SWIGIMPORTED
-%module(directors="1") gnuradio_swig_py_hier
+%module(directors="1") gnuradio_hier_hier
 #endif
 
  //%feature("autodoc", "1");		// generate python docstrings
@@ -31,6 +31,6 @@
 
 #if SWIGGUILE
 %scheme %{
-(load-extension "libguile-gnuradio_core_heir" "SWIG_init")
+(load-extension "libguile-gnuradio_core_hier" "SWIG_init")
 %}
 #endif
diff --git a/gnuradio-core/src/lib/swig/gnuradio_core_io.i b/gnuradio-core/src/lib/swig/gnuradio_core_io.i
index 82acae747..b1dcfaf21 100644
--- a/gnuradio-core/src/lib/swig/gnuradio_core_io.i
+++ b/gnuradio-core/src/lib/swig/gnuradio_core_io.i
@@ -20,7 +20,7 @@
  */
 
 #ifndef SWIGIMPORTED
-%module(directors="1") gnuradio_swig_py_io
+%module(directors="1") gnuradio_core_io
 #endif
 
  //%feature("autodoc", "1");		// generate python docstrings
diff --git a/gnuradio-core/src/lib/swig/gnuradio_core_runtime.i b/gnuradio-core/src/lib/swig/gnuradio_core_runtime.i
index 3cc0a053d..4372b993d 100644
--- a/gnuradio-core/src/lib/swig/gnuradio_core_runtime.i
+++ b/gnuradio-core/src/lib/swig/gnuradio_core_runtime.i
@@ -21,7 +21,7 @@
  */
 
 #ifndef SWIGIMPORTED
-%module(directors="1") gnuradio_swig_py_runtime
+%module(directors="1") gnuradio_core_runtime
 #endif
 
  //%feature("autodoc", "1");		// generate python docstrings