diff options
Diffstat (limited to 'gr-fcd')
27 files changed, 23 insertions, 662 deletions
diff --git a/gr-fcd/.gitignore b/gr-fcd/.gitignore deleted file mode 100644 index 862bbab8b..000000000 --- a/gr-fcd/.gitignore +++ /dev/null @@ -1,20 +0,0 @@ -Makefile -Makefile.in -aclocal.m4 -autom4te.cache/ -config.h.in -configure -depcomp -install-sh -ltmain.sh -missing -py-compile -config.h -config.log -config.status -libtool -setup_guile_test_env -stamp-h1 -gnuradio-fcd.pc -config.h.in~ - diff --git a/gr-fcd/CMakeLists.txt b/gr-fcd/CMakeLists.txt index e454c01fa..10dd8b8cd 100644 --- a/gr-fcd/CMakeLists.txt +++ b/gr-fcd/CMakeLists.txt @@ -51,6 +51,8 @@ GR_SET_GLOBAL(GR_FCD_INCLUDE_DIRS ${CMAKE_CURRENT_SOURCE_DIR}/include/fcd ) +SET(GR_PKG_FCD_EXAMPLES_DIR ${GR_PKG_DATA_DIR}/examples/fcd) + ######################################################################## # Begin conditional configuration ######################################################################## @@ -83,6 +85,13 @@ CPACK_COMPONENT("fcd_python" DEPENDS "core_python;fcd_runtime" ) +CPACK_COMPONENT("fcd_examples" + GROUP "FCD" + DISPLAY_NAME "Examples" + DESCRIPTION "Example programs" + DEPENDS "fcd_runtime" +) + CPACK_COMPONENT("fcd_swig" GROUP "FCD" DISPLAY_NAME "SWIG" @@ -99,8 +108,9 @@ if(ENABLE_PYTHON) add_subdirectory(swig) add_subdirectory(python) add_subdirectory(grc) + add_subdirectory(examples/grc) endif(ENABLE_PYTHON) -add_subdirectory(examples) +add_subdirectory(examples/c++) add_subdirectory(doc) ######################################################################## diff --git a/gr-fcd/Makefile.am b/gr-fcd/Makefile.am deleted file mode 100644 index 85d5f9a9b..000000000 --- a/gr-fcd/Makefile.am +++ /dev/null @@ -1,32 +0,0 @@ -# -# Copyright 2012 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. -# - -ACLOCAL_AMFLAGS = -I config - -include $(top_srcdir)/Makefile.common - -EXTRA_DIST = \ - AUTHORS - -SUBDIRS = lib include swig python grc examples doc - -pkgconfigdir = $(libdir)/pkgconfig -pkgconfig_DATA = gnuradio-fcd.pc diff --git a/gr-fcd/doc/.gitignore b/gr-fcd/doc/.gitignore deleted file mode 100644 index b336cc7ce..000000000 --- a/gr-fcd/doc/.gitignore +++ /dev/null @@ -1,2 +0,0 @@ -/Makefile -/Makefile.in diff --git a/gr-fcd/doc/Makefile.am b/gr-fcd/doc/Makefile.am deleted file mode 100644 index f3cf30ac3..000000000 --- a/gr-fcd/doc/Makefile.am +++ /dev/null @@ -1,29 +0,0 @@ -# -# Copyright 2012 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 - -SUBDIRS = - -dist_gr_doc_DATA = \ - README.fcd - -EXTRA_DIST = fcd.dox
\ No newline at end of file diff --git a/gr-fcd/examples/.gitignore b/gr-fcd/examples/.gitignore deleted file mode 100644 index 52ffc3037..000000000 --- a/gr-fcd/examples/.gitignore +++ /dev/null @@ -1,6 +0,0 @@ -/Makefile -/Makefile.in -/.deps/* -/.libs/* -/fcd_nfm_rx -/fcd_nfm_rx.o diff --git a/gr-fcd/examples/Makefile.am b/gr-fcd/examples/Makefile.am deleted file mode 100644 index a57d7a808..000000000 --- a/gr-fcd/examples/Makefile.am +++ /dev/null @@ -1,49 +0,0 @@ -# -# Copyright 2011,2012 Free Software Foundation, Inc. -# -# 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 = \ - -I$(top_srcdir)/gr-fcd/include/fcd \ - -I$(top_srcdir)/gr-audio/include \ - $(STD_DEFINES_AND_INCLUDES) \ - $(WITH_INCLUDES) - -GR_FCD_LA=$(top_builddir)/gr-fcd/lib/libgnuradio-fcd.la -GNURADIO_AUDIO_LA=$(top_builddir)/gr-audio/lib/libgnuradio-audio.la - -ourdatadir = $(exampledir)/fcd - -ourdata_PROGRAMS = \ - fcd_nfm_rx - -fcd_nfm_rx_SOURCES = \ - fcd_nfm_rx.cc - -fcd_nfm_rx_LDADD = \ - $(GR_FCD_LA) \ - $(GNURADIO_CORE_LA) \ - $(GNURADIO_AUDIO_LA) \ - $(BOOST_PROGRAM_OPTIONS_LIB) - -dist_ourdata_SCRIPTS = \ - fcd_fft_wx.grc \ - fcd_apt_rx.grc \ - fcd_nfm_rx.grc - diff --git a/gr-fcd/examples/CMakeLists.txt b/gr-fcd/examples/c++/CMakeLists.txt index 477a6311b..05574f4a8 100644 --- a/gr-fcd/examples/CMakeLists.txt +++ b/gr-fcd/examples/c++/CMakeLists.txt @@ -26,16 +26,6 @@ target_link_libraries(fcd_nfm_rx gnuradio-fcd) INSTALL(TARGETS fcd_nfm_rx - DESTINATION ${GR_PKG_DATA_DIR}/examples/fcd + DESTINATION ${GR_PKG_FCD_EXAMPLES_DIR} COMPONENT "fcd_examples" ) - -if(ENABLE_PYTHON) - INSTALL(FILES - fcd_apt_rx.grc - fcd_fft_wx.grc - fcd_nfm_rx.grc - DESTINATION ${GR_PKG_DATA_DIR}/examples/fcd - COMPONENT "fcd_examples" - ) -endif() diff --git a/gr-fcd/examples/fcd_nfm_rx.cc b/gr-fcd/examples/c++/fcd_nfm_rx.cc index 97ef7cf19..97ef7cf19 100644 --- a/gr-fcd/examples/fcd_nfm_rx.cc +++ b/gr-fcd/examples/c++/fcd_nfm_rx.cc diff --git a/gr-fcd/include/Makefile.am b/gr-fcd/examples/grc/CMakeLists.txt index 77dbaf5e4..e33fdf182 100644 --- a/gr-fcd/include/Makefile.am +++ b/gr-fcd/examples/grc/CMakeLists.txt @@ -1,24 +1,26 @@ -# # Copyright 2012 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 -SUBDIRS = fcd +INSTALL(FILES + fcd_apt_rx.grc + fcd_fft_wx.grc + fcd_nfm_rx.grc + DESTINATION ${GR_PKG_FCD_EXAMPLES_DIR} + COMPONENT "fcd_examples" +)
\ No newline at end of file diff --git a/gr-fcd/examples/fcd_apt_rx.grc b/gr-fcd/examples/grc/fcd_apt_rx.grc index c4d3e64d1..c4d3e64d1 100644 --- a/gr-fcd/examples/fcd_apt_rx.grc +++ b/gr-fcd/examples/grc/fcd_apt_rx.grc diff --git a/gr-fcd/examples/fcd_fft_wx.grc b/gr-fcd/examples/grc/fcd_fft_wx.grc index c045bbfa2..c045bbfa2 100644 --- a/gr-fcd/examples/fcd_fft_wx.grc +++ b/gr-fcd/examples/grc/fcd_fft_wx.grc diff --git a/gr-fcd/examples/fcd_nfm_rx.grc b/gr-fcd/examples/grc/fcd_nfm_rx.grc index 9dac3fcb8..9dac3fcb8 100644 --- a/gr-fcd/examples/fcd_nfm_rx.grc +++ b/gr-fcd/examples/grc/fcd_nfm_rx.grc diff --git a/gr-fcd/grc/.gitignore b/gr-fcd/grc/.gitignore deleted file mode 100644 index b336cc7ce..000000000 --- a/gr-fcd/grc/.gitignore +++ /dev/null @@ -1,2 +0,0 @@ -/Makefile -/Makefile.in diff --git a/gr-fcd/grc/Makefile.am b/gr-fcd/grc/Makefile.am deleted file mode 100644 index 203ebdc16..000000000 --- a/gr-fcd/grc/Makefile.am +++ /dev/null @@ -1,28 +0,0 @@ -# -# Copyright 2012 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 - -grcblocksdir = $(grc_blocksdir) - -dist_grcblocks_DATA = \ - fcd_source_c.xml - diff --git a/gr-fcd/include/fcd/Makefile.am b/gr-fcd/include/fcd/Makefile.am deleted file mode 100644 index 282fd93f7..000000000 --- a/gr-fcd/include/fcd/Makefile.am +++ /dev/null @@ -1,26 +0,0 @@ -# -# Copyright 2012 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 - -grinclude_HEADERS = \ - fcd_api.h \ - fcd_source_c.h diff --git a/gr-fcd/lib/.gitignore b/gr-fcd/lib/.gitignore deleted file mode 100644 index cfb223502..000000000 --- a/gr-fcd/lib/.gitignore +++ /dev/null @@ -1,10 +0,0 @@ -/Makefile -/Makefile.in -/.la -/.lo -/.deps -/.libs -/*.la -/*.lo -/*.pyc -*.o diff --git a/gr-fcd/lib/Makefile.am b/gr-fcd/lib/Makefile.am deleted file mode 100644 index a288740b4..000000000 --- a/gr-fcd/lib/Makefile.am +++ /dev/null @@ -1,46 +0,0 @@ -# -# Copyright 2012 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 - -SUBDIRS = hid fcd - -AM_CPPFLAGS = \ - $(STD_DEFINES_AND_INCLUDES) \ - $(WITH_INCLUDES) \ - -I$(top_srcdir)/gr-audio/include \ - -I$(top_srcdir)/gr-fcd/include/fcd \ - -I$(top_srcdir)/gr-fcd/lib/fcd - -lib_LTLIBRARIES = libgnuradio-fcd.la - -libgnuradio_fcd_la_SOURCES = fcd_source_c_impl.cc - -noinst_HEADERS = fcd_source_c_impl.h - -libgnuradio_fcd_la_LIBADD = \ - $(GNURADIO_CORE_LA) \ - $(top_builddir)/gr-fcd/lib/fcd/libfcd.la \ - $(top_builddir)/gr-audio/lib/libgnuradio-audio.la - - -libgnuradio_fcd_la_LDFLAGS = $(NO_UNDEFINED) $(LTVERSIONFLAGS) - diff --git a/gr-fcd/lib/fcd/Makefile.am b/gr-fcd/lib/fcd/Makefile.am deleted file mode 100644 index f328a7cac..000000000 --- a/gr-fcd/lib/fcd/Makefile.am +++ /dev/null @@ -1,41 +0,0 @@ -# -# Copyright 2012 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) \ - $(USB_CPPFLAGS) \ - -I$(top_srcdir)/gr-fcd/include/fcd \ - -I$(top_srcdir)/gr-fcd/lib/hid - -noinst_LTLIBRARIES = libfcd.la - -libfcd_la_SOURCES = fcd.c - -noinst_HEADERS = \ - fcd.h \ - fcdhidcmd.h - -libfcd_la_LIBADD = \ - $(top_builddir)/gr-fcd/lib/hid/libhid.la - diff --git a/gr-fcd/lib/hid/Makefile.am b/gr-fcd/lib/hid/Makefile.am deleted file mode 100644 index 2ad4796fe..000000000 --- a/gr-fcd/lib/hid/Makefile.am +++ /dev/null @@ -1,44 +0,0 @@ -# -# Copyright 2012 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) \ - $(USB_CPPFLAGS) - -noinst_LTLIBRARIES = libhid.la - -libhid_la_SOURCES = - -if FCD_MACOSX - libhid_la_SOURCES += hidmac.c -else if FCD_WINDOWS - libhid_la_SOURCES += hidwin.c -else - libhid_la_SOURCES += hid-libusb.c -endif - -noinst_HEADERS = hidapi.h - -libhid_la_LIBADD = $(USB_LIBS) - diff --git a/gr-fcd/python/.gitignore b/gr-fcd/python/.gitignore deleted file mode 100644 index bf03975bb..000000000 --- a/gr-fcd/python/.gitignore +++ /dev/null @@ -1,9 +0,0 @@ -/Makefile -/Makefile.in -/.deps -/.libs -/*.la -/*.lo -/*.pyc -/*.pyo -/run_tests diff --git a/gr-fcd/python/Makefile.am b/gr-fcd/python/Makefile.am deleted file mode 100644 index a99bc1933..000000000 --- a/gr-fcd/python/Makefile.am +++ /dev/null @@ -1,34 +0,0 @@ -# -# Copyright 2012 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 - -fcddir = $(grpythondir)/fcd - -TESTS = run_tests - -noinst_PYTHON = \ - qa_fcd.py - -fcd_PYTHON = \ - __init__.py - -EXTRA_DIST += run_tests.in diff --git a/gr-fcd/swig/.gitignore b/gr-fcd/swig/.gitignore deleted file mode 100644 index 7dcd448b7..000000000 --- a/gr-fcd/swig/.gitignore +++ /dev/null @@ -1,13 +0,0 @@ -/.deps -/.libs -/Makefile.in -/Makefile -/fcd_swig.cc -/fcd_swig.py -/gnuradio -/guile -/python -/run_guile_tests -*.la -*.lo -*.o diff --git a/gr-fcd/swig/Makefile.am b/gr-fcd/swig/Makefile.am deleted file mode 100644 index 225f32ae0..000000000 --- a/gr-fcd/swig/Makefile.am +++ /dev/null @@ -1,81 +0,0 @@ -# -# Copyright 2012 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 -include $(top_srcdir)/Makefile.swig - -TESTS = -EXTRA_DIST += $(nobase_guile_DATA) - -noinst_GUILE = fcd.test - -if GUILE -nobase_guile_DATA = gnuradio/fcd_swig.scm -endif - - -AM_CPPFLAGS = \ - -I$(top_srcdir)/gr-fcd/include/fcd \ - -I$(top_srcdir)/gr-audio/include \ - $(STD_DEFINES_AND_INCLUDES) \ - $(PYTHON_CPPFLAGS) \ - $(WITH_INCLUDES) - -# ---------------------------------------------------------------- -# The SWIG library -# TESTS = run_tests - -fcd_swig_swig_args = $(FCD_CPPFLAGS) - -TOP_SWIG_DOC_IFILES = \ - fcd_swig_doc.i - -TOP_SWIG_IFILES = \ - $(TOP_SWIG_DOC_IFILES) \ - fcd_swig.i - -BUILT_SOURCES += \ - $(TOP_SWIG_DOC_IFILES) - -EXTRA_DIST += \ - $(TOP_SWIG_DOC_IFILES) - -$(TOP_SWIG_DOC_IFILES): - `echo "" > $@` - -# Install so that they end up available as: -# import gnuradio.fcd -# This ends up at: -# ${prefix}/lib/python${python_version}/site-packages/gnuradio/fcd -fcd_swig_pythondir_category = \ - gnuradio/fcd - -# additional libraries for linking with the SWIG-generated library -fcd_swig_la_swig_libadd = \ - $(top_builddir)/gr-fcd/lib/libgnuradio-fcd.la - -# additional SWIG files to be installed -fcd_swig_swiginclude_headers = \ - $(TOP_SWIG_DOC_IFILES) - -if GUILE -TESTS += run_guile_tests -endif diff --git a/gr-fcd/swig/Makefile.swig.gen b/gr-fcd/swig/Makefile.swig.gen deleted file mode 100644 index 849e1ea52..000000000 --- a/gr-fcd/swig/Makefile.swig.gen +++ /dev/null @@ -1,145 +0,0 @@ -# -*- Makefile -*- -# -# Copyright 2009 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 fcd_swig.i - -## Default install locations for these files: -## -## Default location for the Python directory is: -## ${prefix}/lib/python${python_version}/site-packages/[category]/fcd_swig -## Default location for the Python exec directory is: -## ${exec_prefix}/lib/python${python_version}/site-packages/[category]/fcd_swig -## -## 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. - -fcd_swig_pythondir_category ?= gnuradio/fcd_swig -fcd_swig_pylibdir_category ?= $(fcd_swig_pythondir_category) -fcd_swig_pythondir = $(pythondir)/$(fcd_swig_pythondir_category) -fcd_swig_pylibdir = $(pyexecdir)/$(fcd_swig_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. -fcd_swig_scmlibdir = $(libdir) - -# The scm files for the guile modules get installed where ever guile -# is installed, usually /usr/share/guile/site/fcd_swig -# FIXME: determince whether these should be installed with gnuradio. -fcd_swig_scmdir = $(guiledir) - -## SWIG headers are always installed into the same directory. - -fcd_swig_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 . - -fcd_swig_swiginclude_HEADERS = \ - fcd_swig.i \ - $(fcd_swig_swiginclude_headers) - -if PYTHON -fcd_swig_pylib_LTLIBRARIES = \ - _fcd_swig.la - -_fcd_swig_la_SOURCES = \ - python/fcd_swig.cc \ - $(fcd_swig_la_swig_sources) - -fcd_swig_python_PYTHON = \ - fcd_swig.py \ - $(fcd_swig_python) - -_fcd_swig_la_LIBADD = \ - $(STD_SWIG_LA_LIB_ADD) \ - $(fcd_swig_la_swig_libadd) - -_fcd_swig_la_LDFLAGS = \ - $(STD_SWIG_LA_LD_FLAGS) \ - $(fcd_swig_la_swig_ldflags) - -_fcd_swig_la_CXXFLAGS = \ - $(STD_SWIG_CXX_FLAGS) \ - -I$(top_builddir) \ - $(fcd_swig_la_swig_cxxflags) - -python/fcd_swig.cc: fcd_swig.py -fcd_swig.py: fcd_swig.i - -# Include the python dependencies for this file --include python/fcd_swig.d - -endif # end of if python - -if GUILE - -fcd_swig_scmlib_LTLIBRARIES = \ - libguile-gnuradio-fcd_swig.la -libguile_gnuradio_fcd_swig_la_SOURCES = \ - guile/fcd_swig.cc \ - $(fcd_swig_la_swig_sources) -nobase_fcd_swig_scm_DATA = \ - gnuradio/fcd_swig.scm \ - gnuradio/fcd_swig-primitive.scm -libguile_gnuradio_fcd_swig_la_LIBADD = \ - $(STD_SWIG_LA_LIB_ADD) \ - $(fcd_swig_la_swig_libadd) -libguile_gnuradio_fcd_swig_la_LDFLAGS = \ - $(STD_SWIG_LA_LD_FLAGS) \ - $(fcd_swig_la_swig_ldflags) -libguile_gnuradio_fcd_swig_la_CXXFLAGS = \ - $(STD_SWIG_CXX_FLAGS) \ - -I$(top_builddir) \ - $(fcd_swig_la_swig_cxxflags) - -guile/fcd_swig.cc: gnuradio/fcd_swig.scm -gnuradio/fcd_swig.scm: fcd_swig.i -gnuradio/fcd_swig-primitive.scm: gnuradio/fcd_swig.scm - -# Include the guile dependencies for this file --include guile/fcd_swig.d - -endif # end of GUILE - - diff --git a/gr-fcd/swig/fcd_swig.i b/gr-fcd/swig/fcd_swig.i index 8fcc7d059..d75e57b85 100644 --- a/gr-fcd/swig/fcd_swig.i +++ b/gr-fcd/swig/fcd_swig.i @@ -38,13 +38,3 @@ GR_SWIG_BLOCK_MAGIC(fcd,source_c); fcd_source_c_sptr fcd_make_source_c (const std::string device_name = ""); - -#if SWIGGUILE -%scheme %{ -(load-extension-global "libguile-gnuradio-fcd_swig" "scm_init_gnuradio_fcd_swig_module") -%} - -%goops %{ -(use-modules (gnuradio gnuradio_core_runtime)) -%} -#endif diff --git a/gr-fcd/swig/run_guile_tests.in b/gr-fcd/swig/run_guile_tests.in deleted file mode 100644 index 5d08b0dd5..000000000 --- a/gr-fcd/swig/run_guile_tests.in +++ /dev/null @@ -1,14 +0,0 @@ -#!/bin/sh - -. @top_builddir@/setup_guile_test_env - -# 1st argument is absolute path to hand coded guile source directory -# 2nd argument is absolute path to component C++ shared library build directory -# 3nd argument is absolute path to component SWIG build directory - -add_local_paths \ - @srcdir@ \ - @abs_builddir@ \ - @abs_builddir@ - -@GUILE@ -e main -c '(use-modules (gnuradio test-suite guile-test))' -t @srcdir@ |