diff options
| author | jcorgan | 2009-02-02 14:27:28 +0000 |
|---|---|---|
| committer | jcorgan | 2009-02-02 14:27:28 +0000 |
| commit | 8193fd8a044a18471a6091249195d15ae6d814be (patch) | |
| tree | e9b491d81ad03024280209ac677d589c841b8f98 /gr-usrp2/src | |
| parent | 09f236be864aaa3b5216eb42676eafb38d47b587 (diff) | |
| download | gnuradio-8193fd8a044a18471a6091249195d15ae6d814be.tar.gz gnuradio-8193fd8a044a18471a6091249195d15ae6d814be.tar.bz2 gnuradio-8193fd8a044a18471a6091249195d15ae6d814be.zip | |
Merged r10288:10370 from michaelld/swigpythonargs into trunk. Passes distcheck.
git-svn-id: http://gnuradio.org/svn/gnuradio/trunk@10371 221aa14e-8319-0410-a670-987f0aec2ac5
Diffstat (limited to 'gr-usrp2/src')
| -rw-r--r-- | gr-usrp2/src/Makefile.am | 14 | ||||
| -rw-r--r-- | gr-usrp2/src/usrp2.i | 5 |
2 files changed, 7 insertions, 12 deletions
diff --git a/gr-usrp2/src/Makefile.am b/gr-usrp2/src/Makefile.am index a4269f354..90796ceae 100644 --- a/gr-usrp2/src/Makefile.am +++ b/gr-usrp2/src/Makefile.am @@ -1,5 +1,5 @@ # -# Copyright 2004,2005,2006,2008 Free Software Foundation, Inc. +# Copyright 2004,2005,2006,2008,2009 Free Software Foundation, Inc. # # This file is part of GNU Radio # @@ -88,17 +88,13 @@ BUILT_SOURCES = usrp2.cc usrp2.py # Install the SWIG python output ourpython_PYTHON = usrp2.py -# Arguments to the swig wrapper generator -SWIGPYTHONARGS = \ - $(STD_DEFINES_AND_INCLUDES) \ - $(SWIGPYTHONFLAGS) \ - $(USRP2_INCLUDES) \ - $(WITH_INCLUDES) \ - $(WITH_SWIG_INCLUDES) +# Special swig arguments +LOCAL_SWIG_DEFINES_AND_INCLUDES = $(USRP2_INCLUDES) # Invoke SWIG wrapper generator usrp2.cc usrp2.py: $(ALL_IFILES) - $(SWIG) $(SWIGPYTHONARGS) -module usrp2 -o usrp2.cc $(LOCAL_IFILES) + $(SWIG) $(STD_SWIG_PYTHON_ARGS) -module usrp2 \ + -o usrp2.cc $(LOCAL_IFILES) # Create the Python shared library ourlib_LTLIBRARIES = _usrp2.la diff --git a/gr-usrp2/src/usrp2.i b/gr-usrp2/src/usrp2.i index 28944e676..57f359ed7 100644 --- a/gr-usrp2/src/usrp2.i +++ b/gr-usrp2/src/usrp2.i @@ -1,6 +1,6 @@ /* -*- c++ -*- */ /* - * Copyright 2008 Free Software Foundation, Inc. + * Copyright 2008,2009 Free Software Foundation, Inc. * * This file is part of GNU Radio * @@ -22,8 +22,7 @@ %feature("autodoc", "1"); // generate python docstrings -%include "exception.i" -%import "gnuradio.i" // the common stuff +%import(module="gnuradio_swig_py_runtime") "gnuradio.i" // the common stuff %import <stdint.i> %{ |