commit-gnuradio
[Top][All Lists]
Advanced
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

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

From: michaelld
Subject: [Commit-gnuradio] r10298 - in gnuradio/branches/developers/michaelld/swigpythonargs: . gr-atsc/src/lib gr-audio-osx/src gr-audio-portaudio/src gr-audio-windows/src gr-comedi/src gr-gcell/src gr-msdd6000/src gr-video-sdl/src
Date: Fri, 23 Jan 2009 19:57:53 -0700 (MST) 
Author: michaelld
Date: 2009-01-23 19:57:51 -0700 (Fri, 23 Jan 2009)
New Revision: 10298

Modified:
   gnuradio/branches/developers/michaelld/swigpythonargs/Makefile.common
   
gnuradio/branches/developers/michaelld/swigpythonargs/gr-atsc/src/lib/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-gcell/src/Makefile.am
   
gnuradio/branches/developers/michaelld/swigpythonargs/gr-msdd6000/src/Makefile.am
   
gnuradio/branches/developers/michaelld/swigpythonargs/gr-video-sdl/src/Makefile.am
Log:
Initial changes to unify SWIG Python args in Makefile.am's.  Passes
distcheck on OSX using SWIG 1.3.36 and 1.3.37.  Still a little
clean-up to do, as well as testing by others.



Modified: gnuradio/branches/developers/michaelld/swigpythonargs/Makefile.common
===================================================================
--- gnuradio/branches/developers/michaelld/swigpythonargs/Makefile.common       
2009-01-23 23:34:33 UTC (rev 10297)
+++ gnuradio/branches/developers/michaelld/swigpythonargs/Makefile.common       
2009-01-24 02:57:51 UTC (rev 10298)
@@ -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
 # 
@@ -57,7 +57,8 @@
 
 # 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 (.)
+SWIGPYTHONFLAGS = -fvirtual -python -modern -keyword -w511 -outdir $(builddir)
 
 # How to link in the top-level omnithreads library from inside the tree
 OMNITHREAD_INCLUDES = @omnithread_INCLUDES@

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-23 23:34:33 UTC (rev 10297)
+++ 
gnuradio/branches/developers/michaelld/swigpythonargs/gr-atsc/src/lib/Makefile.am
   2009-01-24 02:57:51 UTC (rev 10298)
@@ -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,11 @@
 #  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)
+SWIGPYTHONARGS = $(SWIGPYTHONFLAGS) $(STD_DEFINES_AND_INCLUDES) \
+       $(WITH_SWIG_INCLUDES) $(WITH_INCLUDES)
 
+# $(PYTHON_CPPFLAGS)
+
 ALL_IFILES =                           \
        $(LOCAL_IFILES)                 \
        $(NON_LOCAL_IFILES)             
@@ -257,7 +259,7 @@
        -lstdc++                        
 
 atsc.cc atsc.py: atsc.i $(ALL_IFILES)
-       $(SWIG) $(SWIGCPPPYTHONARGS) -module atsc -o atsc.cc $(LOCAL_IFILES)
+       $(SWIG) $(SWIGPYTHONARGS) -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-osx/src/Makefile.am
===================================================================
--- 
gnuradio/branches/developers/michaelld/swigpythonargs/gr-audio-osx/src/Makefile.am
  2009-01-23 23:34:33 UTC (rev 10297)
+++ 
gnuradio/branches/developers/michaelld/swigpythonargs/gr-audio-osx/src/Makefile.am
  2009-01-24 02:57:51 UTC (rev 10298)
@@ -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.
 # 
@@ -50,9 +50,11 @@
 
 AM_CPPFLAGS = $(STD_DEFINES_AND_INCLUDES) $(PYTHON_CPPFLAGS) $(WITH_INCLUDES)
 
-SWIGCPPPYTHONARGS = -python $(PYTHON_CPPFLAGS) $(STD_DEFINES_AND_INCLUDES) \
-        $(WITH_SWIG_INCLUDES) $(WITH_INCLUDES)
+SWIGPYTHONARGS = $(SWIGPYTHONFLAGS) $(STD_DEFINES_AND_INCLUDES) \
+       $(WITH_SWIG_INCLUDES) $(WITH_INCLUDES)
 
+# $(PYTHON_CPPFLAGS)
+
 ourlib_LTLIBRARIES = _audio_osx.la
 
 _audio_osx_la_SOURCES =                \
@@ -82,7 +84,7 @@
 _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) $(SWIGPYTHONARGS) -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-23 23:34:33 UTC (rev 10297)
+++ 
gnuradio/branches/developers/michaelld/swigpythonargs/gr-audio-portaudio/src/Makefile.am
    2009-01-24 02:57:51 UTC (rev 10298)
@@ -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
 # 
@@ -53,8 +53,10 @@
        $(PORTAUDIO_CFLAGS) $(WITH_INCLUDES)
 
 SWIGPYTHONARGS = $(SWIGPYTHONFLAGS) $(STD_DEFINES_AND_INCLUDES) \
-       -I/usr/include $(WITH_SWIG_INCLUDES) $(WITH_INCLUDES)
+       $(WITH_SWIG_INCLUDES) $(WITH_INCLUDES)
 
+# -I/usr/include 
+
 ourlib_LTLIBRARIES = _audio_portaudio.la
 
 _audio_portaudio_la_SOURCES =          \

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-23 23:34:33 UTC (rev 10297)
+++ 
gnuradio/branches/developers/michaelld/swigpythonargs/gr-audio-windows/src/Makefile.am
      2009-01-24 02:57:51 UTC (rev 10298)
@@ -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
 # 
@@ -50,9 +50,11 @@
 
 AM_CPPFLAGS = $(STD_DEFINES_AND_INCLUDES) $(PYTHON_CPPFLAGS) $(WITH_INCLUDES)
 
-SWIGCPPPYTHONARGS = -python $(PYTHON_CPPFLAGS) $(STD_DEFINES_AND_INCLUDES) \
-        $(WITH_SWIG_INCLUDES)
+SWIGPYTHONARGS = $(SWIGPYTHONFLAGS) $(STD_DEFINES_AND_INCLUDES) \
+    $(WITH_SWIG_INCLUDES) $(WITH_INCLUDES)
 
+# $(PYTHON_CPPFLAGS)
+
 ourlib_LTLIBRARIES = _audio_windows.la
 
 _audio_windows_la_SOURCES =            \
@@ -80,7 +82,7 @@
 _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)
+       $(SWIG) $(SWIGPYTHONARGS) -module audio_windows -o audio_windows.cc 
$(LOCAL_IFILES)
 
 
 noinst_PYTHON = qa_audio_windows.py

Modified: 
gnuradio/branches/developers/michaelld/swigpythonargs/gr-comedi/src/Makefile.am
===================================================================
--- 
gnuradio/branches/developers/michaelld/swigpythonargs/gr-comedi/src/Makefile.am 
    2009-01-23 23:34:33 UTC (rev 10297)
+++ 
gnuradio/branches/developers/michaelld/swigpythonargs/gr-comedi/src/Makefile.am 
    2009-01-24 02:57:51 UTC (rev 10298)
@@ -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,8 +51,10 @@
 
 AM_CPPFLAGS = $(STD_DEFINES_AND_INCLUDES) $(PYTHON_CPPFLAGS) $(WITH_INCLUDES)
 
-SWIGCPPPYTHONARGS = -c++ -python $(PYTHON_CPPFLAGS) \
-       $(STD_DEFINES_AND_INCLUDES) $(WITH_SWIG_INCLUDES) $(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

Modified: 
gnuradio/branches/developers/michaelld/swigpythonargs/gr-gcell/src/Makefile.am
===================================================================
--- 
gnuradio/branches/developers/michaelld/swigpythonargs/gr-gcell/src/Makefile.am  
    2009-01-23 23:34:33 UTC (rev 10297)
+++ 
gnuradio/branches/developers/michaelld/swigpythonargs/gr-gcell/src/Makefile.am  
    2009-01-24 02:57:51 UTC (rev 10298)
@@ -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 @@
 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)
+SWIGPYTHONARGS = $(SWIGPYTHONFLAGS) $(STD_DEFINES_AND_INCLUDES) \
+       $(GCELL_INCLUDES) $(WITH_SWIG_INCLUDES) $(WITH_INCLUDES)
 
 # ----------------------------------------------------------------
 #                        The C++ blocks

Modified: 
gnuradio/branches/developers/michaelld/swigpythonargs/gr-msdd6000/src/Makefile.am
===================================================================
--- 
gnuradio/branches/developers/michaelld/swigpythonargs/gr-msdd6000/src/Makefile.am
   2009-01-23 23:34:33 UTC (rev 10297)
+++ 
gnuradio/branches/developers/michaelld/swigpythonargs/gr-msdd6000/src/Makefile.am
   2009-01-24 02:57:51 UTC (rev 10298)
@@ -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
 # 
@@ -41,7 +41,7 @@
 
 
 SWIGPYTHONARGS = $(SWIGPYTHONFLAGS) $(STD_DEFINES_AND_INCLUDES) \
-       -I/usr/include $(WITH_SWIG_INCLUDES) $(WITH_INCLUDES)
+       $(WITH_SWIG_INCLUDES) $(WITH_INCLUDES)
 
 NON_LOCAL_IFILES =                     \
        $(GNURADIO_I)

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-23 23:34:33 UTC (rev 10297)
+++ 
gnuradio/branches/developers/michaelld/swigpythonargs/gr-video-sdl/src/Makefile.am
  2009-01-24 02:57:51 UTC (rev 10298)
@@ -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,7 +51,8 @@
 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)
+SWIGCPPPYTHONARGS = $(SWIGPYTHONFLAGS) $(PYTHON_CPPFLAGS) \
+       $(STD_DEFINES_AND_INCLUDES) $(WITH_SWIG_INCLUDES) $(WITH_INCLUDES)
 
 ourlib_LTLIBRARIES = _video_sdl.la
reply via email to
[Prev in Thread] Current Thread [Next in Thread]