diff options
| -rw-r--r-- | configure.ac | 2 | ||||
| -rw-r--r-- | src/lib/Makefile.am | 30 | ||||
| -rw-r--r-- | src/lib/gsm_receiver.i | 33 |
3 files changed, 16 insertions, 49 deletions
diff --git a/configure.ac b/configure.ac index f7a2f6d..b3b1f16 100644 --- a/configure.ac +++ b/configure.ac @@ -21,7 +21,7 @@ dnl AC_INIT AC_PREREQ(2.61) -AC_CONFIG_SRCDIR([src/lib/gsm_receiver.i]) +AC_CONFIG_SRCDIR([src/lib/gsm.i]) AM_CONFIG_HEADER(config.h) AC_CANONICAL_TARGET([]) AC_CONFIG_AUX_DIR([.]) diff --git a/src/lib/Makefile.am b/src/lib/Makefile.am index fb63599..bec9b80 100644 --- a/src/lib/Makefile.am +++ b/src/lib/Makefile.am @@ -42,45 +42,45 @@ NON_LOCAL_IFILES = \ LOCAL_IFILES = \ - $(top_srcdir)/src/lib/gsm_receiver.i + $(top_srcdir)/src/lib/gsm.i # These files are built by SWIG. The first is the C++ glue. # The second is the python wrapper that loads the _howto shared library # and knows how to call our extensions. BUILT_SOURCES = \ - gsm_receiver.cc \ - gsm_receiver.py + gsm.cc \ + gsm.py # This gets howto.py installed in the right place ourpython_PYTHON = \ - gsm_receiver.py + gsm.py -ourlib_LTLIBRARIES = _gsm_receiver.la +ourlib_LTLIBRARIES = _gsm.la -lib_LTLIBRARIES = libgsm-receiver.la +lib_LTLIBRARIES = libgsmdemod.la # These are the source files that go into the shared library -_gsm_receiver_la_SOURCES = \ - gsm_receiver.cc +_gsm_la_SOURCES = \ + gsm.cc -libgsm_receiver_la_SOURCES = \ +libgsmdemod_la_SOURCES = \ gsm_receiver_cf.cc # magic flags -_gsm_receiver_la_LDFLAGS = $(NO_UNDEFINED) -module -avoid-version +_gsm_la_LDFLAGS = $(NO_UNDEFINED) -module -avoid-version # link the library against some comon swig runtime code and the # c++ standard library -_gsm_receiver_la_LIBADD = \ +_gsm_la_LIBADD = \ $(PYTHON_LDFLAGS) \ - libgsm-receiver.la \ + libgsmdemod.la \ -lstdc++ -#libgsm_receiver_la_LIBADD = +#libgsmdemod_la_LIBADD = -gsm_receiver.cc gsm_receiver.py: $(LOCAL_IFILES) $(ALL_IFILES) - $(SWIG) $(SWIGPYTHONARGS) -module gsm_receiver -o gsm_receiver.cc $(LOCAL_IFILES) +gsm.cc gsm.py: $(LOCAL_IFILES) $(ALL_IFILES) + $(SWIG) $(SWIGPYTHONARGS) -module gsm -o gsm.cc $(LOCAL_IFILES) # These headers get installed in ${prefix}/include/gnuradio grinclude_HEADERS = \ diff --git a/src/lib/gsm_receiver.i b/src/lib/gsm_receiver.i deleted file mode 100644 index d5ca598..0000000 --- a/src/lib/gsm_receiver.i +++ /dev/null @@ -1,33 +0,0 @@ -/* -*- c++ -*- */ - -%feature("autodoc", "1"); // generate python docstrings - -%include "exception.i" -%import "gnuradio.i" // the common stuff - -%{ -#include "gnuradio_swig_bug_workaround.h" // mandatory bug fix -#include "gsm_receiver_cf.h" -#include <stdexcept> -%} - -// ---------------------------------------------------------------- - -/* - * First arg is the package prefix. - * Second arg is the name of the class minus the prefix. - * - * This does some behind-the-scenes magic so we can - * access howto_square_ff from python as howto.square_ff - */ -GR_SWIG_BLOCK_MAGIC(gsm,receiver_cf); - -gsm_receiver_cf_sptr gsm_make_receiver_cf (); - -class gsm_receiver_cf : public gr_block -{ -private: - gsm_receiver_cf (); -}; - -// ---------------------------------------------------------------- |