diff options
| author | Eric Blossom <eb@comsec.com> | 2010-10-23 11:49:35 -0700 |
|---|---|---|
| committer | Eric Blossom <eb@comsec.com> | 2010-11-10 12:13:53 -0800 |
| commit | d1685679788103a280f4c7b373051b9e1779571f (patch) | |
| tree | 475ae800d2616b11b58d1376571d1d4f68160f4d | |
| parent | 52da23e0c42298a1cba07546259037c92db8c588 (diff) | |
Missed a few: s/_swig_py_/_/
| -rw-r--r-- | Makefile.common | 4 | ||||
| -rw-r--r-- | gnuradio-core/src/lib/swig/Makefile.am | 2 | ||||
| -rw-r--r-- | gnuradio-core/src/lib/swig/gnuradio_core.scm (renamed from gnuradio-core/src/lib/swig/gnuradio_swig_guile.scm) | 14 | ||||
| -rw-r--r-- | gnuradio-core/src/lib/swig/gnuradio_core_filter.i | 2 | ||||
| -rw-r--r-- | gnuradio-core/src/lib/swig/gnuradio_core_general.i | 2 | ||||
| -rw-r--r-- | gnuradio-core/src/lib/swig/gnuradio_core_gengen.i | 2 | ||||
| -rw-r--r-- | gnuradio-core/src/lib/swig/gnuradio_core_hier.i | 4 | ||||
| -rw-r--r-- | gnuradio-core/src/lib/swig/gnuradio_core_io.i | 2 | ||||
| -rw-r--r-- | gnuradio-core/src/lib/swig/gnuradio_core_runtime.i | 2 |
9 files changed, 16 insertions, 18 deletions
diff --git a/Makefile.common b/Makefile.common index 32bf2d0bb6..e11a8ddd2f 100644 --- a/Makefile.common +++ b/Makefile.common @@ -128,7 +128,7 @@ if GUILE $(SWIG) $(STD_SWIG_GUILE_ARGS) $($*_swig_args) \ -MD -MF guile/$*.Std \ -module $* -o guile/$*.cc $< - sed -e 's:guile/gnuradio_swig_py_runtime.cc:gnuradio_swig_py_runtime.scm:' guile/$*.Std > guile/$*.d + sed -e 's:guile/gnuradio_core_runtime.cc:gnuradio_core_runtime.scm:' guile/$*.Std > guile/$*.d $(RM) guile/$*.Std endif @@ -139,7 +139,7 @@ endif $(SWIG) $(STD_SWIG_PYTHON_ARGS) $($*_swig_args) \ -MD -MF python/$*.Std \ -module $* -o python/$*.cc -oh python/$*.h $< - sed -e 's:python/gnuradio_swig_py_runtime.cc:gnuradio_swig_py_runtime.py:' python/$*.Std > python/$*.d + sed -e 's:python/gnuradio_core_runtime.cc:gnuradio_core_runtime.py:' python/$*.Std > python/$*.d $(RM) python/$*.Std # Don't distribute the files defined in the variable 'no_dist_files' diff --git a/gnuradio-core/src/lib/swig/Makefile.am b/gnuradio-core/src/lib/swig/Makefile.am index 9e0d2f69e7..fb8577f729 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 d08840071a..2aae2d1d85 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 d9751d0f13..b03996b760 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 07ef90e347..a82f1f5b34 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 ea78d8af6f..e6f9ebcf41 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 f69b803347..0da432ce01 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 82acae7473..b1dcfaf21f 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 3cc0a053d8..4372b993dc 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 |