[Commit-gnuradio] r10303 - in gnuradio/branches/developers/michaelld/swi

commit-gnuradio
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Commit-gnuradio] r10303 - in gnuradio/branches/developers/michaelld/swi

From:	michaelld
Subject:	[Commit-gnuradio] r10303 - in gnuradio/branches/developers/michaelld/swigpythonargs: . gnuradio-core/src/lib/swig gr-atsc/src/lib gr-audio-alsa/src gr-audio-jack/src gr-audio-oss/src gr-audio-osx/src gr-audio-portaudio/src gr-audio-windows/src gr-comedi/src gr-cvsd-vocoder/src/lib gr-gcell/src gr-gpio/src/lib gr-gsm-fr-vocoder/src/lib gr-howto-write-a-block/src/lib gr-msdd6000/src gr-pager/src gr-qtgui/src/lib gr-radio-astronomy/src/lib gr-trellis/src/lib gr-usrp/src gr-usrp2/src gr-video-sdl/src usrp/host/swig
Date:	Mon, 26 Jan 2009 06:34:50 -0700 (MST)
Author: michaelld
Date: 2009-01-26 06:34:49 -0700 (Mon, 26 Jan 2009)
New Revision: 10303

Modified:
   gnuradio/branches/developers/michaelld/swigpythonargs/Makefile.common
   
gnuradio/branches/developers/michaelld/swigpythonargs/gnuradio-core/src/lib/swig/Makefile.am
   
gnuradio/branches/developers/michaelld/swigpythonargs/gr-atsc/src/lib/Makefile.am
   
gnuradio/branches/developers/michaelld/swigpythonargs/gr-audio-alsa/src/Makefile.am
   
gnuradio/branches/developers/michaelld/swigpythonargs/gr-audio-jack/src/Makefile.am
   
gnuradio/branches/developers/michaelld/swigpythonargs/gr-audio-oss/src/Makefile.am
   
gnuradio/branches/developers/michaelld/swigpythonargs/gr-audio-osx/src/Makefile.am
   
gnuradio/branches/developers/michaelld/swigpythonargs/gr-audio-portaudio/src/Makefile.am
   
gnuradio/branches/developers/michaelld/swigpythonargs/gr-audio-windows/src/Makefile.am
   
gnuradio/branches/developers/michaelld/swigpythonargs/gr-comedi/src/Makefile.am
   
gnuradio/branches/developers/michaelld/swigpythonargs/gr-cvsd-vocoder/src/lib/Makefile.am
   
gnuradio/branches/developers/michaelld/swigpythonargs/gr-gcell/src/Makefile.am
   
gnuradio/branches/developers/michaelld/swigpythonargs/gr-gpio/src/lib/Makefile.am
   
gnuradio/branches/developers/michaelld/swigpythonargs/gr-gsm-fr-vocoder/src/lib/Makefile.am
   
gnuradio/branches/developers/michaelld/swigpythonargs/gr-howto-write-a-block/src/lib/Makefile.am
   
gnuradio/branches/developers/michaelld/swigpythonargs/gr-msdd6000/src/Makefile.am
   
gnuradio/branches/developers/michaelld/swigpythonargs/gr-pager/src/Makefile.am
   
gnuradio/branches/developers/michaelld/swigpythonargs/gr-qtgui/src/lib/Makefile.am
   
gnuradio/branches/developers/michaelld/swigpythonargs/gr-radio-astronomy/src/lib/Makefile.am
   
gnuradio/branches/developers/michaelld/swigpythonargs/gr-trellis/src/lib/Makefile.am
   gnuradio/branches/developers/michaelld/swigpythonargs/gr-usrp/src/Makefile.am
   
gnuradio/branches/developers/michaelld/swigpythonargs/gr-usrp2/src/Makefile.am
   
gnuradio/branches/developers/michaelld/swigpythonargs/gr-video-sdl/src/Makefile.am
   
gnuradio/branches/developers/michaelld/swigpythonargs/usrp/host/swig/Makefile.am
Log:
Second iteration of SWIG flags cleanup.  Created STD_SWIG_PYTHON_ARGS
in Makefile.common, then local Makefile.am's can define
LOCAL_SWIG_DEFINES_AND_INCLUDES for special arguments for SWIG for
that particular component / directory.  Still a bit more cleanup and
testing to do, but works for SWIG versions 1.3.36 and 1.3.37 (again)
on OSX.  SWIG 1.3.37 is more strict than 1.3.36 about locating source
.i files and making sure dependencies are met inside .i files (e.g.,
for class inheritance), but it looks like 1.3.36 handles the upgrades
for 1.3.37 cleanly.



Modified: gnuradio/branches/developers/michaelld/swigpythonargs/Makefile.common
===================================================================
--- gnuradio/branches/developers/michaelld/swigpythonargs/Makefile.common       
2009-01-26 05:53:16 UTC (rev 10302)
+++ gnuradio/branches/developers/michaelld/swigpythonargs/Makefile.common       
2009-01-26 13:34:49 UTC (rev 10303)
@@ -49,6 +49,10 @@
 # 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,9 +61,21 @@
 
 # swig flags
 # -w511 turns off keyword argument warning
-# "-outdir $(builddir)" writes all generated output files to the local 
builddir (.)
-SWIGPYTHONFLAGS = -fvirtual -python -modern -keyword -w511 -outdir $(builddir)
+# "-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)
+
+#      $(PYTHON_CPPFLAGS) $(AM_CPPFLAGS)
+
 # How to link in the top-level omnithreads library from inside the tree
 OMNITHREAD_INCLUDES = @omnithread_INCLUDES@
 OMNITHREAD_LA = @omnithread_LA@
@@ -105,10 +121,6 @@
 # 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

Modified: 
gnuradio/branches/developers/michaelld/swigpythonargs/gnuradio-core/src/lib/swig/Makefile.am
===================================================================
--- 
gnuradio/branches/developers/michaelld/swigpythonargs/gnuradio-core/src/lib/swig/Makefile.am
        2009-01-26 05:53:16 UTC (rev 10302)
+++ 
gnuradio/branches/developers/michaelld/swigpythonargs/gnuradio-core/src/lib/swig/Makefile.am
        2009-01-26 13:34:49 UTC (rev 10303)
@@ -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 @@
        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.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.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.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.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.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 \

Modified: 
gnuradio/branches/developers/michaelld/swigpythonargs/gr-atsc/src/lib/Makefile.am
===================================================================
--- 
gnuradio/branches/developers/michaelld/swigpythonargs/gr-atsc/src/lib/Makefile.am
   2009-01-26 05:53:16 UTC (rev 10302)
+++ 
gnuradio/branches/developers/michaelld/swigpythonargs/gr-atsc/src/lib/Makefile.am
   2009-01-26 13:34:49 UTC (rev 10303)
@@ -214,11 +214,6 @@
 #  It builds the atsc module which we'll load into python
 # ------------------------------------------------------------------------
 
-SWIGPYTHONARGS = $(SWIGPYTHONFLAGS) $(STD_DEFINES_AND_INCLUDES) \
-       $(WITH_SWIG_INCLUDES) $(WITH_INCLUDES)
-
-# $(PYTHON_CPPFLAGS)
-
 ALL_IFILES =                           \
        $(LOCAL_IFILES)                 \
        $(NON_LOCAL_IFILES)             
@@ -259,7 +254,8 @@
        -lstdc++                        
 
 atsc.cc atsc.py: atsc.i $(ALL_IFILES)
-       $(SWIG) $(SWIGPYTHONARGS) -module atsc -o atsc.cc $(LOCAL_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 =                  \

Modified: 
gnuradio/branches/developers/michaelld/swigpythonargs/gr-audio-alsa/src/Makefile.am
===================================================================
--- 
gnuradio/branches/developers/michaelld/swigpythonargs/gr-audio-alsa/src/Makefile.am
 2009-01-26 05:53:16 UTC (rev 10302)
+++ 
gnuradio/branches/developers/michaelld/swigpythonargs/gr-audio-alsa/src/Makefile.am
 2009-01-26 13:34:49 UTC (rev 10303)
@@ -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
 # 
@@ -51,9 +51,6 @@
 
 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
@@ -93,7 +90,8 @@
 _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)
+       $(SWIG) $(STD_SWIG_PYTHON_ARGS) -module audio_alsa \
+               -o audio_alsa.cc $(LOCAL_IFILES)
 
 noinst_PYTHON =                        \
        qa_alsa.py                      

Modified: 
gnuradio/branches/developers/michaelld/swigpythonargs/gr-audio-jack/src/Makefile.am
===================================================================
--- 
gnuradio/branches/developers/michaelld/swigpythonargs/gr-audio-jack/src/Makefile.am
 2009-01-26 05:53:16 UTC (rev 10302)
+++ 
gnuradio/branches/developers/michaelld/swigpythonargs/gr-audio-jack/src/Makefile.am
 2009-01-26 13:34:49 UTC (rev 10303)
@@ -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
 # 
@@ -51,9 +51,6 @@
 
 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 =               \
@@ -83,7 +80,8 @@
 _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)
+       $(SWIG) $(STD_SWIG_PYTHON_ARGS) -module audio_jack \
+               -o audio_jack.cc $(LOCAL_IFILES)
 
 noinst_PYTHON =                        \
        qa_jack.py

Modified: 
gnuradio/branches/developers/michaelld/swigpythonargs/gr-audio-oss/src/Makefile.am
===================================================================
--- 
gnuradio/branches/developers/michaelld/swigpythonargs/gr-audio-oss/src/Makefile.am
  2009-01-26 05:53:16 UTC (rev 10302)
+++ 
gnuradio/branches/developers/michaelld/swigpythonargs/gr-audio-oss/src/Makefile.am
  2009-01-26 13:34:49 UTC (rev 10303)
@@ -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
 # 
@@ -50,9 +50,6 @@
 
 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 =                \
@@ -78,7 +75,8 @@
 _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)
+       $(SWIG) $(STD_SWIG_PYTHON_ARGS) -module audio_oss \
+               -o audio_oss.cc $(LOCAL_IFILES)
 
 # Don't distribute output of swig
 dist-hook:

Modified: 
gnuradio/branches/developers/michaelld/swigpythonargs/gr-audio-osx/src/Makefile.am
===================================================================
--- 
gnuradio/branches/developers/michaelld/swigpythonargs/gr-audio-osx/src/Makefile.am
  2009-01-26 05:53:16 UTC (rev 10302)
+++ 
gnuradio/branches/developers/michaelld/swigpythonargs/gr-audio-osx/src/Makefile.am
  2009-01-26 13:34:49 UTC (rev 10303)
@@ -50,11 +50,6 @@
 
 AM_CPPFLAGS = $(STD_DEFINES_AND_INCLUDES) $(PYTHON_CPPFLAGS) $(WITH_INCLUDES)
 
-SWIGPYTHONARGS = $(SWIGPYTHONFLAGS) $(STD_DEFINES_AND_INCLUDES) \
-       $(WITH_SWIG_INCLUDES) $(WITH_INCLUDES)
-
-# $(PYTHON_CPPFLAGS)
-
 ourlib_LTLIBRARIES = _audio_osx.la
 
 _audio_osx_la_SOURCES =                \
@@ -84,7 +79,8 @@
 _audio_osx_la_CXXFLAGS = @swig_CXXFLAGS@
 
 audio_osx.cc audio_osx.py: $(ALL_IFILES)
-       $(SWIG) $(SWIGPYTHONARGS) -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
 

Modified: 
gnuradio/branches/developers/michaelld/swigpythonargs/gr-audio-portaudio/src/Makefile.am
===================================================================
--- 
gnuradio/branches/developers/michaelld/swigpythonargs/gr-audio-portaudio/src/Makefile.am
    2009-01-26 05:53:16 UTC (rev 10302)
+++ 
gnuradio/branches/developers/michaelld/swigpythonargs/gr-audio-portaudio/src/Makefile.am
    2009-01-26 13:34:49 UTC (rev 10303)
@@ -52,11 +52,6 @@
 AM_CPPFLAGS = $(STD_DEFINES_AND_INCLUDES) $(PYTHON_CPPFLAGS) \
        $(PORTAUDIO_CFLAGS) $(WITH_INCLUDES)
 
-SWIGPYTHONARGS = $(SWIGPYTHONFLAGS) $(STD_DEFINES_AND_INCLUDES) \
-       $(WITH_SWIG_INCLUDES) $(WITH_INCLUDES)
-
-# -I/usr/include 
-
 ourlib_LTLIBRARIES = _audio_portaudio.la
 
 _audio_portaudio_la_SOURCES =          \
@@ -86,7 +81,8 @@
 _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

Modified: 
gnuradio/branches/developers/michaelld/swigpythonargs/gr-audio-windows/src/Makefile.am
===================================================================
--- 
gnuradio/branches/developers/michaelld/swigpythonargs/gr-audio-windows/src/Makefile.am
      2009-01-26 05:53:16 UTC (rev 10302)
+++ 
gnuradio/branches/developers/michaelld/swigpythonargs/gr-audio-windows/src/Makefile.am
      2009-01-26 13:34:49 UTC (rev 10303)
@@ -50,11 +50,6 @@
 
 AM_CPPFLAGS = $(STD_DEFINES_AND_INCLUDES) $(PYTHON_CPPFLAGS) $(WITH_INCLUDES)
 
-SWIGPYTHONARGS = $(SWIGPYTHONFLAGS) $(STD_DEFINES_AND_INCLUDES) \
-    $(WITH_SWIG_INCLUDES) $(WITH_INCLUDES)
-
-# $(PYTHON_CPPFLAGS)
-
 ourlib_LTLIBRARIES = _audio_windows.la
 
 _audio_windows_la_SOURCES =            \
@@ -82,9 +77,9 @@
 _audio_windows_la_CXXFLAGS = @swig_CXXFLAGS@
 
 audio_windows.cc audio_windows.py: $(LOCAL_IFILES)
-       $(SWIG) $(SWIGPYTHONARGS) -module audio_windows -o audio_windows.cc 
$(LOCAL_IFILES)
+       $(SWIG) $(STD_SWIG_PYTHON_ARGS) -module audio_windows \
+               -o audio_windows.cc $(LOCAL_IFILES)
 
-
 noinst_PYTHON = qa_audio_windows.py
 
 MOSTLYCLEANFILES = \

Modified: 
gnuradio/branches/developers/michaelld/swigpythonargs/gr-comedi/src/Makefile.am
===================================================================
--- 
gnuradio/branches/developers/michaelld/swigpythonargs/gr-comedi/src/Makefile.am 
    2009-01-26 05:53:16 UTC (rev 10302)
+++ 
gnuradio/branches/developers/michaelld/swigpythonargs/gr-comedi/src/Makefile.am 
    2009-01-26 13:34:49 UTC (rev 10303)
@@ -51,12 +51,6 @@
 
 AM_CPPFLAGS = $(STD_DEFINES_AND_INCLUDES) $(PYTHON_CPPFLAGS) $(WITH_INCLUDES)
 
-SWIGCPPPYTHONARGS = $(SWIGPYTHONFLAGS) $(STD_DEFINES_AND_INCLUDES) \
-       $(WITH_SWIG_INCLUDES) $(WITH_INCLUDES)
-
-#      -c++ $(PYTHON_CPPFLAGS)
-#      -I$(swigincludedir) $(S-I$(grincludedir) -I$(comediincludedir)
-
 ourlib_LTLIBRARIES = _comedi.la
 
 _comedi_la_SOURCES =           \
@@ -87,9 +81,9 @@
 _comedi_la_CXXFLAGS = @swig_CXXFLAGS@
 
 comedi.cc comedi.py: $(LOCAL_IFILES)
-       $(SWIG) $(SWIGCPPPYTHONARGS) -module comedi -o comedi.cc $(LOCAL_IFILES)
+       $(SWIG) $(STD_SWIG_PYTHON_ARGS) -module comedi \
+               -o comedi.cc $(LOCAL_IFILES)
 
-
 noinst_PYTHON =                \
        qa_comedi.py                    
 

Modified: 
gnuradio/branches/developers/michaelld/swigpythonargs/gr-cvsd-vocoder/src/lib/Makefile.am
===================================================================
--- 
gnuradio/branches/developers/michaelld/swigpythonargs/gr-cvsd-vocoder/src/lib/Makefile.am
   2009-01-26 05:53:16 UTC (rev 10302)
+++ 
gnuradio/branches/developers/michaelld/swigpythonargs/gr-cvsd-vocoder/src/lib/Makefile.am
   2009-01-26 13:34:49 UTC (rev 10303)
@@ -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 @@
 
 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)             
@@ -76,7 +73,8 @@
 _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)
+       $(SWIG) $(STD_SWIG_PYTHON_ARGS) -module cvsd_vocoder \
+               -o cvsd_vocoder.cc $(LOCAL_IFILES)
 
 # These headers get installed in ${prefix}/include/gnuradio
 grinclude_HEADERS =                    \

Modified: 
gnuradio/branches/developers/michaelld/swigpythonargs/gr-gcell/src/Makefile.am
===================================================================
--- 
gnuradio/branches/developers/michaelld/swigpythonargs/gr-gcell/src/Makefile.am  
    2009-01-26 05:53:16 UTC (rev 10302)
+++ 
gnuradio/branches/developers/michaelld/swigpythonargs/gr-gcell/src/Makefile.am  
    2009-01-26 13:34:49 UTC (rev 10303)
@@ -35,6 +35,7 @@
 AM_CPPFLAGS = $(STD_DEFINES_AND_INCLUDES) $(GCELL_INCLUDES) \
        $(PYTHON_CPPFLAGS) $(WITH_INCLUDES)
 
+# Special swig arguments
 SWIGPYTHONARGS = $(SWIGPYTHONFLAGS) $(STD_DEFINES_AND_INCLUDES) \
        $(GCELL_INCLUDES) $(WITH_SWIG_INCLUDES) $(WITH_INCLUDES)
 

Modified: 
gnuradio/branches/developers/michaelld/swigpythonargs/gr-gpio/src/lib/Makefile.am
===================================================================
--- 
gnuradio/branches/developers/michaelld/swigpythonargs/gr-gpio/src/lib/Makefile.am
   2009-01-26 05:53:16 UTC (rev 10302)
+++ 
gnuradio/branches/developers/michaelld/swigpythonargs/gr-gpio/src/lib/Makefile.am
   2009-01-26 13:34:49 UTC (rev 10303)
@@ -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 @@
 
 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)             
@@ -68,7 +65,8 @@
        -lstdc++                        
 
 gpio_swig.cc gpio_swig.py: $(LOCAL_IFILES) $(ALL_IFILES)
-       $(SWIG) $(SWIGPYTHONARGS) -module gpio_swig -o gpio_swig.cc 
$(LOCAL_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 =                    \

Modified: 
gnuradio/branches/developers/michaelld/swigpythonargs/gr-gsm-fr-vocoder/src/lib/Makefile.am
===================================================================
--- 
gnuradio/branches/developers/michaelld/swigpythonargs/gr-gsm-fr-vocoder/src/lib/Makefile.am
 2009-01-26 05:53:16 UTC (rev 10302)
+++ 
gnuradio/branches/developers/michaelld/swigpythonargs/gr-gsm-fr-vocoder/src/lib/Makefile.am
 2009-01-26 13:34:49 UTC (rev 10303)
@@ -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 @@
 
 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)             
@@ -78,7 +75,8 @@
        -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)
+       $(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 =                    \

Modified: 
gnuradio/branches/developers/michaelld/swigpythonargs/gr-howto-write-a-block/src/lib/Makefile.am
===================================================================
--- 
gnuradio/branches/developers/michaelld/swigpythonargs/gr-howto-write-a-block/src/lib/Makefile.am
    2009-01-26 05:53:16 UTC (rev 10302)
+++ 
gnuradio/branches/developers/michaelld/swigpythonargs/gr-howto-write-a-block/src/lib/Makefile.am
    2009-01-26 13:34:49 UTC (rev 10303)
@@ -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 @@
 
 AM_CPPFLAGS = $(STD_DEFINES_AND_INCLUDES) $(PYTHON_CPPFLAGS)
 
-SWIGPYTHONARGS = $(SWIGPYTHONFLAGS) $(SWIGGRFLAGS)
+SWIG_PYTHON_ARGS = $(SWIG_PYTHON_FLAGS) $(SWIGGRFLAGS)
 
 ALL_IFILES =                           \
        $(LOCAL_IFILES)                 \
@@ -73,7 +73,7 @@
        -lstdc++                        
 
 howto.cc howto.py: $(LOCAL_IFILES) $(ALL_IFILES)
-       $(SWIG) $(SWIGPYTHONARGS) -module howto -o howto.cc $(LOCAL_IFILES)
+       $(SWIG) $(SWIG_PYTHON_ARGS) -module howto -o howto.cc $(LOCAL_IFILES)
 
 # These headers get installed in ${prefix}/include/gnuradio
 grinclude_HEADERS =                    \

Modified: 
gnuradio/branches/developers/michaelld/swigpythonargs/gr-msdd6000/src/Makefile.am
===================================================================
--- 
gnuradio/branches/developers/michaelld/swigpythonargs/gr-msdd6000/src/Makefile.am
   2009-01-26 05:53:16 UTC (rev 10302)
+++ 
gnuradio/branches/developers/michaelld/swigpythonargs/gr-msdd6000/src/Makefile.am
   2009-01-26 13:34:49 UTC (rev 10303)
@@ -39,10 +39,6 @@
 AM_CPPFLAGS = $(STD_DEFINES_AND_INCLUDES) $(PYTHON_CPPFLAGS) \
        $(WITH_INCLUDES)
 
-
-SWIGPYTHONARGS = $(SWIGPYTHONFLAGS) $(STD_DEFINES_AND_INCLUDES) \
-       $(WITH_SWIG_INCLUDES) $(WITH_INCLUDES)
-
 NON_LOCAL_IFILES =                     \
        $(GNURADIO_I)
 
@@ -91,7 +87,8 @@
 # -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)
+       $(SWIG) $(STD_SWIG_PYTHON_ARGS) -module msdd \
+               -o msdd.cc $(LOCAL_IFILES)
 
 # These headers get installed in ${prefix}/include/gnuradio
 grinclude_HEADERS =                    \

Modified: 
gnuradio/branches/developers/michaelld/swigpythonargs/gr-pager/src/Makefile.am
===================================================================
--- 
gnuradio/branches/developers/michaelld/swigpythonargs/gr-pager/src/Makefile.am  
    2009-01-26 05:53:16 UTC (rev 10302)
+++ 
gnuradio/branches/developers/michaelld/swigpythonargs/gr-pager/src/Makefile.am  
    2009-01-26 13:34:49 UTC (rev 10303)
@@ -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,9 +45,6 @@
 
 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)        \
@@ -99,7 +96,8 @@
     -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 = \

Modified: 
gnuradio/branches/developers/michaelld/swigpythonargs/gr-qtgui/src/lib/Makefile.am
===================================================================
--- 
gnuradio/branches/developers/michaelld/swigpythonargs/gr-qtgui/src/lib/Makefile.am
  2009-01-26 05:53:16 UTC (rev 10302)
+++ 
gnuradio/branches/developers/michaelld/swigpythonargs/gr-qtgui/src/lib/Makefile.am
  2009-01-26 13:34:49 UTC (rev 10303)
@@ -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 @@
 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)             
@@ -144,7 +141,8 @@
        $(QT_LIBS)
 
 qtgui.cc qtgui.py: qtgui.i $(ALL_IFILES)
-       $(SWIG) $(SWIGPYTHONARGS) -module qtgui -o qtgui.cc $(LOCAL_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 =                  \

Modified: 
gnuradio/branches/developers/michaelld/swigpythonargs/gr-radio-astronomy/src/lib/Makefile.am
===================================================================
--- 
gnuradio/branches/developers/michaelld/swigpythonargs/gr-radio-astronomy/src/lib/Makefile.am
        2009-01-26 05:53:16 UTC (rev 10302)
+++ 
gnuradio/branches/developers/michaelld/swigpythonargs/gr-radio-astronomy/src/lib/Makefile.am
        2009-01-26 13:34:49 UTC (rev 10303)
@@ -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 @@
 
 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)             
@@ -72,7 +69,7 @@
        -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 =

Modified: 
gnuradio/branches/developers/michaelld/swigpythonargs/gr-trellis/src/lib/Makefile.am
===================================================================
--- 
gnuradio/branches/developers/michaelld/swigpythonargs/gr-trellis/src/lib/Makefile.am
        2009-01-26 05:53:16 UTC (rev 10302)
+++ 
gnuradio/branches/developers/michaelld/swigpythonargs/gr-trellis/src/lib/Makefile.am
        2009-01-26 13:34:49 UTC (rev 10303)
@@ -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 @@
 
 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
 
@@ -146,7 +143,8 @@
 _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 =                    \

Modified: 
gnuradio/branches/developers/michaelld/swigpythonargs/gr-usrp/src/Makefile.am
===================================================================
--- 
gnuradio/branches/developers/michaelld/swigpythonargs/gr-usrp/src/Makefile.am   
    2009-01-26 05:53:16 UTC (rev 10302)
+++ 
gnuradio/branches/developers/michaelld/swigpythonargs/gr-usrp/src/Makefile.am   
    2009-01-26 13:34:49 UTC (rev 10303)
@@ -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,19 @@
 
 _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)
 
+#SWIG_PYTHON_ARGS = \
+#      $(SWIG_PYTHON_FLAGS) \
+#      $(STD_DEFINES_AND_INCLUDES) \
+#      $(USRP_INCLUDES) \
+#      $(WITH_INCLUDES) \
+#      $(WITH_SWIG_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                      

Modified: 
gnuradio/branches/developers/michaelld/swigpythonargs/gr-usrp2/src/Makefile.am
===================================================================
--- 
gnuradio/branches/developers/michaelld/swigpythonargs/gr-usrp2/src/Makefile.am  
    2009-01-26 05:53:16 UTC (rev 10302)
+++ 
gnuradio/branches/developers/michaelld/swigpythonargs/gr-usrp2/src/Makefile.am  
    2009-01-26 13:34:49 UTC (rev 10303)
@@ -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,8 +88,8 @@
 # Install the SWIG python output
 ourpython_PYTHON = usrp2.py
 
-# Arguments to the swig wrapper generator
-SWIGPYTHONARGS = \
+# Special swig arguments
+SWIG_PYTHON_ARGS = \
        $(STD_DEFINES_AND_INCLUDES) \
        $(SWIGPYTHONFLAGS) \
        $(USRP2_INCLUDES) \
@@ -98,7 +98,7 @@
 
 # Invoke SWIG wrapper generator
 usrp2.cc usrp2.py: $(ALL_IFILES)
-       $(SWIG) $(SWIGPYTHONARGS) -module usrp2 -o usrp2.cc $(LOCAL_IFILES)
+       $(SWIG) $(SWIG_PYTHON_ARGS) -module usrp2 -o usrp2.cc $(LOCAL_IFILES)
 
 # Create the Python shared library
 ourlib_LTLIBRARIES = _usrp2.la

Modified: 
gnuradio/branches/developers/michaelld/swigpythonargs/gr-video-sdl/src/Makefile.am
===================================================================
--- 
gnuradio/branches/developers/michaelld/swigpythonargs/gr-video-sdl/src/Makefile.am
  2009-01-26 05:53:16 UTC (rev 10302)
+++ 
gnuradio/branches/developers/michaelld/swigpythonargs/gr-video-sdl/src/Makefile.am
  2009-01-26 13:34:49 UTC (rev 10303)
@@ -51,9 +51,6 @@
 AM_CPPFLAGS = $(STD_DEFINES_AND_INCLUDES) $(PYTHON_CPPFLAGS) $(SDL_CFLAGS) \
        $(WITH_INCLUDES)
 
-SWIGCPPPYTHONARGS = $(SWIGPYTHONFLAGS) $(PYTHON_CPPFLAGS) \
-       $(STD_DEFINES_AND_INCLUDES) $(WITH_SWIG_INCLUDES) $(WITH_INCLUDES)
-
 ourlib_LTLIBRARIES = _video_sdl.la
 
 _video_sdl_la_SOURCES =                \
@@ -78,9 +75,9 @@
 _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
 
 MOSTLYCLEANFILES = \

Modified: 
gnuradio/branches/developers/michaelld/swigpythonargs/usrp/host/swig/Makefile.am
===================================================================
--- 
gnuradio/branches/developers/michaelld/swigpythonargs/usrp/host/swig/Makefile.am
    2009-01-26 05:53:16 UTC (rev 10302)
+++ 
gnuradio/branches/developers/michaelld/swigpythonargs/usrp/host/swig/Makefile.am
    2009-01-26 13:34:49 UTC (rev 10303)
@@ -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,11 +52,9 @@
        usrp_fpga_regs.py               \
        usrp_prims.py                   
 
+# special SWIG flags
+LOCAL_SWIG_DEFINES_AND_INCLUDES = $(USRP_INCLUDES)
 
-SWIGPYTHONARGS = $(SWIGPYTHONFLAGS) $(AM_CPPFLAGS) $(WITH_SWIG_INCLUDES) \
-       $(WITH_INCLUDES)
-
-
 ourlib_LTLIBRARIES =                   \
        _usrp_prims.la
 
@@ -71,10 +69,10 @@
 
 _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
[Prev in Thread]
Current Thread
[Next in Thread]
[Commit-gnuradio] r10303 - in gnuradio/branches/developers/michaelld/swigpythonargs: . gnuradio-core/src/lib/swig gr-atsc/src/lib gr-audio-alsa/src gr-audio-jack/src gr-audio-oss/src gr-audio-osx/src gr-audio-portaudio/src gr-audio-windows/src gr-comedi/src gr-cvsd-vocoder/src/lib gr-gcell/src gr-gpio/src/lib gr-gsm-fr-vocoder/src/lib gr-howto-write-a-block/src/lib gr-msdd6000/src gr-pager/src gr-qtgui/src/lib gr-radio-astronomy/src/lib gr-trellis/src/lib gr-usrp/src gr-usrp2/src gr-video-sdl/src usrp/host/swig, michaelld <=
Prev by Date: [Commit-gnuradio] r10302 - gnuradio/branches/developers/pcreekmore/quantization/usrp/fpga/sdr_lib
Next by Date: [Commit-gnuradio] r10304 - gnuradio/trunk/grc/src/platforms/python
Previous by thread: [Commit-gnuradio] r10302 - gnuradio/branches/developers/pcreekmore/quantization/usrp/fpga/sdr_lib
Next by thread: [Commit-gnuradio] r10304 - gnuradio/trunk/grc/src/platforms/python
Index(es):
- Date
- Thread