diff options
| -rw-r--r-- | config/grc_gr_digital.m4 | 2 | ||||
| -rw-r--r-- | gr-digital/Makefile.am | 2 | ||||
| -rw-r--r-- | gr-digital/include/Makefile.am | 4 | ||||
| -rw-r--r-- | gr-digital/include/digital_cpmmod_bc.h (renamed from gr-digital/hier/digital_cpmmod_bc.h) | 0 | ||||
| -rw-r--r-- | gr-digital/include/digital_gmskmod_bc.h (renamed from gr-digital/hier/digital_gmskmod_bc.h) | 0 | ||||
| -rw-r--r-- | gr-digital/lib/Makefile.am | 7 | ||||
| -rw-r--r-- | gr-digital/lib/digital_cpmmod_bc.cc (renamed from gr-digital/hier/digital_cpmmod_bc.cc) | 0 | ||||
| -rw-r--r-- | gr-digital/lib/digital_gmskmod_bc.cc (renamed from gr-digital/hier/digital_gmskmod_bc.cc) | 0 | ||||
| -rw-r--r-- | gr-digital/swig/Makefile.am | 8 | ||||
| -rw-r--r-- | gr-digital/swig/Makefile.swig.gen | 147 | ||||
| -rw-r--r-- | gr-digital/swig/_digital_hier.i (renamed from gr-digital/hier/_digital_hier.i) | 0 | ||||
| -rw-r--r-- | gr-digital/swig/digital_cpmmod_bc.i (renamed from gr-digital/hier/digital_cpmmod_bc.i) | 0 | ||||
| -rw-r--r-- | gr-digital/swig/digital_gmskmod_bc.i (renamed from gr-digital/hier/digital_gmskmod_bc.i) | 0 | ||||
| -rw-r--r-- | gr-digital/swig/digital_hier.i | 40 | ||||
| -rw-r--r-- | gr-digital/swig/digital_swig.i | 5 |
15 files changed, 15 insertions, 200 deletions
diff --git a/config/grc_gr_digital.m4 b/config/grc_gr_digital.m4 index 22ecd41b3..35fafa0dd 100644 --- a/config/grc_gr_digital.m4 +++ b/config/grc_gr_digital.m4 @@ -27,7 +27,6 @@ AC_DEFUN([GRC_GR_DIGITAL],[ dnl how and where to find INCLUDES and LA and such gr_digital_INCLUDES="\ -I\${abs_top_srcdir}/gr-digital/include \ --I\${abs_top_srcdir}/gr-digital/hier \ -I\${abs_top_srcdir}/gr-digital/swig" gr_digital_LA="\${abs_top_builddir}/gr-digital/lib/libgnuradio-core.la" gr_digital_LIBDIRPATH="\${abs_top_builddir}/gr-digital/lib:\${abs_top_builddir}/gr-digital/lib/.libs" @@ -46,7 +45,6 @@ AC_DEFUN([GRC_GR_DIGITAL],[ gr-digital/grc/Makefile \ gr-digital/include/Makefile \ gr-digital/lib/Makefile \ - gr-digital/hier/Makefile \ gr-digital/python/Makefile \ gr-digital/python/run_tests \ gr-digital/python/utils/Makefile \ diff --git a/gr-digital/Makefile.am b/gr-digital/Makefile.am index 6a82d636e..b70d00d05 100644 --- a/gr-digital/Makefile.am +++ b/gr-digital/Makefile.am @@ -21,7 +21,7 @@ include $(top_srcdir)/Makefile.common -SUBDIRS = include hier lib +SUBDIRS = include lib if PYTHON SUBDIRS += swig python apps grc examples diff --git a/gr-digital/include/Makefile.am b/gr-digital/include/Makefile.am index 82ffc6b89..ffbc0f793 100644 --- a/gr-digital/include/Makefile.am +++ b/gr-digital/include/Makefile.am @@ -37,6 +37,8 @@ grinclude_HEADERS = \ digital_lms_dd_equalizer_cc.h \ digital_kurtotic_equalizer_cc.h \ digital_metric_type.h \ - digital_mpsk_receiver_cc.h + digital_mpsk_receiver_cc.h \ + digital_gmskmod_bc.h \ + digital_cpmmod_bc.h libgnuradio_digital_la_LDFLAGS = $(NO_UNDEFINED) $(LTVERSIONFLAGS) diff --git a/gr-digital/hier/digital_cpmmod_bc.h b/gr-digital/include/digital_cpmmod_bc.h index 6212fc777..6212fc777 100644 --- a/gr-digital/hier/digital_cpmmod_bc.h +++ b/gr-digital/include/digital_cpmmod_bc.h diff --git a/gr-digital/hier/digital_gmskmod_bc.h b/gr-digital/include/digital_gmskmod_bc.h index 92b53cd4b..92b53cd4b 100644 --- a/gr-digital/hier/digital_gmskmod_bc.h +++ b/gr-digital/include/digital_gmskmod_bc.h diff --git a/gr-digital/lib/Makefile.am b/gr-digital/lib/Makefile.am index dc86bbd5b..17baf2101 100644 --- a/gr-digital/lib/Makefile.am +++ b/gr-digital/lib/Makefile.am @@ -40,10 +40,11 @@ libgnuradio_digital_la_SOURCES = \ digital_fll_band_edge_cc.cc \ digital_lms_dd_equalizer_cc.cc \ digital_kurtotic_equalizer_cc.cc \ - digital_mpsk_receiver_cc.cc + digital_mpsk_receiver_cc.cc \ + digital_gmskmod_bc.cc \ + digital_cpmmod_bc.cc libgnuradio_digital_la_LIBADD = \ - $(GNURADIO_CORE_LA) \ - $(abs_top_builddir)/gr-digital/hier/libdigital_hier.la + $(GNURADIO_CORE_LA) libgnuradio_digital_la_LDFLAGS = $(NO_UNDEFINED) $(LTVERSIONFLAGS) diff --git a/gr-digital/hier/digital_cpmmod_bc.cc b/gr-digital/lib/digital_cpmmod_bc.cc index a95b604d1..a95b604d1 100644 --- a/gr-digital/hier/digital_cpmmod_bc.cc +++ b/gr-digital/lib/digital_cpmmod_bc.cc diff --git a/gr-digital/hier/digital_gmskmod_bc.cc b/gr-digital/lib/digital_gmskmod_bc.cc index e53e90037..e53e90037 100644 --- a/gr-digital/hier/digital_gmskmod_bc.cc +++ b/gr-digital/lib/digital_gmskmod_bc.cc diff --git a/gr-digital/swig/Makefile.am b/gr-digital/swig/Makefile.am index 6604665b0..abc24be19 100644 --- a/gr-digital/swig/Makefile.am +++ b/gr-digital/swig/Makefile.am @@ -42,7 +42,6 @@ noinst_GUILE = digital.test ############################## # SWIG interface and library TOP_SWIG_IFILES = \ - digital_hier.i \ digital_swig.i # Install so that they end up available as: @@ -71,10 +70,9 @@ digital_swig_swiginclude_headers = \ digital_fll_band_edge_cc.i \ digital_lms_dd_equalizer_cc.i \ digital_kurtotic_equalizer_cc.i \ - digital_mpsk_receiver_cc.i - -digital_hier_swig_args = \ - $(GR_DIGITAL_INCLUDES) + digital_mpsk_receiver_cc.i \ + digital_gmskmod_bc.i \ + digital_cpmmod_bc.i digital_swig_swig_args = \ $(GR_DIGITAL_INCLUDES) diff --git a/gr-digital/swig/Makefile.swig.gen b/gr-digital/swig/Makefile.swig.gen index 95d6aea89..ff3eff4e9 100644 --- a/gr-digital/swig/Makefile.swig.gen +++ b/gr-digital/swig/Makefile.swig.gen @@ -140,150 +140,3 @@ gnuradio/digital_swig-primitive.scm: gnuradio/digital_swig.scm -include guile/digital_swig.d endif # end of GUILE - - -# -*- Makefile -*- -# -# Copyright 2009,2011 Free Software Foundation, Inc. -# -# This file is part of GNU Radio -# -# GNU Radio is free software; you can redistribute it and/or modify -# it under the terms of the GNU General Public License as published by -# the Free Software Foundation; either version 3, or (at your option) -# any later version. -# -# GNU Radio is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. -# -# You should have received a copy of the GNU General Public License -# along with GNU Radio; see the file COPYING. If not, write to -# the Free Software Foundation, Inc., 51 Franklin Street, -# Boston, MA 02110-1301, USA. -# - -# Makefile.swig.gen for digital_hier.i - -## Default install locations for these files: -## -## Default location for the Python directory is: -## ${prefix}/lib/python${python_version}/site-packages/[category]/digital_hier -## Default location for the Python exec directory is: -## ${exec_prefix}/lib/python${python_version}/site-packages/[category]/digital_hier -## -## The following can be overloaded to change the install location, but -## this has to be done in the including Makefile.am -before- -## Makefile.swig is included. - -digital_hier_pythondir_category ?= gnuradio/digital_hier -digital_hier_pylibdir_category ?= $(digital_hier_pythondir_category) -digital_hier_pythondir = $(pythondir)/$(digital_hier_pythondir_category) -digital_hier_pylibdir = $(pyexecdir)/$(digital_hier_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. -digital_hier_scmlibdir = $(libdir) - -# The scm files for the guile modules get installed where ever guile -# is installed, usually /usr/share/guile/site/digital_hier -# FIXME: determince whether these should be installed with gnuradio. -digital_hier_scmdir = $(guiledir) - -## SWIG headers are always installed into the same directory. - -digital_hier_swigincludedir = $(swigincludedir) - -## This is a template file for a "generated" Makefile addition (in -## this case, "Makefile.swig.gen"). By including the top-level -## Makefile.swig, this file will be used to generate the SWIG -## dependencies. Assign the variable TOP_SWIG_FILES to be the list of -## SWIG .i files to generated wrappings for; there can be more than 1 -## so long as the names are unique (no sorting is done on the -## TOP_SWIG_FILES list). This file explicitly assumes that a SWIG .i -## file will generate .cc, .py, and possibly .h files -- meaning that -## all of these files will have the same base name (that provided for -## the SWIG .i file). -## -## This code is setup to ensure parallel MAKE ("-j" or "-jN") does the -## right thing. For more info, see < -## http://sources.redhat.com/automake/automake.html#Multiple-Outputs > - -## Other cleaned files: dependency files generated by SWIG or this Makefile - -MOSTLYCLEANFILES += $(DEPDIR)/*.S* - -## Various SWIG variables. These can be overloaded in the including -## Makefile.am by setting the variable value there, then including -## Makefile.swig . - -digital_hier_swiginclude_HEADERS = \ - digital_hier.i \ - $(digital_hier_swiginclude_headers) - -if PYTHON -digital_hier_pylib_LTLIBRARIES = \ - _digital_hier.la - -_digital_hier_la_SOURCES = \ - python/digital_hier.cc \ - $(digital_hier_la_swig_sources) - -digital_hier_python_PYTHON = \ - digital_hier.py \ - $(digital_hier_python) - -_digital_hier_la_LIBADD = \ - $(STD_SWIG_LA_LIB_ADD) \ - $(digital_hier_la_swig_libadd) - -_digital_hier_la_LDFLAGS = \ - $(STD_SWIG_LA_LD_FLAGS) \ - $(digital_hier_la_swig_ldflags) - -_digital_hier_la_CXXFLAGS = \ - $(STD_SWIG_CXX_FLAGS) \ - -I$(top_builddir) \ - $(digital_hier_la_swig_cxxflags) - -python/digital_hier.cc: digital_hier.py -digital_hier.py: digital_hier.i - -# Include the python dependencies for this file --include python/digital_hier.d - -endif # end of if python - -if GUILE - -digital_hier_scmlib_LTLIBRARIES = \ - libguile-gnuradio-digital_hier.la -libguile_gnuradio_digital_hier_la_SOURCES = \ - guile/digital_hier.cc \ - $(digital_hier_la_swig_sources) -nobase_digital_hier_scm_DATA = \ - gnuradio/digital_hier.scm \ - gnuradio/digital_hier-primitive.scm -libguile_gnuradio_digital_hier_la_LIBADD = \ - $(STD_SWIG_LA_LIB_ADD) \ - $(digital_hier_la_swig_libadd) -libguile_gnuradio_digital_hier_la_LDFLAGS = \ - $(STD_SWIG_LA_LD_FLAGS) \ - $(digital_hier_la_swig_ldflags) -libguile_gnuradio_digital_hier_la_CXXFLAGS = \ - $(STD_SWIG_CXX_FLAGS) \ - -I$(top_builddir) \ - $(digital_hier_la_swig_cxxflags) - -guile/digital_hier.cc: gnuradio/digital_hier.scm -gnuradio/digital_hier.scm: digital_hier.i -gnuradio/digital_hier-primitive.scm: gnuradio/digital_hier.scm - -# Include the guile dependencies for this file --include guile/digital_hier.d - -endif # end of GUILE - - diff --git a/gr-digital/hier/_digital_hier.i b/gr-digital/swig/_digital_hier.i index 022e38644..022e38644 100644 --- a/gr-digital/hier/_digital_hier.i +++ b/gr-digital/swig/_digital_hier.i diff --git a/gr-digital/hier/digital_cpmmod_bc.i b/gr-digital/swig/digital_cpmmod_bc.i index fa7c50da7..fa7c50da7 100644 --- a/gr-digital/hier/digital_cpmmod_bc.i +++ b/gr-digital/swig/digital_cpmmod_bc.i diff --git a/gr-digital/hier/digital_gmskmod_bc.i b/gr-digital/swig/digital_gmskmod_bc.i index ad7b82237..ad7b82237 100644 --- a/gr-digital/hier/digital_gmskmod_bc.i +++ b/gr-digital/swig/digital_gmskmod_bc.i diff --git a/gr-digital/swig/digital_hier.i b/gr-digital/swig/digital_hier.i deleted file mode 100644 index e004461d2..000000000 --- a/gr-digital/swig/digital_hier.i +++ /dev/null @@ -1,40 +0,0 @@ -/* -*- c++ -*- */ -/* - * Copyright 2009,2010 Free Software Foundation, Inc. - * - * This file is part of GNU Radio - * - * GNU Radio is free software; you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; either version 3, or (at your option) - * any later version. - * - * GNU Radio is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License along - * with this program; if not, write to the Free Software Foundation, Inc., - * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. - */ - -#ifndef SWIGIMPORTED -%module(directors="1") digital_hier -#endif - - //%feature("autodoc", "1"); // generate python docstrings - -%include "gnuradio.i" // the common stuff - -%include "_digital_hier.i" - -#if SWIGGUILE -%scheme %{ -(load-extension-global "libguile-gnuradio-digital_hier" "scm_init_gnuradio_digital_hier_module") -%} - -%goops %{ - (use-modules (gnuradio gnuradio_core_runtime)) -%} -#endif diff --git a/gr-digital/swig/digital_swig.i b/gr-digital/swig/digital_swig.i index ca50f9c50..2e3a3242e 100644 --- a/gr-digital/swig/digital_swig.i +++ b/gr-digital/swig/digital_swig.i @@ -38,9 +38,10 @@ #include "digital_kurtotic_equalizer_cc.h" #include "digital_lms_dd_equalizer_cc.h" #include "digital_mpsk_receiver_cc.h" +#include "digital_cpmmod_bc.h" +#include "digital_gmskmod_bc.h" %} -%include "digital_hier.i" %include "digital_binary_slicer_fb.i" %include "digital_clock_recovery_mm_cc.i" %include "digital_clock_recovery_mm_ff.i" @@ -55,6 +56,8 @@ %include "digital_kurtotic_equalizer_cc.i" %include "digital_lms_dd_equalizer_cc.i" %include "digital_mpsk_receiver_cc.i" +%include "digital_cpmmod_bc.i" +%include "digital_gmskmod_bc.i" #if SWIGGUILE %scheme %{ |