diff options
| author | Tom Rondeau <trondeau@vt.edu> | 2011-08-30 22:51:15 -0400 |
|---|---|---|
| committer | Tom Rondeau <trondeau@vt.edu> | 2011-08-30 22:51:15 -0400 |
| commit | da5b87db20a34c84b3d03f87a668632997d58457 (patch) | |
| tree | cd712c3708726ac8694a1cffcff7da7d4daa30d1 | |
| parent | ff8ce00c0457c213dcad0b1b460a5d0db1b7d155 (diff) | |
digital: fixed up build to make libdigital_hier.la; does not swig or get built into full library yet. Passes distcheck.
| -rw-r--r-- | config/grc_gr_digital.m4 | 1 | ||||
| -rw-r--r-- | gnuradio-core/src/lib/hier/Makefile.am | 12 | ||||
| -rw-r--r-- | gr-digital/hier/Makefile.am | 40 | ||||
| -rw-r--r-- | gr-digital/hier/digital_hier.i | 33 |
4 files changed, 76 insertions, 10 deletions
diff --git a/config/grc_gr_digital.m4 b/config/grc_gr_digital.m4 index 83c3f03a47..bde4a30873 100644 --- a/config/grc_gr_digital.m4 +++ b/config/grc_gr_digital.m4 @@ -29,6 +29,7 @@ AC_DEFUN([GRC_GR_DIGITAL],[ gr-digital/apps/Makefile \ gr-digital/grc/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/gnuradio-core/src/lib/hier/Makefile.am b/gnuradio-core/src/lib/hier/Makefile.am index 8d56be7a35..369feef756 100644 --- a/gnuradio-core/src/lib/hier/Makefile.am +++ b/gnuradio-core/src/lib/hier/Makefile.am @@ -27,19 +27,11 @@ AM_CPPFLAGS = $(STD_DEFINES_AND_INCLUDES) $(WITH_INCLUDES) noinst_LTLIBRARIES = libhier.la libhier_la_SOURCES = \ - gr_channel_model.cc \ - gr_gmskmod_bc.cc \ - gr_cpmmod_bc.cc + gr_channel_model.cc grinclude_HEADERS = \ - gr_channel_model.h \ - gr_gmskmod_bc.h \ - gr_cpmmod_bc.h - + gr_channel_model.h swiginclude_HEADERS = \ hier.i \ gr_channel_model.i - gr_channel_model.i \ - gr_gmskmod_bc.i \ - gr_cpmmod_bc.i diff --git a/gr-digital/hier/Makefile.am b/gr-digital/hier/Makefile.am new file mode 100644 index 0000000000..a51689ed6a --- /dev/null +++ b/gr-digital/hier/Makefile.am @@ -0,0 +1,40 @@ +# +# Copyright 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. +# + +include $(top_srcdir)/Makefile.common + +AM_CPPFLAGS = $(STD_DEFINES_AND_INCLUDES) $(WITH_INCLUDES) + +noinst_LTLIBRARIES = libdigital_hier.la + +libdigital_hier_la_SOURCES = \ + gr_gmskmod_bc.cc \ + gr_cpmmod_bc.cc + +grinclude_HEADERS = \ + gr_gmskmod_bc.h \ + gr_cpmmod_bc.h + + +swiginclude_HEADERS = \ + digital_hier.i \ + gr_gmskmod_bc.i \ + gr_cpmmod_bc.i diff --git a/gr-digital/hier/digital_hier.i b/gr-digital/hier/digital_hier.i new file mode 100644 index 0000000000..c24d0f7777 --- /dev/null +++ b/gr-digital/hier/digital_hier.i @@ -0,0 +1,33 @@ +/* -*- c++ -*- */ +/* + * Copyright 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. + */ + +%{ +#ifdef HAVE_CONFIG_H +#include "config.h" +#endif + +#include <gr_cpmmod_bc.h> +#include <gr_gmskmod_bc.h> +%} + +%include "gr_cpmmod_bc.i" +%include "gr_gmskmod_bc.i" |