diff options
| author | jcorgan <jcorgan@221aa14e-8319-0410-a670-987f0aec2ac5> | 2009-02-02 14:27:28 +0000 |
|---|---|---|
| committer | jcorgan <jcorgan@221aa14e-8319-0410-a670-987f0aec2ac5> | 2009-02-02 14:27:28 +0000 |
| commit | 8193fd8a044a18471a6091249195d15ae6d814be (patch) | |
| tree | e9b491d81ad03024280209ac677d589c841b8f98 /gr-usrp | |
| parent | 09f236be864aaa3b5216eb42676eafb38d47b587 (diff) | |
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-usrp')
| -rw-r--r-- | gr-usrp/src/Makefile.am | 13 | ||||
| -rw-r--r-- | gr-usrp/src/usrp.i | 6 |
2 files changed, 7 insertions, 12 deletions
diff --git a/gr-usrp/src/Makefile.am b/gr-usrp/src/Makefile.am index 122f977be6..7b897ea082 100644 --- a/gr-usrp/src/Makefile.am +++ b/gr-usrp/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 # @@ -107,15 +107,12 @@ _usrp_swig_la_LDFLAGS = $(NO_UNDEFINED) -module -avoid-version _usrp_swig_la_CXXFLAGS = @swig_CXXFLAGS@ -SWIGPYTHONARGS = \ - $(SWIGPYTHONFLAGS) \ - $(STD_DEFINES_AND_INCLUDES) \ - $(USRP_INCLUDES) \ - $(WITH_INCLUDES) \ - $(WITH_SWIG_INCLUDES) +# Special swig arguments +LOCAL_SWIG_DEFINES_AND_INCLUDES = $(USRP_INCLUDES) usrp_swig.cc usrp_swig.py: $(ALL_IFILES) - $(SWIG) $(SWIGPYTHONARGS) -module usrp_swig -o usrp_swig.cc $(srcdir)/usrp.i + $(SWIG) $(STD_SWIG_PYTHON_ARGS) -module usrp_swig \ + -o usrp_swig.cc $(srcdir)/usrp.i noinst_PYTHON = \ qa_usrp.py diff --git a/gr-usrp/src/usrp.i b/gr-usrp/src/usrp.i index 40fa471b01..b60ef70cd8 100644 --- a/gr-usrp/src/usrp.i +++ b/gr-usrp/src/usrp.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,12 +22,10 @@ %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 %{ #include "gnuradio_swig_bug_workaround.h" // mandatory bug fix -#include <stdexcept> #include <vector> %} |