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
author: jcorgan 2009-02-02 14:27:28 +0000
committer: jcorgan 2009-02-02 14:27:28 +0000
commit: 8193fd8a044a18471a6091249195d15ae6d814be (patch)
tree: e9b491d81ad03024280209ac677d589c841b8f98
parent: 09f236be864aaa3b5216eb42676eafb38d47b587 (diff)
download: gnuradio-8193fd8a044a18471a6091249195d15ae6d814be.tar.gz
gnuradio-8193fd8a044a18471a6091249195d15ae6d814be.tar.bz2
gnuradio-8193fd8a044a18471a6091249195d15ae6d814be.zip
30 files changed, 157 insertions, 195 deletions
diff --git a/Makefile.common b/Makefile.common
index 35cd1a300..c8a801a3a 100644
--- a/Makefile.common
+++ b/Makefile.common
@@ -1,6 +1,6 @@
 # -*- Makefile -*-
 #
-# Copyright 2004,2006,2007,2008 Free Software Foundation, Inc.
+# Copyright 2004,2006,2007,2008,2009 Free Software Foundation, Inc.
 # 
 # This file is part of GNU Radio
 # 
@@ -49,6 +49,10 @@ gcellspuincludedir = $(includedir)/gcell/spu
 # Cell spu libs
 libspudir = $(libdir)spu
 
+# This used to be set in configure.ac but is now defined here for all 
+# Makefiles when this fragment is included.
+STD_DEFINES_AND_INCLUDES = $(DEFINES) $(BOOST_CPPFLAGS) \
+	$(OMNITHREAD_INCLUDES) $(GNURADIO_INCLUDES) $(GRUEL_INCLUDES)
 
 # when including for compilation from pre-installed libraries and such,
 # need to make sure those are put last on the compile command
@@ -57,7 +61,18 @@ WITH_SWIG_INCLUDES = @with_SWIG_INCLUDES@
 
 # swig flags
 # -w511 turns off keyword argument warning
-SWIGPYTHONFLAGS = -fvirtual -python -modern -keyword -w511
+# "-outdir $(builddir)" writes all generated output files to
+#   the local builddir (which should always be '.')
+SWIG_PYTHON_FLAGS = -fvirtual -python -modern -keyword \
+	-w511 -outdir $(builddir)
+
+# standard swig flags used by most components
+STD_SWIG_PYTHON_ARGS = \
+	$(SWIG_PYTHON_FLAGS) \
+	$(STD_DEFINES_AND_INCLUDES) \
+	$(LOCAL_SWIG_DEFINES_AND_INCLUDES) \
+	$(WITH_SWIG_INCLUDES) \
+	$(WITH_INCLUDES)
 
 # How to link in the top-level omnithreads library from inside the tree
 OMNITHREAD_INCLUDES = @omnithread_INCLUDES@
@@ -104,10 +119,6 @@ GCELL_SPU_LA = @gcell_spu_LA@
 # libtool aware wrapper for ppu-embedspu
 GCELL_EMBEDSPU_LIBTOOL = @abs_top_srcdir@/gcell/lib/runtime/gcell-embedspu-libtool
 
-# This used to be set in configure.ac but is now defined here for all 
-# Makefiles when this fragment is included.
-STD_DEFINES_AND_INCLUDES=$(DEFINES) $(BOOST_CPPFLAGS) $(OMNITHREAD_INCLUDES) $(GNURADIO_INCLUDES) $(GRUEL_INCLUDES)
-
 # Fix for BSD make not defining $(RM).  We define it now in configure.ac
 # using AM_PATH_PROG, but now here have to add a -f to be like GNU make
 RM=$(RM_PROG) -f
diff --git a/gnuradio-core/src/lib/filter/gr_cma_equalizer_cc.i b/gnuradio-core/src/lib/filter/gr_cma_equalizer_cc.i
index 3178156ab..30e2fb8bd 100644
--- a/gnuradio-core/src/lib/filter/gr_cma_equalizer_cc.i
+++ b/gnuradio-core/src/lib/filter/gr_cma_equalizer_cc.i
@@ -1,6 +1,6 @@
 /* -*- c++ -*- */
 /*
- * Copyright 2006 Free Software Foundation, Inc.
+ * Copyright 2006,2009 Free Software Foundation, Inc.
  * 
  * This file is part of GNU Radio
  * 
@@ -22,7 +22,9 @@
 
 GR_SWIG_BLOCK_MAGIC(gr,cma_equalizer_cc)
 
-%include <gr_adaptive_fir_ccf.i>
+// retrieve info on the base class, without generating wrappers since
+// the base class has a pure virual method.
+%import "gr_adaptive_fir_ccf.i"
 
 gr_cma_equalizer_cc_sptr gr_make_cma_equalizer_cc(int num_taps, float modulus, float mu);
 
diff --git a/gnuradio-core/src/lib/general/gr_pwr_squelch_cc.i b/gnuradio-core/src/lib/general/gr_pwr_squelch_cc.i
index 3d0e7f118..d2e8718c8 100644
--- a/gnuradio-core/src/lib/general/gr_pwr_squelch_cc.i
+++ b/gnuradio-core/src/lib/general/gr_pwr_squelch_cc.i
@@ -1,6 +1,6 @@
 /* -*- c++ -*- */
 /*
- * Copyright 2006 Free Software Foundation, Inc.
+ * Copyright 2006,2009 Free Software Foundation, Inc.
  * 
  * This file is part of GNU Radio
  * 
@@ -22,7 +22,9 @@
 
 GR_SWIG_BLOCK_MAGIC(gr,pwr_squelch_cc);
 
-%include gr_squelch_base_cc.i
+// retrieve info on the base class, without generating wrappers since
+// the base class has a pure virual method.
+%import "gr_squelch_base_cc.i"
 
 gr_pwr_squelch_cc_sptr 
 gr_make_pwr_squelch_cc(double db, double alpha=0.0001, int ramp=0, bool gate=false);
diff --git a/gnuradio-core/src/lib/general/gr_pwr_squelch_ff.i b/gnuradio-core/src/lib/general/gr_pwr_squelch_ff.i
index 8c5919c95..4cb16c4ca 100644
--- a/gnuradio-core/src/lib/general/gr_pwr_squelch_ff.i
+++ b/gnuradio-core/src/lib/general/gr_pwr_squelch_ff.i
@@ -1,6 +1,6 @@
 /* -*- c++ -*- */
 /*
- * Copyright 2006 Free Software Foundation, Inc.
+ * Copyright 2006,2009 Free Software Foundation, Inc.
  * 
  * This file is part of GNU Radio
  * 
@@ -22,7 +22,9 @@
 
 GR_SWIG_BLOCK_MAGIC(gr,pwr_squelch_ff);
 
-%include gr_squelch_base_ff.i
+// retrieve info on the base class, without generating wrappers since
+// the base class has a pure virual method.
+%import "gr_squelch_base_ff.i"
 
 gr_pwr_squelch_ff_sptr 
 gr_make_pwr_squelch_ff(double db, double alpha=0.0001, int ramp=0, bool gate=false);
diff --git a/gnuradio-core/src/lib/swig/Makefile.am b/gnuradio-core/src/lib/swig/Makefile.am
index d3060e9d9..d468b41a9 100644
--- a/gnuradio-core/src/lib/swig/Makefile.am
+++ b/gnuradio-core/src/lib/swig/Makefile.am
@@ -1,5 +1,5 @@
 #
-# Copyright 2001,2003,2004,2005,2006,2007,2008 Free Software Foundation, Inc.
+# Copyright 2001,2003,2004,2005,2006,2007,2008,2009 Free Software Foundation, Inc.
 # 
 # This file is part of GNU Radio
 # 
@@ -69,9 +69,6 @@ BUILT_SOURCES =				\
 	gnuradio_swig_py_io.h		\
 	gnuradio_swig_bug_workaround.h	
 
-SWIGPYTHONARGS = $(SWIGPYTHONFLAGS) $(AM_CPPFLAGS) $(WITH_SWIG_INCLUDES) \
-	$(WITH_INCLUDES)
-
 # ----------------------------------------------------------------
 # We break this up into 5 libraries...
 
@@ -126,8 +123,8 @@ _gnuradio_swig_py_runtime_la_LDFLAGS = -module -avoid-version $(NO_UNDEFINED)
 
 gnuradio_swig_py_runtime.py gnuradio_swig_py_runtime.h: gnuradio_swig_py_runtime.cc
 
-gnuradio_swig_py_runtime.cc : gnuradio.i
-	if $(SWIG) $(SWIGPYTHONARGS) -MMD -MF gnuradio_swig_py_runtime.Td -module gnuradio_swig_py_runtime -o gnuradio_swig_py_runtime.cc gnuradio.i ;\
+gnuradio_swig_py_runtime.cc : $(srcdir)/gnuradio.i
+	if $(SWIG) $(STD_SWIG_PYTHON_ARGS) -MMD -MF gnuradio_swig_py_runtime.Td -module gnuradio_swig_py_runtime -o gnuradio_swig_py_runtime.cc $(srcdir)/gnuradio.i ;\
 	then if test $(host_os) = mingw32; \
 	     then sed 's,\\\\,/,g' <gnuradio_swig_py_runtime.Td >gnuradio_swig_py_runtime.d; rm -f gnuradio_swig_py_runtime.Td; \
 	     else mv -f gnuradio_swig_py_runtime.Td gnuradio_swig_py_runtime.d; fi \
@@ -157,8 +154,8 @@ _gnuradio_swig_py_general_la_LDFLAGS = -module -avoid-version $(NO_UNDEFINED)
 
 gnuradio_swig_py_general.py gnuradio_swig_py_general.h: gnuradio_swig_py_general.cc
 
-gnuradio_swig_py_general.cc : sw_general.i
-	if $(SWIG) $(SWIGPYTHONARGS) -MMD -MF gnuradio_swig_py_general.Td -module gnuradio_swig_py_general -o gnuradio_swig_py_general.cc sw_general.i ;\
+gnuradio_swig_py_general.cc : $(srcdir)/sw_general.i
+	if $(SWIG) $(STD_SWIG_PYTHON_ARGS) -MMD -MF gnuradio_swig_py_general.Td -module gnuradio_swig_py_general -o gnuradio_swig_py_general.cc $(srcdir)/sw_general.i ;\
 	then if test $(host_os) = mingw32; \
 	     then sed 's,\\\\,/,g' <gnuradio_swig_py_general.Td >gnuradio_swig_py_general.d; rm -f gnuradio_swig_py_general.Td; \
 	     else mv -f gnuradio_swig_py_general.Td gnuradio_swig_py_general.d; fi \
@@ -188,8 +185,8 @@ _gnuradio_swig_py_gengen_la_LDFLAGS = -module -avoid-version $(NO_UNDEFINED)
 
 gnuradio_swig_py_gengen.py gnuradio_swig_py_gengen.h: gnuradio_swig_py_gengen.cc
 
-gnuradio_swig_py_gengen.cc : sw_gengen.i
-	if $(SWIG) $(SWIGPYTHONARGS) -MMD -MF gnuradio_swig_py_gengen.Td -module gnuradio_swig_py_gengen -o gnuradio_swig_py_gengen.cc sw_gengen.i ;\
+gnuradio_swig_py_gengen.cc : $(srcdir)/sw_gengen.i
+	if $(SWIG) $(STD_SWIG_PYTHON_ARGS) -MMD -MF gnuradio_swig_py_gengen.Td -module gnuradio_swig_py_gengen -o gnuradio_swig_py_gengen.cc $(srcdir)/sw_gengen.i ;\
 	then if test $(host_os) = mingw32; \
 	     then sed 's,\\\\,/,g' <gnuradio_swig_py_gengen.Td >gnuradio_swig_py_gengen.d; rm -f gnuradio_swig_py_gengen.Td; \
 	     else mv -f gnuradio_swig_py_gengen.Td gnuradio_swig_py_gengen.d; fi \
@@ -219,8 +216,8 @@ _gnuradio_swig_py_filter_la_LDFLAGS = -module -avoid-version $(NO_UNDEFINED)
 
 gnuradio_swig_py_filter.py gnuradio_swig_py_filter.h: gnuradio_swig_py_filter.cc
 
-gnuradio_swig_py_filter.cc : sw_filter.i
-	if $(SWIG) $(SWIGPYTHONARGS) -MMD -MF gnuradio_swig_py_filter.Td -module gnuradio_swig_py_filter -o gnuradio_swig_py_filter.cc sw_filter.i ;\
+gnuradio_swig_py_filter.cc : $(srcdir)/sw_filter.i
+	if $(SWIG) $(STD_SWIG_PYTHON_ARGS) -MMD -MF gnuradio_swig_py_filter.Td -module gnuradio_swig_py_filter -o gnuradio_swig_py_filter.cc $(srcdir)/sw_filter.i ;\
 	then if test $(host_os) = mingw32; \
 	     then sed 's,\\\\,/,g' <gnuradio_swig_py_filter.Td >gnuradio_swig_py_filter.d; rm -f gnuradio_swig_py_filter.Td; \
 	     else mv -f gnuradio_swig_py_filter.Td gnuradio_swig_py_filter.d; fi \
@@ -250,8 +247,8 @@ _gnuradio_swig_py_io_la_LDFLAGS = -module -avoid-version $(NO_UNDEFINED)
 
 gnuradio_swig_py_io.py gnuradio_swig_py_io.h: gnuradio_swig_py_io.cc
 
-gnuradio_swig_py_io.cc : sw_io.i
-	if $(SWIG) $(SWIGPYTHONARGS) -MMD -MF gnuradio_swig_py_io.Td -module gnuradio_swig_py_io -o gnuradio_swig_py_io.cc sw_io.i ;\
+gnuradio_swig_py_io.cc : $(srcdir)/sw_io.i
+	if $(SWIG) $(STD_SWIG_PYTHON_ARGS) -MMD -MF gnuradio_swig_py_io.Td -module gnuradio_swig_py_io -o gnuradio_swig_py_io.cc $(srcdir)/sw_io.i ;\
 	then if test $(host_os) = mingw32; \
 	     then sed 's,\\\\,/,g' <gnuradio_swig_py_io.Td >gnuradio_swig_py_io.d; rm -f gnuradio_swig_py_io.Td; \
 	     else mv -f gnuradio_swig_py_io.Td gnuradio_swig_py_io.d; fi \
diff --git a/gr-atsc/src/lib/Makefile.am b/gr-atsc/src/lib/Makefile.am
index 256cf768a..21a25bc15 100644
--- a/gr-atsc/src/lib/Makefile.am
+++ b/gr-atsc/src/lib/Makefile.am
@@ -1,5 +1,5 @@
 #
-# Copyright 2001,2004,2005,2006,2008 Free Software Foundation, Inc.
+# Copyright 2001,2004,2005,2006,2008,2009 Free Software Foundation, Inc.
 # 
 # This file is part of GNU Radio
 # 
@@ -214,9 +214,6 @@ test_atsci_LDADD   =  		\
 #  It builds the atsc module which we'll load into python
 # ------------------------------------------------------------------------
 
-SWIGCPPPYTHONARGS = -fvirtual -python -modern $(PYTHON_CPPFLAGS) \
-	$(STD_DEFINES_AND_INCLUDES) $(WITH_SWIG_INCLUDES) $(WITH_INCLUDES)
-
 ALL_IFILES = 				\
 	$(LOCAL_IFILES)			\
 	$(NON_LOCAL_IFILES)		
@@ -225,7 +222,7 @@ NON_LOCAL_IFILES =			\
 	$(GNURADIO_I)
 
 LOCAL_IFILES = 				\
-	$(top_srcdir)/gr-atsc/src/lib/atsc.i				
+	$(srcdir)/atsc.i				
 
 # These files are built by SWIG.  The first is the C++ glue.
 # The second is the python wrapper that loads the _atsc shared library
@@ -256,8 +253,9 @@ _atsc_la_LIBADD = 			\
 	libatsc.la			\
 	-lstdc++			
 
-atsc.cc atsc.py: atsc.i $(ALL_IFILES)
-	$(SWIG) $(SWIGCPPPYTHONARGS) -module atsc -o atsc.cc $(LOCAL_IFILES)
+atsc.cc atsc.py: $(ALL_IFILES)
+	$(SWIG) $(STD_SWIG_PYTHON_ARGS) -module atsc \
+		-o atsc.cc $(LOCAL_IFILES)
 
 # These swig headers get installed in ${prefix}/include/gnuradio/swig
 swiginclude_HEADERS = 			\
diff --git a/gr-audio-alsa/src/Makefile.am b/gr-audio-alsa/src/Makefile.am
index 90b47e9d3..d7c787d56 100644
--- a/gr-audio-alsa/src/Makefile.am
+++ b/gr-audio-alsa/src/Makefile.am
@@ -1,5 +1,5 @@
 #
-# Copyright 2004,2008 Free Software Foundation, Inc.
+# Copyright 2004,2008,2009 Free Software Foundation, Inc.
 # 
 # This file is part of GNU Radio
 # 
@@ -33,7 +33,7 @@ EXTRA_DIST = run_tests.in
 TESTS = run_tests
 
 LOCAL_IFILES = 				\
-	$(top_srcdir)/gr-audio-alsa/src/audio_alsa.i				
+	$(srcdir)/audio_alsa.i				
 
 NON_LOCAL_IFILES =			\
 	$(GNURADIO_I)
@@ -51,9 +51,6 @@ ourpython_PYTHON =			\
 
 AM_CPPFLAGS = $(STD_DEFINES_AND_INCLUDES) $(PYTHON_CPPFLAGS) $(WITH_INCLUDES)
 
-SWIGPYTHONARGS = $(SWIGPYTHONFLAGS) $(STD_DEFINES_AND_INCLUDES) \
-	$(WITH_SWIG_INCLUDES) $(WITH_INCLUDES)
-
 ourlib_LTLIBRARIES = _audio_alsa.la
 
 lib_LTLIBRARIES = libgnuradio-audio-alsa.la
@@ -92,8 +89,9 @@ libgnuradio_audio_alsa_la_LDFLAGS = $(NO_UNDEFINED)
 
 _audio_alsa_la_CXXFLAGS = @swig_CXXFLAGS@
 
-audio_alsa.cc audio_alsa.py: $(LOCAL_IFILES) $(NON_LOCAL_IFILES)
-	$(SWIG) $(SWIGPYTHONARGS) -module audio_alsa -o audio_alsa.cc $(LOCAL_IFILES)
+audio_alsa.cc audio_alsa.py: $(ALL_IFILES)
+	$(SWIG) $(STD_SWIG_PYTHON_ARGS) -module audio_alsa \
+		-o audio_alsa.cc $(LOCAL_IFILES)
 
 noinst_PYTHON = 			\
 	qa_alsa.py			
diff --git a/gr-audio-jack/src/Makefile.am b/gr-audio-jack/src/Makefile.am
index 974dad7b5..4ac3d1a43 100644
--- a/gr-audio-jack/src/Makefile.am
+++ b/gr-audio-jack/src/Makefile.am
@@ -1,5 +1,5 @@
 #
-# Copyright 2005,2008 Free Software Foundation, Inc.
+# Copyright 2005,2008,2009 Free Software Foundation, Inc.
 # 
 # This file is part of GNU Radio
 # 
@@ -33,7 +33,7 @@ EXTRA_DIST = run_tests.in
 TESTS = run_tests
 
 LOCAL_IFILES = 				\
-	$(top_srcdir)/gr-audio-jack/src/audio_jack.i				
+	$(srcdir)/audio_jack.i				
 
 NON_LOCAL_IFILES =			\
 	$(GNURADIO_I)
@@ -51,9 +51,6 @@ ourpython_PYTHON =			\
 
 AM_CPPFLAGS = $(STD_DEFINES_AND_INCLUDES) $(PYTHON_CPPFLAGS) $(WITH_INCLUDES)
 
-SWIGPYTHONARGS = $(SWIGPYTHONFLAGS) $(STD_DEFINES_AND_INCLUDES) \
-	$(WITH_SWIG_INCLUDES) $(WITH_INCLUDES)
-
 ourlib_LTLIBRARIES = _audio_jack.la
 
 _audio_jack_la_SOURCES = 		\
@@ -82,8 +79,9 @@ _audio_jack_la_LDFLAGS = $(NO_UNDEFINED) -module -avoid-version
 
 _audio_jack_la_CXXFLAGS = @swig_CXXFLAGS@
 
-audio_jack.cc audio_jack.py: $(LOCAL_IFILES) $(NON_LOCAL_IFILES)
-	$(SWIG) $(SWIGPYTHONARGS) -module audio_jack -o audio_jack.cc $(LOCAL_IFILES)
+audio_jack.cc audio_jack.py: $(ALL_IFILES)
+	$(SWIG) $(STD_SWIG_PYTHON_ARGS) -module audio_jack \
+		-o audio_jack.cc $(LOCAL_IFILES)
 
 noinst_PYTHON = 			\
 	qa_jack.py
diff --git a/gr-audio-oss/src/Makefile.am b/gr-audio-oss/src/Makefile.am
index abb08e39a..eb038a977 100644
--- a/gr-audio-oss/src/Makefile.am
+++ b/gr-audio-oss/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
 # 
@@ -32,7 +32,7 @@ EXTRA_DIST = run_tests.in
 TESTS = run_tests
 
 LOCAL_IFILES = 				\
-	$(top_srcdir)/gr-audio-oss/src/audio_oss.i
+	$(srcdir)/audio_oss.i
 
 NON_LOCAL_IFILES =			\
 	$(GNURADIO_I)
@@ -50,9 +50,6 @@ ourpython_PYTHON =			\
 
 AM_CPPFLAGS = $(STD_DEFINES_AND_INCLUDES) $(PYTHON_CPPFLAGS) $(WITH_INCLUDES)
 
-SWIGPYTHONARGS = $(SWIGPYTHONFLAGS) $(STD_DEFINES_AND_INCLUDES) \
-	$(WITH_SWIG_INCLUDES) $(WITH_INCLUDES)
-
 ourlib_LTLIBRARIES = _audio_oss.la
 
 _audio_oss_la_SOURCES = 		\
@@ -77,8 +74,9 @@ _audio_oss_la_LDFLAGS = $(NO_UNDEFINED) -module -avoid-version
 
 _audio_oss_la_CXXFLAGS = @swig_CXXFLAGS@
 
-audio_oss.cc audio_oss.py: $(LOCAL_IFILES) $(NON_LOCAL_IFILES)
-	$(SWIG) $(SWIGPYTHONARGS) -module audio_oss -o audio_oss.cc $(LOCAL_IFILES)
+audio_oss.cc audio_oss.py: $(ALL_IFILES)
+	$(SWIG) $(STD_SWIG_PYTHON_ARGS) -module audio_oss \
+		-o audio_oss.cc $(LOCAL_IFILES)
 
 # Don't distribute output of swig
 dist-hook:
diff --git a/gr-audio-osx/src/Makefile.am b/gr-audio-osx/src/Makefile.am
index f69529657..e70c9a41d 100644
--- a/gr-audio-osx/src/Makefile.am
+++ b/gr-audio-osx/src/Makefile.am
@@ -1,5 +1,5 @@
 #
-# Copyright 2006,2008 Free Software Foundation, Inc.
+# Copyright 2006,2008,2009 Free Software Foundation, Inc.
 # 
 # This file is part of GNU Radio.
 # 
@@ -32,7 +32,7 @@ EXTRA_DIST = run_tests.in
 TESTS = run_tests
 
 LOCAL_IFILES = 				\
-	$(top_srcdir)/gr-audio-osx/src/audio_osx.i				
+	$(srcdir)/audio_osx.i				
 
 NON_LOCAL_IFILES =			\
 	$(GNURADIO_I)
@@ -50,9 +50,6 @@ ourpython_PYTHON =			\
 
 AM_CPPFLAGS = $(STD_DEFINES_AND_INCLUDES) $(PYTHON_CPPFLAGS) $(WITH_INCLUDES)
 
-SWIGCPPPYTHONARGS = -python $(PYTHON_CPPFLAGS) $(STD_DEFINES_AND_INCLUDES) \
-	 $(WITH_SWIG_INCLUDES) $(WITH_INCLUDES)
-
 ourlib_LTLIBRARIES = _audio_osx.la
 
 _audio_osx_la_SOURCES = 		\
@@ -82,7 +79,8 @@ _audio_osx_la_LDFLAGS = $(NO_UNDEFINED) -module -avoid-version -framework AudioU
 _audio_osx_la_CXXFLAGS = @swig_CXXFLAGS@
 
 audio_osx.cc audio_osx.py: $(ALL_IFILES)
-	$(SWIG) $(SWIGCPPPYTHONARGS) -module audio_osx -o audio_osx.cc $(LOCAL_IFILES)
+	$(SWIG) $(STD_SWIG_PYTHON_ARGS) -module audio_osx \
+		-o audio_osx.cc $(LOCAL_IFILES)
 
 noinst_PYTHON = qa_osx.py test_audio_loop.py
 
diff --git a/gr-audio-portaudio/src/Makefile.am b/gr-audio-portaudio/src/Makefile.am
index f0bd3b196..314ed72a8 100644
--- a/gr-audio-portaudio/src/Makefile.am
+++ b/gr-audio-portaudio/src/Makefile.am
@@ -1,5 +1,5 @@
 #
-# Copyright 2004,2008 Free Software Foundation, Inc.
+# Copyright 2004,2008,2009 Free Software Foundation, Inc.
 # 
 # This file is part of GNU Radio
 # 
@@ -33,7 +33,7 @@ EXTRA_DIST = run_tests.in
 TESTS = run_tests
 
 LOCAL_IFILES = 				\
-	$(top_srcdir)/gr-audio-portaudio/src/audio_portaudio.i
+	$(srcdir)/audio_portaudio.i
 
 NON_LOCAL_IFILES =			\
 	$(GNURADIO_I)
@@ -52,9 +52,6 @@ ourpython_PYTHON =			\
 AM_CPPFLAGS = $(STD_DEFINES_AND_INCLUDES) $(PYTHON_CPPFLAGS) \
 	$(PORTAUDIO_CFLAGS) $(WITH_INCLUDES)
 
-SWIGPYTHONARGS = $(SWIGPYTHONFLAGS) $(STD_DEFINES_AND_INCLUDES) \
-	-I/usr/include $(WITH_SWIG_INCLUDES) $(WITH_INCLUDES)
-
 ourlib_LTLIBRARIES = _audio_portaudio.la
 
 _audio_portaudio_la_SOURCES = 		\
@@ -84,7 +81,8 @@ _audio_portaudio_la_LDFLAGS = $(NO_UNDEFINED) -module -avoid-version
 _audio_portaudio_la_CXXFLAGS = @swig_CXXFLAGS@
 
 audio_portaudio.cc audio_portaudio.py: $(ALL_IFILES) audio_portaudio_sink.h audio_portaudio_source.h
-	$(SWIG) $(SWIGPYTHONARGS) -module audio_portaudio -o audio_portaudio.cc $(LOCAL_IFILES)
+	$(SWIG) $(STD_SWIG_PYTHON_ARGS) -module audio_portaudio \
+		-o audio_portaudio.cc $(LOCAL_IFILES)
 
 noinst_PYTHON = 			\
 	qa_portaudio.py
diff --git a/gr-audio-windows/src/Makefile.am b/gr-audio-windows/src/Makefile.am
index 2f5c26c6a..8618dd549 100644
--- a/gr-audio-windows/src/Makefile.am
+++ b/gr-audio-windows/src/Makefile.am
@@ -1,5 +1,5 @@
 #
-# Copyright 2004,2005,2008 Free Software Foundation, Inc.
+# Copyright 2004,2005,2008,2009 Free Software Foundation, Inc.
 # 
 # This file is part of GNU Radio
 # 
@@ -32,7 +32,7 @@ EXTRA_DIST = run_tests.in
 TESTS = run_tests
 
 LOCAL_IFILES = 				\
-	$(top_srcdir)/gr-audio-windows/src/audio_windows.i				
+	$(srcdir)/audio_windows.i				
 
 NON_LOCAL_IFILES =			\
 	$(GNURADIO_I)
@@ -50,9 +50,6 @@ ourpython_PYTHON =			\
 
 AM_CPPFLAGS = $(STD_DEFINES_AND_INCLUDES) $(PYTHON_CPPFLAGS) $(WITH_INCLUDES)
 
-SWIGCPPPYTHONARGS = -python $(PYTHON_CPPFLAGS) $(STD_DEFINES_AND_INCLUDES) \
-	 $(WITH_SWIG_INCLUDES)
-
 ourlib_LTLIBRARIES = _audio_windows.la
 
 _audio_windows_la_SOURCES = 		\
@@ -79,9 +76,9 @@ _audio_windows_la_LDFLAGS = -no-undefined -module -avoid-version \
 
 _audio_windows_la_CXXFLAGS = @swig_CXXFLAGS@
 
-audio_windows.cc audio_windows.py: $(LOCAL_IFILES)
-	$(SWIG) $(SWIGCPPPYTHONARGS) -module audio_windows -o audio_windows.cc $(LOCAL_IFILES)
-
+audio_windows.cc audio_windows.py: $(ALL_IFILES)
+	$(SWIG) $(STD_SWIG_PYTHON_ARGS) -module audio_windows \
+		-o audio_windows.cc $(LOCAL_IFILES)
 
 noinst_PYTHON = qa_audio_windows.py
 
diff --git a/gr-comedi/src/Makefile.am b/gr-comedi/src/Makefile.am
index 6fc028998..c276629e4 100644
--- a/gr-comedi/src/Makefile.am
+++ b/gr-comedi/src/Makefile.am
@@ -1,5 +1,5 @@
 #
-# Copyright 2005,2008 Free Software Foundation, Inc.
+# Copyright 2005,2008,2009 Free Software Foundation, Inc.
 # 
 # This file is part of GNU Radio
 # 
@@ -33,7 +33,7 @@ EXTRA_DIST = run_tests.in
 TESTS = run_tests
 
 LOCAL_IFILES = 				\
-	$(top_srcdir)/gr-comedi/src/comedi.i				
+	$(srcdir)/comedi.i				
 
 NON_LOCAL_IFILES =			\
 	$(GNURADIO_I)
@@ -51,10 +51,6 @@ ourpython_PYTHON =			\
 
 AM_CPPFLAGS = $(STD_DEFINES_AND_INCLUDES) $(PYTHON_CPPFLAGS) $(WITH_INCLUDES)
 
-SWIGCPPPYTHONARGS = -c++ -python $(PYTHON_CPPFLAGS) \
-	$(STD_DEFINES_AND_INCLUDES) $(WITH_SWIG_INCLUDES) $(WITH_INCLUDES)
-#	-I$(swigincludedir) $(S-I$(grincludedir) -I$(comediincludedir)
-
 ourlib_LTLIBRARIES = _comedi.la
 
 _comedi_la_SOURCES = 		\
@@ -84,9 +80,9 @@ _comedi_la_LDFLAGS = $(NO_UNDEFINED) -module -avoid-version
 
 _comedi_la_CXXFLAGS = @swig_CXXFLAGS@
 
-comedi.cc comedi.py: $(LOCAL_IFILES)
-	$(SWIG) $(SWIGCPPPYTHONARGS) -module comedi -o comedi.cc $(LOCAL_IFILES)
-
+comedi.cc comedi.py: $(ALL_IFILES)
+	$(SWIG) $(STD_SWIG_PYTHON_ARGS) -module comedi \
+		-o comedi.cc $(LOCAL_IFILES)
 
 noinst_PYTHON = 		\
 	qa_comedi.py			
diff --git a/gr-cvsd-vocoder/src/lib/Makefile.am b/gr-cvsd-vocoder/src/lib/Makefile.am
index c4f1fac39..2306bc3b8 100644
--- a/gr-cvsd-vocoder/src/lib/Makefile.am
+++ b/gr-cvsd-vocoder/src/lib/Makefile.am
@@ -1,5 +1,5 @@
 #
-# Copyright 2004,2005,2008 Free Software Foundation, Inc.
+# Copyright 2004,2005,2008,2009 Free Software Foundation, Inc.
 # 
 # This file is part of GNU Radio
 # 
@@ -30,9 +30,6 @@ ourlibdir    = $(grpyexecdir)/vocoder
 
 AM_CPPFLAGS = $(STD_DEFINES_AND_INCLUDES) $(PYTHON_CPPFLAGS) $(WITH_INCLUDES)
 
-SWIGPYTHONARGS = $(SWIGPYTHONFLAGS) $(STD_DEFINES_AND_INCLUDES) \
-	$(WITH_SWIG_INCLUDES) $(WITH_INCLUDES)
-
 ALL_IFILES = 				\
 	$(LOCAL_IFILES)			\
 	$(NON_LOCAL_IFILES)		
@@ -41,7 +38,7 @@ NON_LOCAL_IFILES =			\
 	$(GNURADIO_I)
 
 LOCAL_IFILES = 				\
-	$(top_srcdir)/gr-cvsd-vocoder/src/lib/cvsd_vocoder.i
+	$(srcdir)/cvsd_vocoder.i
 
 # These files are built by SWIG.  The first is the C++ glue.
 # The second is the python wrapper that loads the _howto shared library
@@ -75,8 +72,9 @@ _cvsd_vocoder_la_LIBADD = 	\
 
 _cvsd_vocoder_la_CXXFLAGS = @swig_CXXFLAGS@
 
-cvsd_vocoder.cc cvsd_vocoder.py: cvsd_vocoder.i $(ALL_IFILES)
-	$(SWIG) $(SWIGPYTHONARGS) -module cvsd_vocoder -o cvsd_vocoder.cc $(LOCAL_IFILES)
+cvsd_vocoder.cc cvsd_vocoder.py: $(ALL_IFILES)
+	$(SWIG) $(STD_SWIG_PYTHON_ARGS) -module cvsd_vocoder \
+		-o cvsd_vocoder.cc $(LOCAL_IFILES)
 
 # These headers get installed in ${prefix}/include/gnuradio
 grinclude_HEADERS =			\
diff --git a/gr-gcell/src/Makefile.am b/gr-gcell/src/Makefile.am
index 36b618f4b..4ed607c55 100644
--- a/gr-gcell/src/Makefile.am
+++ b/gr-gcell/src/Makefile.am
@@ -1,5 +1,5 @@
 #
-# Copyright 2008 Free Software Foundation, Inc.
+# Copyright 2008,2009 Free Software Foundation, Inc.
 # 
 # This file is part of GNU Radio
 # 
@@ -32,10 +32,11 @@ TESTS = run_tests
 ourpythondir = $(grpythondir)
 ourlibdir    = $(grpyexecdir)
 
-AM_CPPFLAGS = $(STD_DEFINES_AND_INCLUDES) $(GCELL_INCLUDES) $(PYTHON_CPPFLAGS) $(WITH_INCLUDES)
+AM_CPPFLAGS = $(STD_DEFINES_AND_INCLUDES) $(GCELL_INCLUDES) \
+	$(PYTHON_CPPFLAGS) $(WITH_INCLUDES)
 
-SWIGPYTHONARGS = $(SWIGPYTHONFLAGS) $(STD_DEFINES_AND_INCLUDES) $(GCELL_INCLUDES) \
-	$(WITH_SWIG_INCLUDES) $(WITH_INCLUDES)
+# Special swig arguments
+LOCAL_SWIG_DEFINES_AND_INCLUDES = $(GCELL_INCLUDES)
 
 # ----------------------------------------------------------------
 #                        The C++ blocks
@@ -98,8 +99,9 @@ _gcell_la_CXXFLAGS = @swig_CXXFLAGS@
 swiginclude_HEADERS = \
 	$(LOCAL_IFILES)
 
-#gcell.cc gcell.py: $(LOCAL_IFILES) $(NON_LOCAL_IFILES)
-#	$(SWIG) $(SWIGPYTHONARGS) -module gcell -o gcell.cc $(LOCAL_IFILES)
+#gcell.cc gcell.py: $(ALL_IFILES)
+#	$(SWIG) $(STD_SWIG_PYTHON_ARGS) -module gcell \
+#		-o gcell.cc $(LOCAL_IFILES)
 
 # KLUDGE: Force runtime include of gcell.d dependency file.
 # This is not guaranteed to be portable, but will probably work.
@@ -108,8 +110,9 @@ swiginclude_HEADERS = \
 
 gcell.py gcell.h: gcell.cc
 
-gcell.cc : gcell.i $(GNURADIO_I)
-	if $(SWIG) $(SWIGPYTHONARGS) -MMD -MF gcell.Td -module gcell -o gcell.cc $(srcdir)/gcell.i ;\
+gcell.cc : $(srcdir)/gcell.i $(GNURADIO_I)
+	if $(SWIG) $(STD_SWIG_PYTHON_ARGS) -MMD -MF gcell.Td -module gcell \
+		-o gcell.cc $(srcdir)/gcell.i ;\
 	then if test $(host_os) = mingw32; \
 	     then sed 's,\\\\,/,g' <gcell.Td >gcell.d; rm -f gcell.Td; \
 	     else mv -f gcell.Td gcell.d; fi \
diff --git a/gr-gpio/src/lib/Makefile.am b/gr-gpio/src/lib/Makefile.am
index f05a581ac..1d2451f1c 100644
--- a/gr-gpio/src/lib/Makefile.am
+++ b/gr-gpio/src/lib/Makefile.am
@@ -1,5 +1,5 @@
 #
-# Copyright 2004,2005,2006,2007,2008 Free Software Foundation, Inc.
+# Copyright 2004,2005,2006,2007,2008,2009 Free Software Foundation, Inc.
 # 
 # This file is part of GNU Radio
 # 
@@ -26,9 +26,6 @@ ourlibdir    = $(grpyexecdir)/gpio
 
 AM_CPPFLAGS = $(STD_DEFINES_AND_INCLUDES) $(PYTHON_CPPFLAGS) $(WITH_INCLUDES)
 
-SWIGPYTHONARGS = $(SWIGPYTHONFLAGS) $(STD_DEFINES_AND_INCLUDES) \
-    $(WITH_SWIG_INCLUDES) $(WITH_INCLUDES)
-
 ALL_IFILES = 				\
 	$(LOCAL_IFILES)			\
 	$(NON_LOCAL_IFILES)		
@@ -36,7 +33,7 @@ ALL_IFILES = 				\
 NON_LOCAL_IFILES = $(GNURADIO_I)
 
 LOCAL_IFILES = 				\
-	$(top_srcdir)/gr-gpio/src/lib/gpio.i				
+	$(srcdir)/gpio.i				
 
 # These files are built by SWIG.  The first is the C++ glue.
 # The second is the python wrapper that loads the _gpio shared library
@@ -67,8 +64,9 @@ _gpio_swig_la_LIBADD =			\
 	$(GNURADIO_CORE_LA)		\
 	-lstdc++			
 
-gpio_swig.cc gpio_swig.py: $(LOCAL_IFILES) $(ALL_IFILES)
-	$(SWIG) $(SWIGPYTHONARGS) -module gpio_swig -o gpio_swig.cc $(LOCAL_IFILES)
+gpio_swig.cc gpio_swig.py: $(ALL_IFILES)
+	$(SWIG) $(STD_SWIG_PYTHON_ARGS) -module gpio_swig \
+		-o gpio_swig.cc $(LOCAL_IFILES)
 
 # These headers get installed in ${prefix}/include/gnuradio
 grinclude_HEADERS =			\
diff --git a/gr-gsm-fr-vocoder/src/lib/Makefile.am b/gr-gsm-fr-vocoder/src/lib/Makefile.am
index a53813c6e..82646adb7 100644
--- a/gr-gsm-fr-vocoder/src/lib/Makefile.am
+++ b/gr-gsm-fr-vocoder/src/lib/Makefile.am
@@ -1,5 +1,5 @@
 #
-# Copyright 2004,2005,2008 Free Software Foundation, Inc.
+# Copyright 2004,2005,2008,2009 Free Software Foundation, Inc.
 # 
 # This file is part of GNU Radio
 # 
@@ -32,9 +32,6 @@ ourlibdir    = $(grpyexecdir)/vocoder
 
 AM_CPPFLAGS = $(STD_DEFINES_AND_INCLUDES) $(PYTHON_CPPFLAGS) $(WITH_INCLUDES)
 
-SWIGPYTHONARGS = $(SWIGPYTHONFLAGS) $(STD_DEFINES_AND_INCLUDES) \
-	$(WITH_SWIG_INCLUDES) $(WITH_INCLUDES)
-
 ALL_IFILES = 				\
 	$(LOCAL_IFILES)			\
 	$(NON_LOCAL_IFILES)		
@@ -43,7 +40,7 @@ NON_LOCAL_IFILES =			\
 	$(GNURADIO_I)
 
 LOCAL_IFILES = 				\
-	$(top_srcdir)/gr-gsm-fr-vocoder/src/lib/gsm_full_rate.i
+	$(srcdir)/gsm_full_rate.i
 
 # These files are built by SWIG.  The first is the C++ glue.
 # The second is the python wrapper that loads the _howto shared library
@@ -77,8 +74,9 @@ _gsm_full_rate_la_LIBADD = 	\
 	$(GNURADIO_CORE_LA)	\
 	-lstdc++			
 
-gsm_full_rate.cc gsm_full_rate.py: gsm_full_rate.i $(ALL_IFILES)
-	$(SWIG) $(SWIGPYTHONARGS) -module gsm_full_rate -o gsm_full_rate.cc $(LOCAL_IFILES)
+gsm_full_rate.cc gsm_full_rate.py: $(ALL_IFILES)
+	$(SWIG) $(STD_SWIG_PYTHON_ARGS) -module gsm_full_rate \
+		-o gsm_full_rate.cc $(LOCAL_IFILES)
 
 # These headers get installed in ${prefix}/include/gnuradio
 grinclude_HEADERS =			\
diff --git a/gr-howto-write-a-block/src/lib/Makefile.am b/gr-howto-write-a-block/src/lib/Makefile.am
index 04bac39d7..c6fe7ca44 100644
--- a/gr-howto-write-a-block/src/lib/Makefile.am
+++ b/gr-howto-write-a-block/src/lib/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
 # 
@@ -30,7 +30,7 @@ ourlibdir    = $(grpyexecdir)
 
 AM_CPPFLAGS = $(STD_DEFINES_AND_INCLUDES) $(PYTHON_CPPFLAGS)
 
-SWIGPYTHONARGS = $(SWIGPYTHONFLAGS) $(SWIGGRFLAGS)
+SWIG_PYTHON_ARGS = $(SWIG_PYTHON_FLAGS) $(SWIGGRFLAGS)
 
 ALL_IFILES = 				\
 	$(LOCAL_IFILES)			\
@@ -41,7 +41,7 @@ NON_LOCAL_IFILES =			\
 
 
 LOCAL_IFILES = 				\
-	$(top_srcdir)/src/lib/howto.i				
+	$(srcdir)/howto.i				
 
 # These files are built by SWIG.  The first is the C++ glue.
 # The second is the python wrapper that loads the _howto shared library
@@ -72,8 +72,9 @@ _howto_la_LIBADD = 			\
 	$(PYTHON_LDFLAGS)		\
 	-lstdc++			
 
-howto.cc howto.py: $(LOCAL_IFILES) $(ALL_IFILES)
-	$(SWIG) $(SWIGPYTHONARGS) -module howto -o howto.cc $(LOCAL_IFILES)
+howto.cc howto.py: $(ALL_IFILES)
+	$(SWIG) $(STD_SWIG_PYTHON_ARGS) -module howto \
+		-o howto.cc $(LOCAL_IFILES)
 
 # These headers get installed in ${prefix}/include/gnuradio
 grinclude_HEADERS =			\
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>
 %}
 
 // ================================================================
diff --git a/gr-pager/src/Makefile.am b/gr-pager/src/Makefile.am
index d0245444a..c7bdba17b 100644
--- a/gr-pager/src/Makefile.am
+++ b/gr-pager/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
 # 
@@ -45,19 +45,16 @@ ourlibdir    = $(grpyexecdir)/pager
 
 AM_CPPFLAGS = $(STD_DEFINES_AND_INCLUDES) $(PYTHON_CPPFLAGS) $(WITH_INCLUDES)
 
-SWIGPYTHONARGS = $(SWIGPYTHONFLAGS) $(STD_DEFINES_AND_INCLUDES) \
-	$(WITH_SWIG_INCLUDES) $(WITH_INCLUDES)
-
 ALL_IFILES = \
     $(LOCAL_IFILES) \
     $(NON_LOCAL_IFILES)	\
-    pager_flex_frame.i
+    $(srcdir)/pager_flex_frame.i
 
 NON_LOCAL_IFILES = \
     $(GNURADIO_I)
 
 LOCAL_IFILES = \
-    $(top_srcdir)/gr-pager/src/pager.i
+    $(srcdir)/pager.i
 
 # These files are built by SWIG.  The first is the C++ glue.
 # The second is the python wrapper that loads the _howto shared library
@@ -99,7 +96,8 @@ _pager_swig_la_LIBADD = \
     -lstdc++			
 
 pager_swig.cc pager_swig.py: $(ALL_IFILES)
-	$(SWIG) $(SWIGPYTHONARGS) -module pager_swig -o pager_swig.cc $(LOCAL_IFILES)
+	$(SWIG) $(STD_SWIG_PYTHON_ARGS) -module pager_swig \
+		-o pager_swig.cc $(LOCAL_IFILES)
 
 # These headers get installed in ${prefix}/include/gnuradio
 grinclude_HEADERS = \
diff --git a/gr-qtgui/src/lib/Makefile.am b/gr-qtgui/src/lib/Makefile.am
index 913b2bd81..b3912100a 100644
--- a/gr-qtgui/src/lib/Makefile.am
+++ b/gr-qtgui/src/lib/Makefile.am
@@ -1,5 +1,5 @@
 #
-# Copyright 2008 Free Software Foundation, Inc.
+# Copyright 2008,2009 Free Software Foundation, Inc.
 # 
 # This file is part of GNU Radio
 # 
@@ -31,9 +31,6 @@ ourlibdir    = $(grpyexecdir)/qtgui
 AM_CPPFLAGS = $(STD_DEFINES_AND_INCLUDES) $(PYTHON_CPPFLAGS) \
               $(QT_INCLUDES) -I. $(WITH_INCLUDES)
 
-SWIGPYTHONARGS = $(SWIGPYTHONFLAGS) $(STD_DEFINES_AND_INCLUDES) \
-	$(WITH_SWIG_INCLUDES) $(WITH_INCLUDES)
-
 ALL_IFILES = 				\
 	$(LOCAL_IFILES)			\
 	$(NON_LOCAL_IFILES)		
@@ -42,7 +39,7 @@ NON_LOCAL_IFILES =			\
 	$(GNURADIO_I)
 
 LOCAL_IFILES = 				\
-	$(top_srcdir)/gr-qtgui/src/lib/qtgui.i
+	$(srcdir)/qtgui.i
 
 # These files are built by SWIG.  The first is the C++ glue.
 # The second is the python wrapper that loads the shared library
@@ -143,8 +140,9 @@ libqtgui_la_LIBADD = 		\
 	-lstdc++		\
 	$(QT_LIBS)
 
-qtgui.cc qtgui.py: qtgui.i $(ALL_IFILES)
-	$(SWIG) $(SWIGPYTHONARGS) -module qtgui -o qtgui.cc $(LOCAL_IFILES)
+qtgui.cc qtgui.py: $(ALL_IFILES)
+	$(SWIG) $(STD_SWIG_PYTHON_ARGS) -module qtgui \
+		-o qtgui.cc $(LOCAL_IFILES)
 
 # These swig headers get installed in ${prefix}/include/gnuradio/swig
 swiginclude_HEADERS = 			\
diff --git a/gr-radio-astronomy/src/lib/Makefile.am b/gr-radio-astronomy/src/lib/Makefile.am
index f3351bf88..bfd1928b4 100644
--- a/gr-radio-astronomy/src/lib/Makefile.am
+++ b/gr-radio-astronomy/src/lib/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
 # 
@@ -30,9 +30,6 @@ ourlibdir    = $(grpyexecdir)
 
 AM_CPPFLAGS = $(STD_DEFINES_AND_INCLUDES) $(PYTHON_CPPFLAGS) $(WITH_INCLUDES)
 
-SWIGPYTHONARGS = $(SWIGPYTHONFLAGS) $(STD_DEFINES_AND_INCLUDES) \
-	$(WITH_SWIG_INCLUDES) $(WITH_INCLUDES)
-
 ALL_IFILES = 				\
 	$(LOCAL_IFILES)			\
 	$(NON_LOCAL_IFILES)		
@@ -41,7 +38,7 @@ NON_LOCAL_IFILES =			\
 	$(GNURADIO_I)
 
 LOCAL_IFILES = 				\
-	$(top_srcdir)/gr-radio-astronomy/src/lib/ra.i				
+	$(srcdir)/ra.i				
 
 # These files are built by SWIG.  The first is the C++ glue.
 # The second is the python wrapper that loads the _howto shared library
@@ -72,7 +69,7 @@ _ra_la_LIBADD = 		\
 	-lstdc++			
 
 ra.cc ra.py: $(ALL_IFILES)
-	$(SWIG) $(SWIGPYTHONARGS) -module ra -o ra.cc $(LOCAL_IFILES)
+	$(SWIG) $(STD_SWIG_PYTHON_ARGS) -module ra -o ra.cc $(LOCAL_IFILES)
 
 # These headers get installed in ${prefix}/include/gnuradio
 grinclude_HEADERS =
diff --git a/gr-trellis/src/lib/Makefile.am b/gr-trellis/src/lib/Makefile.am
index c2c2f057f..acde93ab9 100644
--- a/gr-trellis/src/lib/Makefile.am
+++ b/gr-trellis/src/lib/Makefile.am
@@ -1,5 +1,5 @@
 #
-# Copyright 2004,2005,2006,2007,2008 Free Software Foundation, Inc.
+# Copyright 2004,2005,2006,2007,2008,2009 Free Software Foundation, Inc.
 # 
 # This file is part of GNU Radio
 # 
@@ -30,9 +30,6 @@ ourlibdir    = $(grpyexecdir)
 
 AM_CPPFLAGS = $(STD_DEFINES_AND_INCLUDES) $(PYTHON_CPPFLAGS) $(WITH_INCLUDES)
 
-SWIGPYTHONARGS = $(SWIGPYTHONFLAGS) $(STD_DEFINES_AND_INCLUDES) \
-	$(WITH_SWIG_INCLUDES) $(WITH_INCLUDES)
-
 # ----------------------------------------------------------------
 # these scripts generate trellis codes from template files
 
@@ -107,7 +104,7 @@ NON_LOCAL_IFILES =		\
 	$(GNURADIO_I)	
 
 LOCAL_IFILES = 			\
-	$(top_srcdir)/gr-trellis/src/lib/trellis.i			
+	$(srcdir)/trellis.i			
 
 EXTRA_DIST = 			\
 	$(CODE_GENERATOR)	\
@@ -146,7 +143,8 @@ _trellis_la_LIBADD = 			\
 _trellis_la_CXXFLAGS = @swig_CXXFLAGS@
 
 trellis.cc trellis.py: $(ALL_IFILES) $(grinclude_HEADERS)
-	$(SWIG) $(SWIGPYTHONARGS) -module trellis -o trellis.cc $(LOCAL_IFILES)
+	$(SWIG) $(STD_SWIG_PYTHON_ARGS) -module trellis \
+		-o trellis.cc $(LOCAL_IFILES)
 
 # These headers get installed in ${prefix}/include/gnuradio
 grinclude_HEADERS =			\
diff --git a/gr-usrp/src/Makefile.am b/gr-usrp/src/Makefile.am
index 122f977be..7b897ea08 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 40fa471b0..b60ef70cd 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>
 %}
 
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>     
 
 %{
diff --git a/gr-video-sdl/src/Makefile.am b/gr-video-sdl/src/Makefile.am
index a471eacda..a42531f08 100644
--- a/gr-video-sdl/src/Makefile.am
+++ b/gr-video-sdl/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
 # 
@@ -51,8 +51,6 @@ ourpython_PYTHON =			\
 AM_CPPFLAGS = $(STD_DEFINES_AND_INCLUDES) $(PYTHON_CPPFLAGS) $(SDL_CFLAGS) \
 	$(WITH_INCLUDES)
 
-SWIGCPPPYTHONARGS = -fvirtual -python -modern $(PYTHON_CPPFLAGS) $(STD_DEFINES_AND_INCLUDES) $(WITH_SWIG_INCLUDES) $(WITH_INCLUDES)
-
 ourlib_LTLIBRARIES = _video_sdl.la
 
 _video_sdl_la_SOURCES = 		\
@@ -77,8 +75,8 @@ _video_sdl_la_LIBADD = 			\
 _video_sdl_la_LDFLAGS = $(NO_UNDEFINED) -module -avoid-version
 
 video_sdl.cc video_sdl.py: $(ALL_IFILES)
-	$(SWIG) $(SWIGCPPPYTHONARGS) -module video_sdl -o video_sdl.cc $(LOCAL_IFILES)
-
+	$(SWIG) $(STD_SWIG_PYTHON_ARGS) -module video_sdl \
+		-o video_sdl.cc $(LOCAL_IFILES)
 
 noinst_PYTHON = qa_video_sdl.py
 
diff --git a/usrp/host/swig/Makefile.am b/usrp/host/swig/Makefile.am
index 57bc3bdc8..08e6c436b 100644
--- a/usrp/host/swig/Makefile.am
+++ b/usrp/host/swig/Makefile.am
@@ -1,5 +1,5 @@
 #
-# Copyright 2001,2003,2004,2006,2007,2008 Free Software Foundation, Inc.
+# Copyright 2001,2003,2004,2006,2007,2008,2009 Free Software Foundation, Inc.
 # 
 # This file is part of GNU Radio
 # 
@@ -52,10 +52,8 @@ ourpython_PYTHON = 			\
 	usrp_fpga_regs.py		\
 	usrp_prims.py			
 
-
-SWIGPYTHONARGS = $(SWIGPYTHONFLAGS) $(AM_CPPFLAGS) $(WITH_SWIG_INCLUDES) \
-	$(WITH_INCLUDES)
-
+# special SWIG flags
+LOCAL_SWIG_DEFINES_AND_INCLUDES = $(USRP_INCLUDES)
 
 ourlib_LTLIBRARIES = 			\
 	_usrp_prims.la
@@ -71,9 +69,9 @@ _usrp_prims_la_LDFLAGS = $(NO_UNDEFINED) -module -avoid-version
 
 _usrp_prims_la_CXXFLAGS = @swig_CXXFLAGS@
 
-prims.cc usrp_prims.py : prims.i ../../firmware/include/fpga_regs_common.h ../../firmware/include/fpga_regs_standard.h
-	$(SWIG) $(SWIGPYTHONARGS) -module usrp_prims -o prims.cc prims.i
-
+prims.cc usrp_prims.py : $(srcdir)/prims.i ../../firmware/include/fpga_regs_common.h ../../firmware/include/fpga_regs_standard.h
+	$(SWIG) $(STD_SWIG_PYTHON_ARGS) -module usrp_prims \
+		-o prims.cc $(srcdir)/prims.i
 
 MOSTLYCLEANFILES = \
 	prims.cc usrp_prims.py *~ *.pyc
author	jcorgan	2009-02-02 14:27:28 +0000
committer	jcorgan	2009-02-02 14:27:28 +0000
commit	8193fd8a044a18471a6091249195d15ae6d814be (patch)
tree	e9b491d81ad03024280209ac677d589c841b8f98
parent	09f236be864aaa3b5216eb42676eafb38d47b587 (diff)
download	gnuradio-8193fd8a044a18471a6091249195d15ae6d814be.tar.gz gnuradio-8193fd8a044a18471a6091249195d15ae6d814be.tar.bz2 gnuradio-8193fd8a044a18471a6091249195d15ae6d814be.zip