summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorEric Blossom2010-10-31 20:51:24 -0700
committerEric Blossom2010-11-10 12:15:43 -0800
commitf2f013ecb94c5e5781952c67496fec09aff7da2c (patch)
tree1fac08894040bfed1d27e72f6136b55ec780b429
parent4e3090688a785b591c6a9986d0e2c842ab65e701 (diff)
downloadgnuradio-f2f013ecb94c5e5781952c67496fec09aff7da2c.tar.gz
gnuradio-f2f013ecb94c5e5781952c67496fec09aff7da2c.tar.bz2
gnuradio-f2f013ecb94c5e5781952c67496fec09aff7da2c.zip
Rename coerce.scm to runtime-shim.scm. Modify core.scm to use runtime-shim.
-rw-r--r--gnuradio-core/src/lib/swig/Makefile.am3
-rw-r--r--gnuradio-core/src/lib/swig/gnuradio/core.scm1
-rw-r--r--gnuradio-core/src/lib/swig/gnuradio/runtime-shim.scm (renamed from gnuradio-core/src/lib/swig/gnuradio/coerce.scm)5
3 files changed, 8 insertions, 1 deletions
diff --git a/gnuradio-core/src/lib/swig/Makefile.am b/gnuradio-core/src/lib/swig/Makefile.am
index 2b763d94c..01a5318ec 100644
--- a/gnuradio-core/src/lib/swig/Makefile.am
+++ b/gnuradio-core/src/lib/swig/Makefile.am
@@ -60,8 +60,9 @@ if GUILE
# for gnuradio. This has to be installed top level to be found in the
# default search path.
nobase_guile_DATA = \
- gnuradio/export-safely.scm \
gnuradio/core.scm \
+ gnuradio/export-safely.scm \
+ gnuradio/runtime-shim.scm \
Swig/common.scm
endif
diff --git a/gnuradio-core/src/lib/swig/gnuradio/core.scm b/gnuradio-core/src/lib/swig/gnuradio/core.scm
index 294881146..08daeeb34 100644
--- a/gnuradio-core/src/lib/swig/gnuradio/core.scm
+++ b/gnuradio-core/src/lib/swig/gnuradio/core.scm
@@ -2,6 +2,7 @@
(define-module (gnuradio core)
#:use-module (gnuradio gnuradio_core_runtime)
+ #:use-module (gnuradio runtime-shim)
#:use-module (gnuradio gnuradio_core_filter)
#:use-module (gnuradio gnuradio_core_io)
#:use-module (gnuradio gnuradio_core_general)
diff --git a/gnuradio-core/src/lib/swig/gnuradio/coerce.scm b/gnuradio-core/src/lib/swig/gnuradio/runtime-shim.scm
index 4654ad6f8..c08d3947c 100644
--- a/gnuradio-core/src/lib/swig/gnuradio/coerce.scm
+++ b/gnuradio-core/src/lib/swig/gnuradio/runtime-shim.scm
@@ -17,6 +17,11 @@
;;; along with this program. If not, see <http://www.gnu.org/licenses/>.
;;;
+(define-module (gnuradio runtime-shim)
+ #:use-module (oop goops)
+ #:use-module (gnuradio gnuradio_core_runtime)
+ #:duplicates (merge-generics replace check))
+
(define-class <gr-endpoint> (<object>)
(block #:accessor block #:init-keyword #:block)
(port #:init-value 0 #:accessor port #:init-keyword #:port))