summaryrefslogtreecommitdiff
path: root/gr-msdd6000
diff options
context:
space:
mode:
authorjcorgan2009-02-02 14:27:28 +0000
committerjcorgan2009-02-02 14:27:28 +0000
commit8193fd8a044a18471a6091249195d15ae6d814be (patch)
treee9b491d81ad03024280209ac677d589c841b8f98 /gr-msdd6000
parent09f236be864aaa3b5216eb42676eafb38d47b587 (diff)
downloadgnuradio-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-msdd6000')
-rw-r--r--gr-msdd6000/src/Makefile.am15
-rw-r--r--gr-msdd6000/src/msdd.i7
2 files changed, 7 insertions, 15 deletions
diff --git a/gr-msdd6000/src/Makefile.am b/gr-msdd6000/src/Makefile.am
index ef782b4d4..b629b345f 100644
--- a/gr-msdd6000/src/Makefile.am
+++ b/gr-msdd6000/src/Makefile.am
@@ -1,5 +1,5 @@
#
-# Copyright 2007,2008 Free Software Foundation, Inc.
+# Copyright 2007,2008,2009 Free Software Foundation, Inc.
#
# This file is part of GNU Radio
#
@@ -39,17 +39,11 @@ ourlibdir = $(grpyexecdir)
AM_CPPFLAGS = $(STD_DEFINES_AND_INCLUDES) $(PYTHON_CPPFLAGS) \
$(WITH_INCLUDES)
-
-SWIGPYTHONARGS = $(SWIGPYTHONFLAGS) $(STD_DEFINES_AND_INCLUDES) \
- -I/usr/include $(WITH_SWIG_INCLUDES) $(WITH_INCLUDES)
-
NON_LOCAL_IFILES = \
$(GNURADIO_I)
-
LOCAL_IFILES = \
- $(top_srcdir)/gr-msdd6000/src/msdd.i
-
+ $(srcdir)/msdd.i
ALL_IFILES = \
$(LOCAL_IFILES) \
@@ -90,8 +84,9 @@ _msdd_la_LIBADD = \
-lstdc++
# -L/usr/lib/libfftw3f.so.3.1.2
-msdd.cc msdd.py: $(LOCAL_IFILES) $(ALL_IFILES)
- $(SWIG) $(SWIGPYTHONARGS) -module msdd -o msdd.cc $(LOCAL_IFILES)
+msdd.cc msdd.py: $(ALL_IFILES)
+ $(SWIG) $(STD_SWIG_PYTHON_ARGS) -module msdd \
+ -o msdd.cc $(LOCAL_IFILES)
# These headers get installed in ${prefix}/include/gnuradio
grinclude_HEADERS = \
diff --git a/gr-msdd6000/src/msdd.i b/gr-msdd6000/src/msdd.i
index c3260b456..ed4cfc204 100644
--- a/gr-msdd6000/src/msdd.i
+++ b/gr-msdd6000/src/msdd.i
@@ -1,6 +1,6 @@
/* -*- c++ -*- */
/*
- * Copyright 2004 Free Software Foundation, Inc.
+ * Copyright 2004,2009 Free Software Foundation, Inc.
*
* This file is part of GNU Radio
*
@@ -22,16 +22,13 @@
%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 "msdd_source_s.h"
#include "msdd_source_c.h"
#include "msdd_source_simple.h"
-#include <stdexcept>
%}
// ================================================================