diff options
| -rw-r--r-- | .gitignore | 1 | ||||
| -rw-r--r-- | gr-uhd/swig/Makefile.am | 9 | ||||
| -rw-r--r-- | gr-uhd/swig/gnuradio/uhd.scm | 26 |
3 files changed, 32 insertions, 4 deletions
diff --git a/.gitignore b/.gitignore index c8f1ebb25..836c6c7b9 100644 --- a/.gitignore +++ b/.gitignore @@ -96,7 +96,6 @@ gr-trellis/src/lib/gnuradio/ gr-trellis/src/lib/guile/ gr-trellis/src/lib/python/ gr-trellis/src/lib/trellis.scm -gr-uhd/swig/gnuradio/ gr-uhd/swig/guile/ gr-uhd/swig/python/ gr-uhd/swig/uhd_swig.scm diff --git a/gr-uhd/swig/Makefile.am b/gr-uhd/swig/Makefile.am index 744dd8efe..abf38b293 100644 --- a/gr-uhd/swig/Makefile.am +++ b/gr-uhd/swig/Makefile.am @@ -20,6 +20,7 @@ # include $(top_srcdir)/Makefile.common +include $(top_srcdir)/Makefile.swig AM_CPPFLAGS = \ $(STD_DEFINES_AND_INCLUDES) \ @@ -28,7 +29,11 @@ AM_CPPFLAGS = \ $(UHD_CFLAGS) \ -I$(top_srcdir)/gr-uhd/lib -if PYTHON +if GUILE +nobase_guile_DATA = \ + gnuradio/uhd.scm +endif + # ---------------------------------------------------------------- # The SWIG library # TESTS = run_tests @@ -54,7 +59,6 @@ uhd_swig_python = \ # additional SWIG files to be installed uhd_swig_swiginclude_headers = -include $(top_srcdir)/Makefile.swig uhd_swig_swig_args = \ $(UHD_CFLAGS) \ @@ -65,4 +69,3 @@ BUILT_SOURCES = $(swig_built_sources) # Do not distribute the output of SWIG no_dist_files = $(swig_built_sources) -endif diff --git a/gr-uhd/swig/gnuradio/uhd.scm b/gr-uhd/swig/gnuradio/uhd.scm new file mode 100644 index 000000000..1999bbb0f --- /dev/null +++ b/gr-uhd/swig/gnuradio/uhd.scm @@ -0,0 +1,26 @@ +;;; +;;; Copyright 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, see <http://www.gnu.org/licenses/>. +;;; + +;;; Semi bogus module that just reexports the uhd_swig module + +(define-module (gnuradio uhd) + #:use-module (gnuradio uhd_swig) + #:duplicates (merge-generics replace check)) + +(re-export-all '(gnuradio uhd_swig)) |