commit-gnuradio
[Top][All Lists]
Advanced

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

[Commit-gnuradio] r10589 - in gnuradio/branches/developers/michaelld/am_


From: michaelld
Subject: [Commit-gnuradio] r10589 - in gnuradio/branches/developers/michaelld/am_swig_4: . 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-gsm-fr-vocoder/src/lib gr-howto-write-a-block gr-howto-write-a-block/config 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: Thu, 12 Mar 2009 19:20:32 -0600 (MDT)

Author: michaelld
Date: 2009-03-12 19:20:31 -0600 (Thu, 12 Mar 2009)
New Revision: 10589

Added:
   
gnuradio/branches/developers/michaelld/am_swig_4/gr-howto-write-a-block/Makefile.swig
   
gnuradio/branches/developers/michaelld/am_swig_4/gr-howto-write-a-block/Makefile.swig.gen.t
   
gnuradio/branches/developers/michaelld/am_swig_4/gr-howto-write-a-block/src/lib/Makefile.swig.gen
Modified:
   gnuradio/branches/developers/michaelld/am_swig_4/Makefile.swig
   gnuradio/branches/developers/michaelld/am_swig_4/Makefile.swig.gen.t
   
gnuradio/branches/developers/michaelld/am_swig_4/gnuradio-core/src/lib/swig/Makefile.swig.gen
   gnuradio/branches/developers/michaelld/am_swig_4/gr-atsc/src/lib/Makefile.am
   
gnuradio/branches/developers/michaelld/am_swig_4/gr-atsc/src/lib/Makefile.swig.gen
   
gnuradio/branches/developers/michaelld/am_swig_4/gr-audio-alsa/src/Makefile.swig.gen
   
gnuradio/branches/developers/michaelld/am_swig_4/gr-audio-jack/src/Makefile.swig.gen
   
gnuradio/branches/developers/michaelld/am_swig_4/gr-audio-oss/src/Makefile.swig.gen
   
gnuradio/branches/developers/michaelld/am_swig_4/gr-audio-osx/src/Makefile.swig.gen
   
gnuradio/branches/developers/michaelld/am_swig_4/gr-audio-portaudio/src/Makefile.swig.gen
   
gnuradio/branches/developers/michaelld/am_swig_4/gr-audio-windows/src/Makefile.swig.gen
   
gnuradio/branches/developers/michaelld/am_swig_4/gr-comedi/src/Makefile.swig.gen
   
gnuradio/branches/developers/michaelld/am_swig_4/gr-cvsd-vocoder/src/lib/Makefile.swig.gen
   
gnuradio/branches/developers/michaelld/am_swig_4/gr-gcell/src/Makefile.swig.gen
   
gnuradio/branches/developers/michaelld/am_swig_4/gr-gsm-fr-vocoder/src/lib/Makefile.swig.gen
   
gnuradio/branches/developers/michaelld/am_swig_4/gr-howto-write-a-block/INSTALL
   
gnuradio/branches/developers/michaelld/am_swig_4/gr-howto-write-a-block/Makefile.common
   
gnuradio/branches/developers/michaelld/am_swig_4/gr-howto-write-a-block/config.guess
   
gnuradio/branches/developers/michaelld/am_swig_4/gr-howto-write-a-block/config.sub
   
gnuradio/branches/developers/michaelld/am_swig_4/gr-howto-write-a-block/config/gr_standalone.m4
   
gnuradio/branches/developers/michaelld/am_swig_4/gr-howto-write-a-block/src/lib/Makefile.am
   
gnuradio/branches/developers/michaelld/am_swig_4/gr-msdd6000/src/Makefile.swig.gen
   
gnuradio/branches/developers/michaelld/am_swig_4/gr-pager/src/Makefile.swig.gen
   
gnuradio/branches/developers/michaelld/am_swig_4/gr-qtgui/src/lib/Makefile.swig.gen
   
gnuradio/branches/developers/michaelld/am_swig_4/gr-radio-astronomy/src/lib/Makefile.swig.gen
   
gnuradio/branches/developers/michaelld/am_swig_4/gr-trellis/src/lib/Makefile.swig.gen
   
gnuradio/branches/developers/michaelld/am_swig_4/gr-usrp/src/Makefile.swig.gen
   
gnuradio/branches/developers/michaelld/am_swig_4/gr-usrp2/src/Makefile.swig.gen
   
gnuradio/branches/developers/michaelld/am_swig_4/gr-video-sdl/src/Makefile.swig.gen
   
gnuradio/branches/developers/michaelld/am_swig_4/usrp/host/swig/Makefile.swig.gen
Log:
Updated SWIG Makefile extension to include an empty rule for each
TOP_SWIG_IFILE -> if that file name is changed and the Makefile.am
updated, the SWIG rule will execute without erroring out and
regenerate the dependency file with the new name.  This change
required regenerating all of the Makefile.swig.gen files.

Fixed gr-howto-write-a-block to use the new SWIG stuff.



Modified: gnuradio/branches/developers/michaelld/am_swig_4/Makefile.swig
===================================================================
--- gnuradio/branches/developers/michaelld/am_swig_4/Makefile.swig      
2009-03-12 23:30:32 UTC (rev 10588)
+++ gnuradio/branches/developers/michaelld/am_swig_4/Makefile.swig      
2009-03-13 01:20:31 UTC (rev 10589)
@@ -78,7 +78,7 @@
 ## Makefile addition will be made only if either it does not exist or
 ## if the top-level template has been modified.
 
-generate-makefile-swig Makefile.swig.gen: $(top_srcdir)/Makefile.swig.gen.t
+generate-makefile-swig $(srcdir)/Makefile.swig.gen: 
$(top_srcdir)/Makefile.swig.gen.t
 ## recreate $(srcdir)/Makefile.swig.gen only if ...
        @do_recreate=0; \
        if test -f $(srcdir)/Makefile.swig.gen; then \
@@ -99,8 +99,6 @@
                for TFILE in $(TOP_SWIG_IFILES); do \
 ## retrieve just the filename, without path or extension
                        TNAME=`python -c "import os.path as op; (dN, fN) = 
op.split ('$$TFILE'); (fbN, fE) = op.splitext (fN); print fbN;"`; \
-## FIXME               TNAME=`echo $$TFILE | sed -e 's|\.i||g'`
-##                     echo "NAME = "$$TNAME; \
 ## Replace the @-named strings in the template Makefile for SWIG.
                        $(SED) -e 's|@NAME@|'$$TNAME'|g;' < 
$(top_srcdir)/Makefile.swig.gen.t >> $(srcdir)/Makefile.swig.gen; \
                        echo "" >> $(srcdir)/Makefile.swig.gen; \

Modified: gnuradio/branches/developers/michaelld/am_swig_4/Makefile.swig.gen.t
===================================================================
--- gnuradio/branches/developers/michaelld/am_swig_4/Makefile.swig.gen.t        
2009-03-12 23:30:32 UTC (rev 10588)
+++ gnuradio/branches/developers/michaelld/am_swig_4/Makefile.swig.gen.t        
2009-03-13 01:20:31 UTC (rev 10589)
@@ -233,13 +233,12 @@
 ##
        echo "" >> $(DEPDIR)/@address@hidden
 ##
-## (4) from the SWIG file, remove the first line (the target) as well
-##     as the onefor the current .i file; remove trailing " \" and " "
-##     from each line.  Append ":" to each line, followed by 2
-##     carriage returns, then append this to the end of the dependency
-##     file.
+## (4) from the SWIG file, remove the first line (the target); remove
+##     trailing " \" and " " from each line.  Append ":" to each line,
+##     followed by 2 carriage returns, then append this to the end of
+##     the dependency file.
 ##
-       $(SED) -e '1d;/@address@hidden/d;s, \\,,g;s, ,,g' < 
$(DEPDIR)/@address@hidden | \
+       $(SED) -e '1d;s, \\,,g;s, ,,g' < $(DEPDIR)/@address@hidden | \
                awk '{ printf "%s:\n\n", $$0 }' >> $(DEPDIR)/@address@hidden
 ##
 ## (5) remove the SWIG-generated file

Modified: 
gnuradio/branches/developers/michaelld/am_swig_4/gnuradio-core/src/lib/swig/Makefile.swig.gen
===================================================================
--- 
gnuradio/branches/developers/michaelld/am_swig_4/gnuradio-core/src/lib/swig/Makefile.swig.gen
       2009-03-12 23:30:32 UTC (rev 10588)
+++ 
gnuradio/branches/developers/michaelld/am_swig_4/gnuradio-core/src/lib/swig/Makefile.swig.gen
       2009-03-13 01:20:31 UTC (rev 10589)
@@ -233,13 +233,12 @@
 ##
        echo "" >> $(DEPDIR)/gnuradio_swig_py_runtime.d
 ##
-## (4) from the SWIG file, remove the first line (the target) as well
-##     as the onefor the current .i file; remove trailing " \" and " "
-##     from each line.  Append ":" to each line, followed by 2
-##     carriage returns, then append this to the end of the dependency
-##     file.
+## (4) from the SWIG file, remove the first line (the target); remove
+##     trailing " \" and " " from each line.  Append ":" to each line,
+##     followed by 2 carriage returns, then append this to the end of
+##     the dependency file.
 ##
-       $(SED) -e '1d;/gnuradio_swig_py_runtime.i/d;s, \\,,g;s, ,,g' < 
$(DEPDIR)/gnuradio_swig_py_runtime.Std | \
+       $(SED) -e '1d;s, \\,,g;s, ,,g' < $(DEPDIR)/gnuradio_swig_py_runtime.Std 
| \
                awk '{ printf "%s:\n\n", $$0 }' >> 
$(DEPDIR)/gnuradio_swig_py_runtime.d
 ##
 ## (5) remove the SWIG-generated file
@@ -493,13 +492,12 @@
 ##
        echo "" >> $(DEPDIR)/gnuradio_swig_py_general.d
 ##
-## (4) from the SWIG file, remove the first line (the target) as well
-##     as the onefor the current .i file; remove trailing " \" and " "
-##     from each line.  Append ":" to each line, followed by 2
-##     carriage returns, then append this to the end of the dependency
-##     file.
+## (4) from the SWIG file, remove the first line (the target); remove
+##     trailing " \" and " " from each line.  Append ":" to each line,
+##     followed by 2 carriage returns, then append this to the end of
+##     the dependency file.
 ##
-       $(SED) -e '1d;/gnuradio_swig_py_general.i/d;s, \\,,g;s, ,,g' < 
$(DEPDIR)/gnuradio_swig_py_general.Std | \
+       $(SED) -e '1d;s, \\,,g;s, ,,g' < $(DEPDIR)/gnuradio_swig_py_general.Std 
| \
                awk '{ printf "%s:\n\n", $$0 }' >> 
$(DEPDIR)/gnuradio_swig_py_general.d
 ##
 ## (5) remove the SWIG-generated file
@@ -753,13 +751,12 @@
 ##
        echo "" >> $(DEPDIR)/gnuradio_swig_py_gengen.d
 ##
-## (4) from the SWIG file, remove the first line (the target) as well
-##     as the onefor the current .i file; remove trailing " \" and " "
-##     from each line.  Append ":" to each line, followed by 2
-##     carriage returns, then append this to the end of the dependency
-##     file.
+## (4) from the SWIG file, remove the first line (the target); remove
+##     trailing " \" and " " from each line.  Append ":" to each line,
+##     followed by 2 carriage returns, then append this to the end of
+##     the dependency file.
 ##
-       $(SED) -e '1d;/gnuradio_swig_py_gengen.i/d;s, \\,,g;s, ,,g' < 
$(DEPDIR)/gnuradio_swig_py_gengen.Std | \
+       $(SED) -e '1d;s, \\,,g;s, ,,g' < $(DEPDIR)/gnuradio_swig_py_gengen.Std 
| \
                awk '{ printf "%s:\n\n", $$0 }' >> 
$(DEPDIR)/gnuradio_swig_py_gengen.d
 ##
 ## (5) remove the SWIG-generated file
@@ -1013,13 +1010,12 @@
 ##
        echo "" >> $(DEPDIR)/gnuradio_swig_py_filter.d
 ##
-## (4) from the SWIG file, remove the first line (the target) as well
-##     as the onefor the current .i file; remove trailing " \" and " "
-##     from each line.  Append ":" to each line, followed by 2
-##     carriage returns, then append this to the end of the dependency
-##     file.
+## (4) from the SWIG file, remove the first line (the target); remove
+##     trailing " \" and " " from each line.  Append ":" to each line,
+##     followed by 2 carriage returns, then append this to the end of
+##     the dependency file.
 ##
-       $(SED) -e '1d;/gnuradio_swig_py_filter.i/d;s, \\,,g;s, ,,g' < 
$(DEPDIR)/gnuradio_swig_py_filter.Std | \
+       $(SED) -e '1d;s, \\,,g;s, ,,g' < $(DEPDIR)/gnuradio_swig_py_filter.Std 
| \
                awk '{ printf "%s:\n\n", $$0 }' >> 
$(DEPDIR)/gnuradio_swig_py_filter.d
 ##
 ## (5) remove the SWIG-generated file
@@ -1273,13 +1269,12 @@
 ##
        echo "" >> $(DEPDIR)/gnuradio_swig_py_io.d
 ##
-## (4) from the SWIG file, remove the first line (the target) as well
-##     as the onefor the current .i file; remove trailing " \" and " "
-##     from each line.  Append ":" to each line, followed by 2
-##     carriage returns, then append this to the end of the dependency
-##     file.
+## (4) from the SWIG file, remove the first line (the target); remove
+##     trailing " \" and " " from each line.  Append ":" to each line,
+##     followed by 2 carriage returns, then append this to the end of
+##     the dependency file.
 ##
-       $(SED) -e '1d;/gnuradio_swig_py_io.i/d;s, \\,,g;s, ,,g' < 
$(DEPDIR)/gnuradio_swig_py_io.Std | \
+       $(SED) -e '1d;s, \\,,g;s, ,,g' < $(DEPDIR)/gnuradio_swig_py_io.Std | \
                awk '{ printf "%s:\n\n", $$0 }' >> 
$(DEPDIR)/gnuradio_swig_py_io.d
 ##
 ## (5) remove the SWIG-generated file

Modified: 
gnuradio/branches/developers/michaelld/am_swig_4/gr-atsc/src/lib/Makefile.am
===================================================================
--- 
gnuradio/branches/developers/michaelld/am_swig_4/gr-atsc/src/lib/Makefile.am    
    2009-03-12 23:30:32 UTC (rev 10588)
+++ 
gnuradio/branches/developers/michaelld/am_swig_4/gr-atsc/src/lib/Makefile.am    
    2009-03-13 01:20:31 UTC (rev 10589)
@@ -37,7 +37,7 @@
 
 # We build two libtool convenience libraries
 
-lib_LTLIBRARIES = libatsc.la libatsc-qa.la
+noinst_LTLIBRARIES = libatsc.la libatsc-qa.la
 
 # FIXME
 #      atsci_exp2_lp.cc                        \

Modified: 
gnuradio/branches/developers/michaelld/am_swig_4/gr-atsc/src/lib/Makefile.swig.gen
===================================================================
--- 
gnuradio/branches/developers/michaelld/am_swig_4/gr-atsc/src/lib/Makefile.swig.gen
  2009-03-12 23:30:32 UTC (rev 10588)
+++ 
gnuradio/branches/developers/michaelld/am_swig_4/gr-atsc/src/lib/Makefile.swig.gen
  2009-03-13 01:20:31 UTC (rev 10589)
@@ -233,13 +233,12 @@
 ##
        echo "" >> $(DEPDIR)/atsc.d
 ##
-## (4) from the SWIG file, remove the first line (the target) as well
-##     as the onefor the current .i file; remove trailing " \" and " "
-##     from each line.  Append ":" to each line, followed by 2
-##     carriage returns, then append this to the end of the dependency
-##     file.
+## (4) from the SWIG file, remove the first line (the target); remove
+##     trailing " \" and " " from each line.  Append ":" to each line,
+##     followed by 2 carriage returns, then append this to the end of
+##     the dependency file.
 ##
-       $(SED) -e '1d;/atsc.i/d;s, \\,,g;s, ,,g' < $(DEPDIR)/atsc.Std | \
+       $(SED) -e '1d;s, \\,,g;s, ,,g' < $(DEPDIR)/atsc.Std | \
                awk '{ printf "%s:\n\n", $$0 }' >> $(DEPDIR)/atsc.d
 ##
 ## (5) remove the SWIG-generated file

Modified: 
gnuradio/branches/developers/michaelld/am_swig_4/gr-audio-alsa/src/Makefile.swig.gen
===================================================================
--- 
gnuradio/branches/developers/michaelld/am_swig_4/gr-audio-alsa/src/Makefile.swig.gen
        2009-03-12 23:30:32 UTC (rev 10588)
+++ 
gnuradio/branches/developers/michaelld/am_swig_4/gr-audio-alsa/src/Makefile.swig.gen
        2009-03-13 01:20:31 UTC (rev 10589)
@@ -233,13 +233,12 @@
 ##
        echo "" >> $(DEPDIR)/audio_alsa.d
 ##
-## (4) from the SWIG file, remove the first line (the target) as well
-##     as the onefor the current .i file; remove trailing " \" and " "
-##     from each line.  Append ":" to each line, followed by 2
-##     carriage returns, then append this to the end of the dependency
-##     file.
+## (4) from the SWIG file, remove the first line (the target); remove
+##     trailing " \" and " " from each line.  Append ":" to each line,
+##     followed by 2 carriage returns, then append this to the end of
+##     the dependency file.
 ##
-       $(SED) -e '1d;/audio_alsa.i/d;s, \\,,g;s, ,,g' < 
$(DEPDIR)/audio_alsa.Std | \
+       $(SED) -e '1d;s, \\,,g;s, ,,g' < $(DEPDIR)/audio_alsa.Std | \
                awk '{ printf "%s:\n\n", $$0 }' >> $(DEPDIR)/audio_alsa.d
 ##
 ## (5) remove the SWIG-generated file

Modified: 
gnuradio/branches/developers/michaelld/am_swig_4/gr-audio-jack/src/Makefile.swig.gen
===================================================================
--- 
gnuradio/branches/developers/michaelld/am_swig_4/gr-audio-jack/src/Makefile.swig.gen
        2009-03-12 23:30:32 UTC (rev 10588)
+++ 
gnuradio/branches/developers/michaelld/am_swig_4/gr-audio-jack/src/Makefile.swig.gen
        2009-03-13 01:20:31 UTC (rev 10589)
@@ -233,13 +233,12 @@
 ##
        echo "" >> $(DEPDIR)/audio_jack.d
 ##
-## (4) from the SWIG file, remove the first line (the target) as well
-##     as the onefor the current .i file; remove trailing " \" and " "
-##     from each line.  Append ":" to each line, followed by 2
-##     carriage returns, then append this to the end of the dependency
-##     file.
+## (4) from the SWIG file, remove the first line (the target); remove
+##     trailing " \" and " " from each line.  Append ":" to each line,
+##     followed by 2 carriage returns, then append this to the end of
+##     the dependency file.
 ##
-       $(SED) -e '1d;/audio_jack.i/d;s, \\,,g;s, ,,g' < 
$(DEPDIR)/audio_jack.Std | \
+       $(SED) -e '1d;s, \\,,g;s, ,,g' < $(DEPDIR)/audio_jack.Std | \
                awk '{ printf "%s:\n\n", $$0 }' >> $(DEPDIR)/audio_jack.d
 ##
 ## (5) remove the SWIG-generated file

Modified: 
gnuradio/branches/developers/michaelld/am_swig_4/gr-audio-oss/src/Makefile.swig.gen
===================================================================
--- 
gnuradio/branches/developers/michaelld/am_swig_4/gr-audio-oss/src/Makefile.swig.gen
 2009-03-12 23:30:32 UTC (rev 10588)
+++ 
gnuradio/branches/developers/michaelld/am_swig_4/gr-audio-oss/src/Makefile.swig.gen
 2009-03-13 01:20:31 UTC (rev 10589)
@@ -233,13 +233,12 @@
 ##
        echo "" >> $(DEPDIR)/audio_oss.d
 ##
-## (4) from the SWIG file, remove the first line (the target) as well
-##     as the onefor the current .i file; remove trailing " \" and " "
-##     from each line.  Append ":" to each line, followed by 2
-##     carriage returns, then append this to the end of the dependency
-##     file.
+## (4) from the SWIG file, remove the first line (the target); remove
+##     trailing " \" and " " from each line.  Append ":" to each line,
+##     followed by 2 carriage returns, then append this to the end of
+##     the dependency file.
 ##
-       $(SED) -e '1d;/audio_oss.i/d;s, \\,,g;s, ,,g' < $(DEPDIR)/audio_oss.Std 
| \
+       $(SED) -e '1d;s, \\,,g;s, ,,g' < $(DEPDIR)/audio_oss.Std | \
                awk '{ printf "%s:\n\n", $$0 }' >> $(DEPDIR)/audio_oss.d
 ##
 ## (5) remove the SWIG-generated file

Modified: 
gnuradio/branches/developers/michaelld/am_swig_4/gr-audio-osx/src/Makefile.swig.gen
===================================================================
--- 
gnuradio/branches/developers/michaelld/am_swig_4/gr-audio-osx/src/Makefile.swig.gen
 2009-03-12 23:30:32 UTC (rev 10588)
+++ 
gnuradio/branches/developers/michaelld/am_swig_4/gr-audio-osx/src/Makefile.swig.gen
 2009-03-13 01:20:31 UTC (rev 10589)
@@ -233,13 +233,12 @@
 ##
        echo "" >> $(DEPDIR)/audio_osx.d
 ##
-## (4) from the SWIG file, remove the first line (the target) as well
-##     as the onefor the current .i file; remove trailing " \" and " "
-##     from each line.  Append ":" to each line, followed by 2
-##     carriage returns, then append this to the end of the dependency
-##     file.
+## (4) from the SWIG file, remove the first line (the target); remove
+##     trailing " \" and " " from each line.  Append ":" to each line,
+##     followed by 2 carriage returns, then append this to the end of
+##     the dependency file.
 ##
-       $(SED) -e '1d;/audio_osx.i/d;s, \\,,g;s, ,,g' < $(DEPDIR)/audio_osx.Std 
| \
+       $(SED) -e '1d;s, \\,,g;s, ,,g' < $(DEPDIR)/audio_osx.Std | \
                awk '{ printf "%s:\n\n", $$0 }' >> $(DEPDIR)/audio_osx.d
 ##
 ## (5) remove the SWIG-generated file

Modified: 
gnuradio/branches/developers/michaelld/am_swig_4/gr-audio-portaudio/src/Makefile.swig.gen
===================================================================
--- 
gnuradio/branches/developers/michaelld/am_swig_4/gr-audio-portaudio/src/Makefile.swig.gen
   2009-03-12 23:30:32 UTC (rev 10588)
+++ 
gnuradio/branches/developers/michaelld/am_swig_4/gr-audio-portaudio/src/Makefile.swig.gen
   2009-03-13 01:20:31 UTC (rev 10589)
@@ -233,13 +233,12 @@
 ##
        echo "" >> $(DEPDIR)/audio_portaudio.d
 ##
-## (4) from the SWIG file, remove the first line (the target) as well
-##     as the onefor the current .i file; remove trailing " \" and " "
-##     from each line.  Append ":" to each line, followed by 2
-##     carriage returns, then append this to the end of the dependency
-##     file.
+## (4) from the SWIG file, remove the first line (the target); remove
+##     trailing " \" and " " from each line.  Append ":" to each line,
+##     followed by 2 carriage returns, then append this to the end of
+##     the dependency file.
 ##
-       $(SED) -e '1d;/audio_portaudio.i/d;s, \\,,g;s, ,,g' < 
$(DEPDIR)/audio_portaudio.Std | \
+       $(SED) -e '1d;s, \\,,g;s, ,,g' < $(DEPDIR)/audio_portaudio.Std | \
                awk '{ printf "%s:\n\n", $$0 }' >> $(DEPDIR)/audio_portaudio.d
 ##
 ## (5) remove the SWIG-generated file

Modified: 
gnuradio/branches/developers/michaelld/am_swig_4/gr-audio-windows/src/Makefile.swig.gen
===================================================================
--- 
gnuradio/branches/developers/michaelld/am_swig_4/gr-audio-windows/src/Makefile.swig.gen
     2009-03-12 23:30:32 UTC (rev 10588)
+++ 
gnuradio/branches/developers/michaelld/am_swig_4/gr-audio-windows/src/Makefile.swig.gen
     2009-03-13 01:20:31 UTC (rev 10589)
@@ -233,13 +233,12 @@
 ##
        echo "" >> $(DEPDIR)/audio_windows.d
 ##
-## (4) from the SWIG file, remove the first line (the target) as well
-##     as the onefor the current .i file; remove trailing " \" and " "
-##     from each line.  Append ":" to each line, followed by 2
-##     carriage returns, then append this to the end of the dependency
-##     file.
+## (4) from the SWIG file, remove the first line (the target); remove
+##     trailing " \" and " " from each line.  Append ":" to each line,
+##     followed by 2 carriage returns, then append this to the end of
+##     the dependency file.
 ##
-       $(SED) -e '1d;/audio_windows.i/d;s, \\,,g;s, ,,g' < 
$(DEPDIR)/audio_windows.Std | \
+       $(SED) -e '1d;s, \\,,g;s, ,,g' < $(DEPDIR)/audio_windows.Std | \
                awk '{ printf "%s:\n\n", $$0 }' >> $(DEPDIR)/audio_windows.d
 ##
 ## (5) remove the SWIG-generated file

Modified: 
gnuradio/branches/developers/michaelld/am_swig_4/gr-comedi/src/Makefile.swig.gen
===================================================================
--- 
gnuradio/branches/developers/michaelld/am_swig_4/gr-comedi/src/Makefile.swig.gen
    2009-03-12 23:30:32 UTC (rev 10588)
+++ 
gnuradio/branches/developers/michaelld/am_swig_4/gr-comedi/src/Makefile.swig.gen
    2009-03-13 01:20:31 UTC (rev 10589)
@@ -233,13 +233,12 @@
 ##
        echo "" >> $(DEPDIR)/comedi.d
 ##
-## (4) from the SWIG file, remove the first line (the target) as well
-##     as the onefor the current .i file; remove trailing " \" and " "
-##     from each line.  Append ":" to each line, followed by 2
-##     carriage returns, then append this to the end of the dependency
-##     file.
+## (4) from the SWIG file, remove the first line (the target); remove
+##     trailing " \" and " " from each line.  Append ":" to each line,
+##     followed by 2 carriage returns, then append this to the end of
+##     the dependency file.
 ##
-       $(SED) -e '1d;/comedi.i/d;s, \\,,g;s, ,,g' < $(DEPDIR)/comedi.Std | \
+       $(SED) -e '1d;s, \\,,g;s, ,,g' < $(DEPDIR)/comedi.Std | \
                awk '{ printf "%s:\n\n", $$0 }' >> $(DEPDIR)/comedi.d
 ##
 ## (5) remove the SWIG-generated file

Modified: 
gnuradio/branches/developers/michaelld/am_swig_4/gr-cvsd-vocoder/src/lib/Makefile.swig.gen
===================================================================
--- 
gnuradio/branches/developers/michaelld/am_swig_4/gr-cvsd-vocoder/src/lib/Makefile.swig.gen
  2009-03-12 23:30:32 UTC (rev 10588)
+++ 
gnuradio/branches/developers/michaelld/am_swig_4/gr-cvsd-vocoder/src/lib/Makefile.swig.gen
  2009-03-13 01:20:31 UTC (rev 10589)
@@ -233,13 +233,12 @@
 ##
        echo "" >> $(DEPDIR)/cvsd_vocoder.d
 ##
-## (4) from the SWIG file, remove the first line (the target) as well
-##     as the onefor the current .i file; remove trailing " \" and " "
-##     from each line.  Append ":" to each line, followed by 2
-##     carriage returns, then append this to the end of the dependency
-##     file.
+## (4) from the SWIG file, remove the first line (the target); remove
+##     trailing " \" and " " from each line.  Append ":" to each line,
+##     followed by 2 carriage returns, then append this to the end of
+##     the dependency file.
 ##
-       $(SED) -e '1d;/cvsd_vocoder.i/d;s, \\,,g;s, ,,g' < 
$(DEPDIR)/cvsd_vocoder.Std | \
+       $(SED) -e '1d;s, \\,,g;s, ,,g' < $(DEPDIR)/cvsd_vocoder.Std | \
                awk '{ printf "%s:\n\n", $$0 }' >> $(DEPDIR)/cvsd_vocoder.d
 ##
 ## (5) remove the SWIG-generated file

Modified: 
gnuradio/branches/developers/michaelld/am_swig_4/gr-gcell/src/Makefile.swig.gen
===================================================================
--- 
gnuradio/branches/developers/michaelld/am_swig_4/gr-gcell/src/Makefile.swig.gen 
    2009-03-12 23:30:32 UTC (rev 10588)
+++ 
gnuradio/branches/developers/michaelld/am_swig_4/gr-gcell/src/Makefile.swig.gen 
    2009-03-13 01:20:31 UTC (rev 10589)
@@ -233,13 +233,12 @@
 ##
        echo "" >> $(DEPDIR)/gcell.d
 ##
-## (4) from the SWIG file, remove the first line (the target) as well
-##     as the onefor the current .i file; remove trailing " \" and " "
-##     from each line.  Append ":" to each line, followed by 2
-##     carriage returns, then append this to the end of the dependency
-##     file.
+## (4) from the SWIG file, remove the first line (the target); remove
+##     trailing " \" and " " from each line.  Append ":" to each line,
+##     followed by 2 carriage returns, then append this to the end of
+##     the dependency file.
 ##
-       $(SED) -e '1d;/gcell.i/d;s, \\,,g;s, ,,g' < $(DEPDIR)/gcell.Std | \
+       $(SED) -e '1d;s, \\,,g;s, ,,g' < $(DEPDIR)/gcell.Std | \
                awk '{ printf "%s:\n\n", $$0 }' >> $(DEPDIR)/gcell.d
 ##
 ## (5) remove the SWIG-generated file

Modified: 
gnuradio/branches/developers/michaelld/am_swig_4/gr-gsm-fr-vocoder/src/lib/Makefile.swig.gen
===================================================================
--- 
gnuradio/branches/developers/michaelld/am_swig_4/gr-gsm-fr-vocoder/src/lib/Makefile.swig.gen
        2009-03-12 23:30:32 UTC (rev 10588)
+++ 
gnuradio/branches/developers/michaelld/am_swig_4/gr-gsm-fr-vocoder/src/lib/Makefile.swig.gen
        2009-03-13 01:20:31 UTC (rev 10589)
@@ -233,13 +233,12 @@
 ##
        echo "" >> $(DEPDIR)/gsm_full_rate.d
 ##
-## (4) from the SWIG file, remove the first line (the target) as well
-##     as the onefor the current .i file; remove trailing " \" and " "
-##     from each line.  Append ":" to each line, followed by 2
-##     carriage returns, then append this to the end of the dependency
-##     file.
+## (4) from the SWIG file, remove the first line (the target); remove
+##     trailing " \" and " " from each line.  Append ":" to each line,
+##     followed by 2 carriage returns, then append this to the end of
+##     the dependency file.
 ##
-       $(SED) -e '1d;/gsm_full_rate.i/d;s, \\,,g;s, ,,g' < 
$(DEPDIR)/gsm_full_rate.Std | \
+       $(SED) -e '1d;s, \\,,g;s, ,,g' < $(DEPDIR)/gsm_full_rate.Std | \
                awk '{ printf "%s:\n\n", $$0 }' >> $(DEPDIR)/gsm_full_rate.d
 ##
 ## (5) remove the SWIG-generated file

Modified: 
gnuradio/branches/developers/michaelld/am_swig_4/gr-howto-write-a-block/INSTALL
===================================================================
--- 
gnuradio/branches/developers/michaelld/am_swig_4/gr-howto-write-a-block/INSTALL 
    2009-03-12 23:30:32 UTC (rev 10588)
+++ 
gnuradio/branches/developers/michaelld/am_swig_4/gr-howto-write-a-block/INSTALL 
    2009-03-13 01:20:31 UTC (rev 10589)
@@ -2,15 +2,15 @@
 *************************
 
 Copyright (C) 1994, 1995, 1996, 1999, 2000, 2001, 2002, 2004, 2005,
-2006, 2007 Free Software Foundation, Inc.
+2006, 2007, 2008 Free Software Foundation, Inc.
 
-This file is free documentation; the Free Software Foundation gives
+   This file is free documentation; the Free Software Foundation gives
 unlimited permission to copy, distribute and modify it.
 
 Basic Installation
 ==================
 
-Briefly, the shell commands `./configure; make; make install' should
+   Briefly, the shell commands `./configure; make; make install' should
 configure, build, and install this package.  The following
 more-detailed instructions are generic; see the `README' file for
 instructions specific to this package.
@@ -73,9 +73,9 @@
 Compilers and Options
 =====================
 
-Some systems require unusual options for compilation or linking that the
-`configure' script does not know about.  Run `./configure --help' for
-details on some of the pertinent environment variables.
+   Some systems require unusual options for compilation or linking that
+the `configure' script does not know about.  Run `./configure --help'
+for details on some of the pertinent environment variables.
 
    You can give `configure' initial values for configuration parameters
 by setting variables in the command line or in the environment.  Here
@@ -88,7 +88,7 @@
 Compiling For Multiple Architectures
 ====================================
 
-You can compile the package for more than one kind of computer at the
+   You can compile the package for more than one kind of computer at the
 same time, by placing the object files for each architecture in their
 own directory.  To do this, you can use GNU `make'.  `cd' to the
 directory where you want the object files and executables to go and run
@@ -100,10 +100,24 @@
 installed the package for one architecture, use `make distclean' before
 reconfiguring for another architecture.
 
+   On MacOS X 10.5 and later systems, you can create libraries and
+executables that work on multiple system types--known as "fat" or
+"universal" binaries--by specifying multiple `-arch' options to the
+compiler but only a single `-arch' option to the preprocessor.  Like
+this:
+
+     ./configure CC="gcc -arch i386 -arch x86_64 -arch ppc -arch ppc64" \
+                 CXX="g++ -arch i386 -arch x86_64 -arch ppc -arch ppc64" \
+                 CPP="gcc -E" CXXCPP="g++ -E"
+
+   This is not guaranteed to produce working output in all cases, you
+may have to build one architecture at a time and combine the results
+using the `lipo' tool if you have problems.
+
 Installation Names
 ==================
 
-By default, `make install' installs the package's commands under
+   By default, `make install' installs the package's commands under
 `/usr/local/bin', include files under `/usr/local/include', etc.  You
 can specify an installation prefix other than `/usr/local' by giving
 `configure' the option `--prefix=PREFIX'.
@@ -126,7 +140,7 @@
 Optional Features
 =================
 
-Some packages pay attention to `--enable-FEATURE' options to
+   Some packages pay attention to `--enable-FEATURE' options to
 `configure', where FEATURE indicates an optional part of the package.
 They may also pay attention to `--with-PACKAGE' options, where PACKAGE
 is something like `gnu-as' or `x' (for the X Window System).  The
@@ -138,14 +152,36 @@
 you can use the `configure' options `--x-includes=DIR' and
 `--x-libraries=DIR' to specify their locations.
 
+Particular systems
+==================
+
+   On HP-UX, the default C compiler is not ANSI C compatible.  If GNU
+CC is not installed, it is recommended to use the following options in
+order to use an ANSI C compiler:
+
+     ./configure CC="cc -Ae"
+
+and if that doesn't work, install pre-built binaries of GCC for HP-UX.
+
+   On OSF/1 a.k.a. Tru64, some versions of the default C compiler cannot
+parse its `<wchar.h>' header file.  The option `-nodtk' can be used as
+a workaround.  If GNU CC is not installed, it is therefore recommended
+to try
+
+     ./configure CC="cc"
+
+and if that doesn't work, try
+
+     ./configure CC="cc -nodtk"
+
 Specifying the System Type
 ==========================
 
-There may be some features `configure' cannot figure out automatically,
-but needs to determine by the type of machine the package will run on.
-Usually, assuming the package is built to be run on the _same_
-architectures, `configure' can figure that out, but if it prints a
-message saying it cannot guess the machine type, give it the
+   There may be some features `configure' cannot figure out
+automatically, but needs to determine by the type of machine the package
+will run on.  Usually, assuming the package is built to be run on the
+_same_ architectures, `configure' can figure that out, but if it prints
+a message saying it cannot guess the machine type, give it the
 `--build=TYPE' option.  TYPE can either be a short name for the system
 type, such as `sun4', or a canonical name which has the form:
 
@@ -171,9 +207,9 @@
 Sharing Defaults
 ================
 
-If you want to set default values for `configure' scripts to share, you
-can create a site shell script called `config.site' that gives default
-values for variables like `CC', `cache_file', and `prefix'.
+   If you want to set default values for `configure' scripts to share,
+you can create a site shell script called `config.site' that gives
+default values for variables like `CC', `cache_file', and `prefix'.
 `configure' looks for `PREFIX/share/config.site' if it exists, then
 `PREFIX/etc/config.site' if it exists.  Or, you can set the
 `CONFIG_SITE' environment variable to the location of the site script.
@@ -182,7 +218,7 @@
 Defining Variables
 ==================
 
-Variables not defined in a site shell script can be set in the
+   Variables not defined in a site shell script can be set in the
 environment passed to `configure'.  However, some packages may run
 configure again during the build, and the customized values of these
 variables may be lost.  In order to avoid this problem, you should set
@@ -201,12 +237,20 @@
 `configure' Invocation
 ======================
 
-`configure' recognizes the following options to control how it operates.
+   `configure' recognizes the following options to control how it
+operates.
 
 `--help'
 `-h'
-     Print a summary of the options to `configure', and exit.
+     Print a summary of all of the options to `configure', and exit.
 
+`--help=short'
+`--help=recursive'
+     Print a summary of the options unique to this package's
+     `configure', and exit.  The `short' variant lists options used
+     only in the top level, while the `recursive' variant lists options
+     also present in any nested packages.
+
 `--version'
 `-V'
      Print the version of Autoconf used to generate the `configure'
@@ -232,6 +276,16 @@
      Look for the package's source code in directory DIR.  Usually
      `configure' can determine that directory automatically.
 
+`--prefix=DIR'
+     Use DIR as the installation prefix.  *Note Installation Names::
+     for more details, including other options available for fine-tuning
+     the installation locations.
+
+`--no-create'
+`-n'
+     Run the configure checks, but stop before creating any output
+     files.
+
 `configure' also accepts some other, not widely useful, options.  Run
 `configure --help' for more details.
 

Modified: 
gnuradio/branches/developers/michaelld/am_swig_4/gr-howto-write-a-block/Makefile.common
===================================================================
--- 
gnuradio/branches/developers/michaelld/am_swig_4/gr-howto-write-a-block/Makefile.common
     2009-03-12 23:30:32 UTC (rev 10588)
+++ 
gnuradio/branches/developers/michaelld/am_swig_4/gr-howto-write-a-block/Makefile.common
     2009-03-13 01:20:31 UTC (rev 10589)
@@ -1,6 +1,6 @@
 # -*- Makefile -*-
 #
-# Copyright 2004,2006 Free Software Foundation, Inc.
+# Copyright 2004,2006,2009 Free Software Foundation, Inc.
 # 
 # This file is part of GNU Radio
 # 
@@ -20,11 +20,15 @@
 # Boston, MA 02110-1301, USA.
 # 
 
+AM_CXXFLAGS = @autoconf_default_CXXFLAGS@
+
 # includes
-grincludedir   = $(includedir)/gnuradio
+grincludedir = $(includedir)/gnuradio
+WITH_INCLUDES = -I$(grincludedir)
 
 # swig includes 
 swigincludedir = $(grincludedir)/swig
+WITH_SWIG_INCLUDES = -I$(swigincludedir)
 
 # Install this stuff in the appropriate subdirectory
 # This usually ends up at:
@@ -33,11 +37,18 @@
 grpythondir = $(pythondir)/gnuradio
 grpyexecdir = $(pyexecdir)/gnuradio
 
-# swig flags
-SWIGPYTHONFLAGS = -fvirtual -python -modern
-SWIGGRFLAGS = -I$(GNURADIO_CORE_INCLUDEDIR)/swig -I$(GNURADIO_CORE_INCLUDEDIR)
-
 # Don't assume that make predefines $(RM), because BSD make does
 # not. 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
+
+# Other common defines; use "+=" to add to these
+STAMPS =
+MOSTLYCLEANFILES = $(BUILT_SOURCES) $(STAMPS) *.pyc *.pyo *~ *.tmp *.loT
+
+# Don't distribute the files defined in the variable 'no_dist_files'
+dist-hook:
+       @for file in $(no_dist_files); do \
+               echo $(RM) $(distdir)/$$file; \
+               $(RM) $(distdir)/$$file; \
+       done;

Added: 
gnuradio/branches/developers/michaelld/am_swig_4/gr-howto-write-a-block/Makefile.swig
===================================================================
--- 
gnuradio/branches/developers/michaelld/am_swig_4/gr-howto-write-a-block/Makefile.swig
                               (rev 0)
+++ 
gnuradio/branches/developers/michaelld/am_swig_4/gr-howto-write-a-block/Makefile.swig
       2009-03-13 01:20:31 UTC (rev 10589)
@@ -0,0 +1,117 @@
+# -*- Makefile -*-
+#
+# Copyright 2009 Free Software Foundation, Inc.
+# 
+# This file is part of GNU Radio
+# 
+# GNU Radio is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 3, or (at your option)
+# any later version.
+# 
+# GNU Radio is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+# 
+# You should have received a copy of the GNU General Public License
+# along with GNU Radio; see the file COPYING.  If not, write to
+# the Free Software Foundation, Inc., 51 Franklin Street,
+# Boston, MA 02110-1301, USA.
+# 
+
+## This makefile should be included using 
+##     include $(top_srcdir)/Makefile.swig
+## in Makefile.am's which require SWIG wrapping / compilation.
+## For just installing .i files, this Makefile is not required.
+
+## swig flags
+## -w511 turns off keyword argument warning
+## "-outdir $(builddir)" writes all generated output files to
+##   the local builddir (which should always be '.')
+##   In some older autotools, $(builddir) is not defined, so
+##   just use '.' instead.
+
+SWIG_PYTHON_FLAGS =    \
+       -fvirtual       \
+       -python         \
+       -modern         \
+       -keyword        \
+       -w511           \
+       -outdir .
+
+## standard swig flags used by most components
+
+STD_SWIG_PYTHON_ARGS =                         \
+       $(SWIG_PYTHON_FLAGS)                    \
+       $(STD_DEFINES_AND_INCLUDES)             \
+       $(WITH_SWIG_INCLUDES)                   \
+       $(WITH_INCLUDES)
+
+## standard SWIG LD flags for library creation
+
+STD_SWIG_LA_LD_FLAGS =         \
+       $(PYTHON_LDFLAGS)       \
+       -module                 \
+       -avoid-version          \
+       $(NO_UNDEFINED)
+
+## standard SWIG library additions for library creation
+
+STD_SWIG_LA_LIB_ADD =                  \
+       -lstdc++
+
+## standard SWIG CXXFLAGS
+## This allows for code to be compiled with "-O1" instead of "-g -O2"
+## for some systems, avoiding some optimization issues.
+
+STD_SWIG_CXX_FLAGS = @swig_CXXFLAGS@
+
+## SWIG suffix for automake to know about
+
+SUFFIXES = .i
+
+## Create $(srcdir)/Makefile.swig.gen, containing all of the rules
+## for running SWIG to generate or re-generate outputs.  SWIG file
+## names are to be defined in TOP_SWIG_IFILES, and must include the
+## full path to the file and full filename including extension.  This
+## Makefile addition will be made only if either it does not exist or
+## if the top-level template has been modified.
+
+generate-makefile-swig $(srcdir)/Makefile.swig.gen: 
$(top_srcdir)/Makefile.swig.gen.t
+## recreate $(srcdir)/Makefile.swig.gen only if ...
+       @do_recreate=0; \
+       if test -f $(srcdir)/Makefile.swig.gen; then \
+## the file exists and can be removed; or ...
+               if $(RM) $(srcdir)/Makefile.swig.gen 2>/dev/null; then \
+                       if touch $(srcdir)/Makefile.swig.gen 2>/dev/null; then \
+                               do_recreate=1; \
+                       fi; \
+               fi; \
+       else \
+## the file doesn't exist, but can be created (e.g., by touching it).
+               if touch $(srcdir)/Makefile.swig.gen 2>/dev/null; then \
+                       do_recreate=1; \
+               fi; \
+       fi; \
+       if test "$$do_recreate" == "1"; then \
+               echo "Regenerating $(srcdir)/Makefile.swig.gen"; \
+               for TFILE in $(TOP_SWIG_IFILES); do \
+## retrieve just the filename, without path or extension
+                       TNAME=`python -c "import os.path as op; (dN, fN) = 
op.split ('$$TFILE'); (fbN, fE) = op.splitext (fN); print fbN;"`; \
+## Replace the @-named strings in the template Makefile for SWIG.
+                       $(SED) -e 's|@NAME@|'$$TNAME'|g;' < 
$(top_srcdir)/Makefile.swig.gen.t >> $(srcdir)/Makefile.swig.gen; \
+                       echo "" >> $(srcdir)/Makefile.swig.gen; \
+               done; \
+       else \
+               echo "Cannot recreate $(srcdir)/Makefile.swig.gen because the 
directory or file is write-protected."; \
+               exit -1; \
+       fi;
+
+swig_built_sources =
+
+## include the built Makefile.swig.gen, always the one from the
+## srcdir; this must be included as the last item, because it depends
+## on variables defined above.
+
+include $(srcdir)/Makefile.swig.gen

Added: 
gnuradio/branches/developers/michaelld/am_swig_4/gr-howto-write-a-block/Makefile.swig.gen.t
===================================================================
--- 
gnuradio/branches/developers/michaelld/am_swig_4/gr-howto-write-a-block/Makefile.swig.gen.t
                         (rev 0)
+++ 
gnuradio/branches/developers/michaelld/am_swig_4/gr-howto-write-a-block/Makefile.swig.gen.t
 2009-03-13 01:20:31 UTC (rev 10589)
@@ -0,0 +1,258 @@
+# -*- Makefile -*-
+#
+# Copyright 2009 Free Software Foundation, Inc.
+# 
+# This file is part of GNU Radio
+# 
+# GNU Radio is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 3, or (at your option)
+# any later version.
+# 
+# GNU Radio is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+# 
+# You should have received a copy of the GNU General Public License
+# along with GNU Radio; see the file COPYING.  If not, write to
+# the Free Software Foundation, Inc., 51 Franklin Street,
+# Boston, MA 02110-1301, USA.
+# 
+
+# Makefile.swig.gen for @address@hidden
+
+## Default install locations for these files:
+##
+## Default location for the Python directory is:
+##  ${prefix}/lib/python${python_version}/site-packages/[category]/@NAME@
+## Default location for the Python exec directory is:
+##  ${exec_prefix}/lib/python${python_version}/site-packages/[category]/@NAME@
+##
+## The following can be overloaded to change the install location, but
+## this has to be done in the including Makefile.am -before-
+## Makefile.swig is included.
+
address@hidden@_pythondir_category ?= gnuradio/@NAME@
address@hidden@_pylibdir_category ?= $(@address@hidden)
address@hidden@_pythondir = $(pythondir)/$(@address@hidden)
address@hidden@_pylibdir = $(pyexecdir)/$(@address@hidden)
+
+## SWIG headers are always installed into the same directory.
+
address@hidden@_swigincludedir = $(swigincludedir)
+
+## This is a template file for a "generated" Makefile addition (in
+## this case, "Makefile.swig.gen").  By including the top-level
+## Makefile.swig, this file will be used to generate the SWIG
+## dependencies.  Assign the variable TOP_SWIG_FILES to be the list of
+## SWIG .i files to generated wrappings for; there can be more than 1
+## so long as the names are unique (no sorting is done on the
+## TOP_SWIG_FILES list). This file explicitly assumes that a SWIG .i
+## file will generate .cc, .py, and possibly .h files -- meaning that
+## all of these files will have the same base name (that provided for
+## the SWIG .i file).
+##
+## This code is setup to ensure parallel MAKE ("-j" or "-jN") does the
+## right thing.  For more info, see <
+## http://sources.redhat.com/automake/automake.html#Multiple-Outputs >
+
+## Stamps used to ensure parallel make does the right thing.  These
+## are removed by "make clean", but otherwise unused except during the
+## parallel built.  These will not be included in a tarball, because
+## the SWIG-generated files will be removed from the distribution.
+
+STAMPS += $(DEPDIR)/@address@hidden
+
+## Other cleaned files: dependency files generated by SWIG or this Makefile
+
+MOSTLYCLEANFILES += $(DEPDIR)/*.S*
+
+## Add the .py and .cc files to the list of SWIG built sources.  The
+## .h file is sometimes built, but not always ... so that one has to
+## be added manually by the including Makefile.am .
+
+swig_built_sources += @address@hidden @address@hidden
+
+## Various SWIG variables.  These can be overloaded in the including
+## Makefile.am by setting the variable value there, then including
+## Makefile.swig .
+
address@hidden@_swiginclude_HEADERS =           \
+       @address@hidden                 \
+       $(@address@hidden)
+
address@hidden@_pylib_LTLIBRARIES =             \
+       address@hidden@.la
+
address@hidden@_la_SOURCES =                    \
+       @address@hidden                 \
+       $(@address@hidden)
+
address@hidden@_la_LIBADD =                     \
+       $(STD_SWIG_LA_LIB_ADD)          \
+       $(@address@hidden)
+
address@hidden@_la_LDFLAGS =                    \
+       $(STD_SWIG_LA_LD_FLAGS)         \
+       $(@address@hidden)
+
address@hidden@_la_CXXFLAGS =                   \
+       $(STD_SWIG_CXX_FLAGS)           \
+       $(@address@hidden)
+
address@hidden@_python_PYTHON =                 \
+       @address@hidden                 \
+       $(@address@hidden)
+
+## Entry rule for running SWIG
+
address@hidden@.h @address@hidden @address@hidden: @address@hidden
+## This rule will get called only when MAKE decides that one of the
+## targets needs to be created or re-created, because:
+##
+## * The .i file is newer than any or all of the generated files;
+##
+## * Any or all of the .cc, .h, or .py files does not exist and is
+##   needed (in the case this file is not needed, the rule for it is
+##   ignored); or
+##
+## * Some SWIG-based dependecy of the .cc file isn't met and hence the
+##   .cc file needs be be regenerated.  Explanation: Because MAKE
+##   knows how to handle dependencies for .cc files (regardless of
+##   their name or extension), then the .cc file is used as a target
+##   instead of the .i file -- but with the dependencies of the .i
+##   file.  It is this last reason why the line:
+##
+##             if test -f $@; then :; else
+##
+##   cannot be used in this case: If a .i file dependecy is not met,
+##   then the .cc file needs to be rebuilt.  But if the stamp is newer
+##   than the .cc file, and the .cc file exists, then in the original
+##   version (with the 'test' above) the internal MAKE call will not
+##   be issued and hence the .cc file will not be rebuilt.
+##
+## Once execution gets to here, it should always proceed no matter the
+## state of a stamp (as discussed in link above).  The
+## $(DEPDIR)/@address@hidden stuff is used to allow for parallel
+## builds to "do the right thing".  The stamp has no relationship with
+## either the target files or dependency file; it is used solely for
+## the protection of multiple builds during a given call to MAKE.
+##
+## Catch signals SIGHUP (1), SIGINT (2), SIGPIPE (13), and SIGTERM
+## (15).  At a caught signal, the quoted command will be issued before
+## exiting.  In this case, remove any stamp, whether temporary of not.
+## The trap is valid until the process exits; the process includes all
+## commands appended via "\"s.
+##
+       trap 'rm -rf $(DEPDIR)/@address@hidden' 1 2 13 15; \
+##
+## Create a temporary directory, which acts as a lock.  The first
+## process to create the directory will succeed and issue the MAKE
+## command to do the actual work, while all subsequent processes will
+## fail -- leading them to wait for the first process to finish.
+##
+       if mkdir $(DEPDIR)/@address@hidden 2>/dev/null; then \
+##
+## This code is being executed by the first process to succeed in
+## creating the directory lock.
+##
+## Remove the stamp associated with this filename.
+##
+               rm -f $(DEPDIR)/@address@hidden; \
+##
+## Tell MAKE to run the rule for creating this stamp.
+##
+               $(MAKE) $(AM_MAKEFLAGS) $(DEPDIR)/@address@hidden WHAT=$<; \
+##
+## Now that the .cc, .h, and .py files have been (re)created from the
+## .i file, future checking of this rule during the same MAKE
+## execution will come back that the rule doesn't need to be executed
+## because none of the conditions mentioned at the start of this rule
+## will be positive.  Remove the the directory lock, which frees up
+## any waiting process(es) to continue.
+##
+               rmdir $(DEPDIR)/@address@hidden; \
+       else \
+##
+## This code is being executed by any follower processes while the
+## directory lock is in place.
+##
+## Wait until the first process is done, testing once per second.
+##
+               while test -d $(DEPDIR)/@address@hidden; do \
+                       sleep 1; \
+               done; \
+##
+## Succeed if and only if the first process succeeded; exit this
+## process returning the status of the generated stamp.
+##
+               test -f $(DEPDIR)/@address@hidden; \
+               exit $$?; \
+       fi;
+
+$(DEPDIR)/@address@hidden:
+## This rule will be called only by the first process issuing the
+## above rule to succeed in creating the lock directory, after
+## removing the actual stamp file in order to guarantee that MAKE will
+## execute this rule.
+##
+## Call SWIG to generate the various output files; special
+## post-processing on 'mingw32' host OS for the dependency file.
+##
+       if $(SWIG) $(STD_SWIG_PYTHON_ARGS) $(@address@hidden) \
+               -MD -MF $(DEPDIR)/@address@hidden \
+               -module @NAME@ -o @address@hidden $(WHAT); then \
+           if test $(host_os) = mingw32; then \
+               $(RM) $(DEPDIR)/@address@hidden; \
+               $(SED) 's,\\\\,/,g' < $(DEPDIR)/@address@hidden \
+                       > $(DEPDIR)/@address@hidden; \
+               $(RM) $(DEPDIR)/@address@hidden; \
+               $(MV) $(DEPDIR)/@address@hidden $(DEPDIR)/@address@hidden; \
+           fi; \
+       else \
+           $(RM) $(DEPDIR)/@address@hidden; exit 1; \
+       fi;
+##
+## Mess with the SWIG output .Std dependency file, to create a
+## dependecy file valid for the input .i file: Basically, simulate the
+## dependency file created for libraries by GNU's libtool for C++,
+## where all of the dependencies for the target are first listed, then
+## each individual dependency is listed as a target with no further
+## dependencies.
+##
+## (1) remove the current dependency file
+##
+       $(RM) $(DEPDIR)/@address@hidden
+##
+## (2) Copy the whole SWIG file:
+##
+       cp $(DEPDIR)/@address@hidden $(DEPDIR)/@address@hidden
+##
+## (3) all a carriage return to the end of the dependency file.
+##
+       echo "" >> $(DEPDIR)/@address@hidden
+##
+## (4) from the SWIG file, remove the first line (the target); remove
+##     trailing " \" and " " from each line.  Append ":" to each line,
+##     followed by 2 carriage returns, then append this to the end of
+##     the dependency file.
+##
+       $(SED) -e '1d;s, \\,,g;s, ,,g' < $(DEPDIR)/@address@hidden | \
+               awk '{ printf "%s:\n\n", $$0 }' >> $(DEPDIR)/@address@hidden
+##
+## (5) remove the SWIG-generated file
+##
+       $(RM) $(DEPDIR)/@address@hidden
+##
+## Create the stamp for this filename generation, to signal success in
+## executing this rule; allows other threads waiting on this process
+## to continue.
+##
+       touch $(DEPDIR)/@address@hidden
+
+# KLUDGE: Force runtime include of a SWIG dependency file.  This is
+# not guaranteed to be portable, but will probably work.  If it works,
+# we have accurate dependencies for our swig stuff, which is good.
+
address@hidden@ @address@hidden/$(DEPDIR)/@address@hidden@am__quote@

Modified: 
gnuradio/branches/developers/michaelld/am_swig_4/gr-howto-write-a-block/config/gr_standalone.m4
===================================================================
--- 
gnuradio/branches/developers/michaelld/am_swig_4/gr-howto-write-a-block/config/gr_standalone.m4
     2009-03-12 23:30:32 UTC (rev 10588)
+++ 
gnuradio/branches/developers/michaelld/am_swig_4/gr-howto-write-a-block/config/gr_standalone.m4
     2009-03-13 01:20:31 UTC (rev 10589)
@@ -37,10 +37,41 @@
 
   AM_INIT_AUTOMAKE
 
+  dnl Remember if the user explicity set CXXFLAGS
+  if test -n "${CXXFLAGS}"; then
+    user_set_cxxflags=yes
+  fi
+
   LF_CONFIGURE_CC
   LF_CONFIGURE_CXX
   GR_LIB64             dnl check for lib64 suffix after choosing compilers
 
+  dnl The three macros above are known to override CXXFLAGS if the user
+  dnl didn't specify them.  Though I'm sure somebody thought this was
+  dnl a good idea, it makes it hard to use other than -g -O2 when compiling
+  dnl selected files.  Thus we "undo" the damage here...
+  dnl 
+  dnl If the user specified CXXFLAGS, we use them.  Otherwise when compiling
+  dnl the output of swig use use -O1 if we're using g++.
+  dnl See Makefile.common for the rest of the magic.
+  if test "$user_set_cxxflags" != yes; then
+    autoconf_default_CXXFLAGS="$CXXFLAGS"
+    if test "$GXX" = yes; then
+      case "$host_cpu" in
+       powerpc*)
+          dnl "-O1" is broken on the PPC for some reason
+          dnl (at least as of g++ 4.1.1)
+          swig_CXXFLAGS="-g1 -O2 -Wno-strict-aliasing -Wno-parentheses"
+       ;;
+       *) 
+       swig_CXXFLAGS="-g -O1 -Wno-strict-aliasing -Wno-parentheses"
+       ;;
+      esac
+    fi
+  fi
+  AC_SUBST(autoconf_default_CXXFLAGS)
+  AC_SUBST(swig_CXXFLAGS)
+
   dnl add ${prefix}/lib${gr_libdir_suffix}/pkgconfig to the head of the 
PKG_CONFIG_PATH
   if test x${PKG_CONFIG_PATH} = x; then
       PKG_CONFIG_PATH=${prefix}/lib${gr_libdir_suffix}/pkgconfig

Modified: 
gnuradio/branches/developers/michaelld/am_swig_4/gr-howto-write-a-block/config.guess
===================================================================
--- 
gnuradio/branches/developers/michaelld/am_swig_4/gr-howto-write-a-block/config.guess
        2009-03-12 23:30:32 UTC (rev 10588)
+++ 
gnuradio/branches/developers/michaelld/am_swig_4/gr-howto-write-a-block/config.guess
        2009-03-13 01:20:31 UTC (rev 10589)
@@ -1,10 +1,10 @@
 #! /bin/sh
 # Attempt to guess a canonical system name.
 #   Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999,
-#   2000, 2001, 2002, 2003, 2004, 2005, 2006 Free Software Foundation,
-#   Inc.
+#   2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008
+#   Free Software Foundation, Inc.
 
-timestamp='2007-03-06'
+timestamp='2008-11-15'
 
 # This file is free software; you can redistribute it and/or modify it
 # under the terms of the GNU General Public License as published by
@@ -56,8 +56,8 @@
 GNU config.guess ($timestamp)
 
 Originally written by Per Bothner.
-Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 
2002, 2003, 2004, 2005
-Free Software Foundation, Inc.
+Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001,
+2002, 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc.
 
 This is free software; see the source for copying conditions.  There is NO
 warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE."
@@ -330,8 +330,21 @@
     sun4*:SunOS:5.*:* | tadpole*:SunOS:5.*:*)
        echo sparc-sun-solaris2`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'`
        exit ;;
-    i86pc:SunOS:5.*:*)
-       echo i386-pc-solaris2`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'`
+    i86pc:SunOS:5.*:* | i86xen:SunOS:5.*:*)
+       eval $set_cc_for_build
+       SUN_ARCH="i386"
+       # If there is a compiler, see if it is configured for 64-bit objects.
+       # Note that the Sun cc does not turn __LP64__ into 1 like gcc does.
+       # This test works for both compilers.
+       if [ "$CC_FOR_BUILD" != 'no_compiler_found' ]; then
+           if echo '\n#ifdef __amd64\nIS_64BIT_ARCH\n#endif' | \
+               (CCOPTS= $CC_FOR_BUILD -E - 2>/dev/null) | \
+               grep IS_64BIT_ARCH >/dev/null
+           then
+               SUN_ARCH="x86_64"
+           fi
+       fi
+       echo ${SUN_ARCH}-pc-solaris2`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'`
        exit ;;
     sun4*:SunOS:6*:*)
        # According to config.sub, this is the proper way to canonicalize
@@ -532,7 +545,7 @@
                echo rs6000-ibm-aix3.2
        fi
        exit ;;
-    *:AIX:*:[45])
+    *:AIX:*:[456])
        IBM_CPU_ID=`/usr/sbin/lsdev -C -c processor -S available | sed 1q | awk 
'{ print $1 }'`
        if /usr/sbin/lsattr -El ${IBM_CPU_ID} | grep ' POWER' >/dev/null 2>&1; 
then
                IBM_ARCH=rs6000
@@ -793,12 +806,15 @@
        exit ;;
     *:Interix*:[3456]*)
        case ${UNAME_MACHINE} in
-           x86) 
+           x86)
                echo i586-pc-interix${UNAME_RELEASE}
                exit ;;
-           EM64T | authenticamd)
+           EM64T | authenticamd | genuineintel)
                echo x86_64-unknown-interix${UNAME_RELEASE}
                exit ;;
+           IA64)
+               echo ia64-unknown-interix${UNAME_RELEASE}
+               exit ;;
        esac ;;
     [345]86:Windows_95:* | [345]86:Windows_98:* | [345]86:Windows_NT:*)
        echo i${UNAME_MACHINE}-pc-mks
@@ -833,7 +849,14 @@
        echo ${UNAME_MACHINE}-pc-minix
        exit ;;
     arm*:Linux:*:*)
-       echo ${UNAME_MACHINE}-unknown-linux-gnu
+       eval $set_cc_for_build
+       if echo __ARM_EABI__ | $CC_FOR_BUILD -E - 2>/dev/null \
+           | grep -q __ARM_EABI__
+       then
+           echo ${UNAME_MACHINE}-unknown-linux-gnu
+       else
+           echo ${UNAME_MACHINE}-unknown-linux-gnueabi
+       fi
        exit ;;
     avr32*:Linux:*:*)
        echo ${UNAME_MACHINE}-unknown-linux-gnu
@@ -925,6 +948,9 @@
        if test "$?" = 0 ; then LIBC="libc1" ; else LIBC="" ; fi
        echo ${UNAME_MACHINE}-unknown-linux-gnu${LIBC}
        exit ;;
+    padre:Linux:*:*)
+       echo sparc-unknown-linux-gnu
+       exit ;;
     parisc:Linux:*:* | hppa:Linux:*:*)
        # Look for CPU level
        case `grep '^cpu[^a-z]*:' /proc/cpuinfo 2>/dev/null | cut -d' ' -f2` in
@@ -954,8 +980,8 @@
     x86_64:Linux:*:*)
        echo x86_64-unknown-linux-gnu
        exit ;;
-    xtensa:Linux:*:*)
-       echo xtensa-unknown-linux-gnu
+    xtensa*:Linux:*:*)
+       echo ${UNAME_MACHINE}-unknown-linux-gnu
        exit ;;
     i*86:Linux:*:*)
        # The BFD linker knows what the default object file format is, so
@@ -975,9 +1001,6 @@
          a.out-i386-linux)
                echo "${UNAME_MACHINE}-pc-linux-gnuaout"
                exit ;;
-         coff-i386)
-               echo "${UNAME_MACHINE}-pc-linux-gnucoff"
-               exit ;;
          "")
                # Either a pre-BFD a.out linker (linux-gnuoldld) or
                # one that does not give us useful --help.
@@ -1206,6 +1229,9 @@
     BePC:BeOS:*:*)     # BeOS running on Intel PC compatible.
        echo i586-pc-beos
        exit ;;
+    BePC:Haiku:*:*)    # Haiku running on Intel PC compatible.
+       echo i586-pc-haiku
+       exit ;;
     SX-4:SUPER-UX:*:*)
        echo sx4-nec-superux${UNAME_RELEASE}
        exit ;;
@@ -1474,9 +1500,9 @@
 the operating system you are using. It is advised that you
 download the most up to date version of the config scripts from
 
-  http://savannah.gnu.org/cgi-bin/viewcvs/*checkout*/config/config/config.guess
+  
http://git.savannah.gnu.org/gitweb/?p=config.git;a=blob_plain;f=config.guess;hb=HEAD
 and
-  http://savannah.gnu.org/cgi-bin/viewcvs/*checkout*/config/config/config.sub
+  
http://git.savannah.gnu.org/gitweb/?p=config.git;a=blob_plain;f=config.sub;hb=HEAD
 
 If the version you run ($0) is already up to date, please
 send the following data and any information you think might be

Modified: 
gnuradio/branches/developers/michaelld/am_swig_4/gr-howto-write-a-block/config.sub
===================================================================
--- 
gnuradio/branches/developers/michaelld/am_swig_4/gr-howto-write-a-block/config.sub
  2009-03-12 23:30:32 UTC (rev 10588)
+++ 
gnuradio/branches/developers/michaelld/am_swig_4/gr-howto-write-a-block/config.sub
  2009-03-13 01:20:31 UTC (rev 10589)
@@ -1,10 +1,10 @@
 #! /bin/sh
 # Configuration validation subroutine script.
 #   Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999,
-#   2000, 2001, 2002, 2003, 2004, 2005, 2006 Free Software Foundation,
-#   Inc.
+#   2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008
+#   Free Software Foundation, Inc.
 
-timestamp='2007-01-18'
+timestamp='2008-09-08'
 
 # This file is (in principle) common to ALL GNU software.
 # The presence of a machine in this file suggests that SOME GNU software
@@ -72,8 +72,8 @@
 version="\
 GNU config.sub ($timestamp)
 
-Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 
2002, 2003, 2004, 2005
-Free Software Foundation, Inc.
+Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001,
+2002, 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc.
 
 This is free software; see the source for copying conditions.  There is NO
 warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE."
@@ -250,12 +250,14 @@
        | i370 | i860 | i960 | ia64 \
        | ip2k | iq2000 \
        | m32c | m32r | m32rle | m68000 | m68k | m88k \
-       | maxq | mb | microblaze | mcore | mep \
+       | maxq | mb | microblaze | mcore | mep | metag \
        | mips | mipsbe | mipseb | mipsel | mipsle \
        | mips16 \
        | mips64 | mips64el \
+       | mips64octeon | mips64octeonel \
+       | mips64orion | mips64orionel \
+       | mips64r5900 | mips64r5900el \
        | mips64vr | mips64vrel \
-       | mips64orion | mips64orionel \
        | mips64vr4100 | mips64vr4100el \
        | mips64vr4300 | mips64vr4300el \
        | mips64vr5000 | mips64vr5000el \
@@ -286,7 +288,7 @@
        | v850 | v850e \
        | we32k \
        | x86 | xc16x | xscale | xscalee[bl] | xstormy16 | xtensa \
-       | z8k)
+       | z8k | z80)
                basic_machine=$basic_machine-unknown
                ;;
        m6811 | m68hc11 | m6812 | m68hc12)
@@ -331,12 +333,14 @@
        | ip2k-* | iq2000-* \
        | m32c-* | m32r-* | m32rle-* \
        | m68000-* | m680[012346]0-* | m68360-* | m683?2-* | m68k-* \
-       | m88110-* | m88k-* | maxq-* | mcore-* \
+       | m88110-* | m88k-* | maxq-* | mcore-* | metag-* \
        | mips-* | mipsbe-* | mipseb-* | mipsel-* | mipsle-* \
        | mips16-* \
        | mips64-* | mips64el-* \
+       | mips64octeon-* | mips64octeonel-* \
+       | mips64orion-* | mips64orionel-* \
+       | mips64r5900-* | mips64r5900el-* \
        | mips64vr-* | mips64vrel-* \
-       | mips64orion-* | mips64orionel-* \
        | mips64vr4100-* | mips64vr4100el-* \
        | mips64vr4300-* | mips64vr4300el-* \
        | mips64vr5000-* | mips64vr5000el-* \
@@ -364,15 +368,19 @@
        | sparclite-* \
        | sparcv8-* | sparcv9-* | sparcv9b-* | sparcv9v-* | strongarm-* | sv1-* 
| sx?-* \
        | tahoe-* | thumb-* \
-       | tic30-* | tic4x-* | tic54x-* | tic55x-* | tic6x-* | tic80-* \
+       | tic30-* | tic4x-* | tic54x-* | tic55x-* | tic6x-* | tic80-* | tile-* \
        | tron-* \
        | v850-* | v850e-* | vax-* \
        | we32k-* \
        | x86-* | x86_64-* | xc16x-* | xps100-* | xscale-* | xscalee[bl]-* \
-       | xstormy16-* | xtensa-* \
+       | xstormy16-* | xtensa*-* \
        | ymp-* \
-       | z8k-*)
+       | z8k-* | z80-*)
                ;;
+       # Recognize the basic CPU types without company name, with glob match.
+       xtensa*)
+               basic_machine=$basic_machine-unknown
+               ;;
        # Recognize the various machine names and aliases which stand
        # for a CPU type and a company and sometimes even an OS.
        386bsd)
@@ -443,10 +451,22 @@
                basic_machine=ns32k-sequent
                os=-dynix
                ;;
+       blackfin)
+               basic_machine=bfin-unknown
+               os=-linux
+               ;;
+       blackfin-*)
+               basic_machine=bfin-`echo $basic_machine | sed 's/^[^-]*-//'`
+               os=-linux
+               ;;
        c90)
                basic_machine=c90-cray
                os=-unicos
                ;;
+        cegcc)
+               basic_machine=arm-unknown
+               os=-cegcc
+               ;;
        convex-c1)
                basic_machine=c1-convex
                os=-bsd
@@ -475,8 +495,8 @@
                basic_machine=craynv-cray
                os=-unicosmp
                ;;
-       cr16c)
-               basic_machine=cr16c-unknown
+       cr16)
+               basic_machine=cr16-unknown
                os=-elf
                ;;
        crds | unos)
@@ -514,6 +534,10 @@
                basic_machine=m88k-motorola
                os=-sysv3
                ;;
+       dicos)
+               basic_machine=i686-pc
+               os=-dicos
+               ;;
        djgpp)
                basic_machine=i586-pc
                os=-msdosdjgpp
@@ -668,6 +692,14 @@
                basic_machine=m68k-isi
                os=-sysv
                ;;
+       m68knommu)
+               basic_machine=m68k-unknown
+               os=-linux
+               ;;
+       m68knommu-*)
+               basic_machine=m68k-`echo $basic_machine | sed 's/^[^-]*-//'`
+               os=-linux
+               ;;
        m88k-omron*)
                basic_machine=m88k-omron
                ;;
@@ -683,6 +715,10 @@
                basic_machine=i386-pc
                os=-mingw32
                ;;
+       mingw32ce)
+               basic_machine=arm-unknown
+               os=-mingw32ce
+               ;;
        miniframe)
                basic_machine=m68000-convergent
                ;;
@@ -809,6 +845,14 @@
                basic_machine=i860-intel
                os=-osf
                ;;
+       parisc)
+               basic_machine=hppa-unknown
+               os=-linux
+               ;;
+       parisc-*)
+               basic_machine=hppa-`echo $basic_machine | sed 's/^[^-]*-//'`
+               os=-linux
+               ;;
        pbd)
                basic_machine=sparc-tti
                ;;
@@ -1017,6 +1061,10 @@
                basic_machine=tic6x-unknown
                os=-coff
                ;;
+       tile*)
+               basic_machine=tile-unknown
+               os=-linux-gnu
+               ;;
        tx39)
                basic_machine=mipstx39-unknown
                ;;
@@ -1092,6 +1140,10 @@
                basic_machine=z8k-unknown
                os=-sim
                ;;
+       z80-*-coff)
+               basic_machine=z80-unknown
+               os=-sim
+               ;;
        none)
                basic_machine=none-none
                os=-none
@@ -1212,7 +1264,7 @@
              | -bosx* | -nextstep* | -cxux* | -aout* | -elf* | -oabi* \
              | -ptx* | -coff* | -ecoff* | -winnt* | -domain* | -vsta* \
              | -udi* | -eabi* | -lites* | -ieee* | -go32* | -aux* \
-             | -chorusos* | -chorusrdb* \
+             | -chorusos* | -chorusrdb* | -cegcc* \
              | -cygwin* | -pe* | -psos* | -moss* | -proelf* | -rtems* \
              | -mingw32* | -linux-gnu* | -linux-newlib* | -linux-uclibc* \
              | -uxpv* | -beos* | -mpeix* | -udk* \
@@ -1352,6 +1404,9 @@
        -zvmoe)
                os=-zvmoe
                ;;
+       -dicos*)
+               os=-dicos
+               ;;
        -none)
                ;;
        *)

Modified: 
gnuradio/branches/developers/michaelld/am_swig_4/gr-howto-write-a-block/src/lib/Makefile.am
===================================================================
--- 
gnuradio/branches/developers/michaelld/am_swig_4/gr-howto-write-a-block/src/lib/Makefile.am
 2009-03-12 23:30:32 UTC (rev 10588)
+++ 
gnuradio/branches/developers/michaelld/am_swig_4/gr-howto-write-a-block/src/lib/Makefile.am
 2009-03-13 01:20:31 UTC (rev 10589)
@@ -22,7 +22,7 @@
 include $(top_srcdir)/Makefile.common
 
 AM_CPPFLAGS = $(STD_DEFINES_AND_INCLUDES) $(PYTHON_CPPFLAGS)
-SWIG_PYTHON_ARGS = $(SWIG_PYTHON_FLAGS) $(SWIGGRFLAGS)
+#SWIG_PYTHON_ARGS = $(SWIG_PYTHON_FLAGS) $(SWIGGRFLAGS)
 
 # C/C++ headers get installed in ${prefix}/include/gnuradio
 grinclude_HEADERS =            \
@@ -42,15 +42,35 @@
 howto_pythondir_category =     \
        gnuradio
 
+# additional arguments to the SWIG command
+#howto_la_swig_args =          \
+#      -g
+
 # additional sources for the SWIG-generated library
 howto_la_swig_sources =        \
        howto_square_ff.cc      \
        howto_square2_ff.cc
 
+# additional arguments to the SWIG command
+#howto_la_swig_args =          \
+#      $(SWIG_PYTHON_ARGS)
+
 # additional libraries for linking with the SWIG-generated library
-howto_la_swig_libadd =         \
-       $(GNURADIO_CORE_LA)
+#howto_la_swig_libadd =                \
+#      libm.dylib
 
+# additional LD flags for linking the SWIG-generated library
+#howto_la_swig_ldflags =       \
+#      -L/opt/local/bin
+
+# additional Python files to be installed along with the SWIG-generated one
+#howto_python =                        \
+#      __init__.py
+
+# additional SWIG files to be installed
+#howto_swiginclude_headers =   \
+#      nothing.i
+
 include $(top_srcdir)/Makefile.swig
 
 # add some of the variables generated inside the Makefile.swig.gen

Added: 
gnuradio/branches/developers/michaelld/am_swig_4/gr-howto-write-a-block/src/lib/Makefile.swig.gen
===================================================================
--- 
gnuradio/branches/developers/michaelld/am_swig_4/gr-howto-write-a-block/src/lib/Makefile.swig.gen
                           (rev 0)
+++ 
gnuradio/branches/developers/michaelld/am_swig_4/gr-howto-write-a-block/src/lib/Makefile.swig.gen
   2009-03-13 01:20:31 UTC (rev 10589)
@@ -0,0 +1,259 @@
+# -*- Makefile -*-
+#
+# Copyright 2009 Free Software Foundation, Inc.
+# 
+# This file is part of GNU Radio
+# 
+# GNU Radio is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 3, or (at your option)
+# any later version.
+# 
+# GNU Radio is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+# 
+# You should have received a copy of the GNU General Public License
+# along with GNU Radio; see the file COPYING.  If not, write to
+# the Free Software Foundation, Inc., 51 Franklin Street,
+# Boston, MA 02110-1301, USA.
+# 
+
+# Makefile.swig.gen for howto.i
+
+## Default install locations for these files:
+##
+## Default location for the Python directory is:
+##  ${prefix}/lib/python${python_version}/site-packages/[category]/howto
+## Default location for the Python exec directory is:
+##  ${exec_prefix}/lib/python${python_version}/site-packages/[category]/howto
+##
+## The following can be overloaded to change the install location, but
+## this has to be done in the including Makefile.am -before-
+## Makefile.swig is included.
+
+howto_pythondir_category ?= gnuradio/howto
+howto_pylibdir_category ?= $(howto_pythondir_category)
+howto_pythondir = $(pythondir)/$(howto_pythondir_category)
+howto_pylibdir = $(pyexecdir)/$(howto_pylibdir_category)
+
+## SWIG headers are always installed into the same directory.
+
+howto_swigincludedir = $(swigincludedir)
+
+## This is a template file for a "generated" Makefile addition (in
+## this case, "Makefile.swig.gen").  By including the top-level
+## Makefile.swig, this file will be used to generate the SWIG
+## dependencies.  Assign the variable TOP_SWIG_FILES to be the list of
+## SWIG .i files to generated wrappings for; there can be more than 1
+## so long as the names are unique (no sorting is done on the
+## TOP_SWIG_FILES list). This file explicitly assumes that a SWIG .i
+## file will generate .cc, .py, and possibly .h files -- meaning that
+## all of these files will have the same base name (that provided for
+## the SWIG .i file).
+##
+## This code is setup to ensure parallel MAKE ("-j" or "-jN") does the
+## right thing.  For more info, see <
+## http://sources.redhat.com/automake/automake.html#Multiple-Outputs >
+
+## Stamps used to ensure parallel make does the right thing.  These
+## are removed by "make clean", but otherwise unused except during the
+## parallel built.  These will not be included in a tarball, because
+## the SWIG-generated files will be removed from the distribution.
+
+STAMPS += $(DEPDIR)/howto-generate-*
+
+## Other cleaned files: dependency files generated by SWIG or this Makefile
+
+MOSTLYCLEANFILES += $(DEPDIR)/*.S*
+
+## Add the .py and .cc files to the list of SWIG built sources.  The
+## .h file is sometimes built, but not always ... so that one has to
+## be added manually by the including Makefile.am .
+
+swig_built_sources += howto.py howto.cc
+
+## Various SWIG variables.  These can be overloaded in the including
+## Makefile.am by setting the variable value there, then including
+## Makefile.swig .
+
+howto_swiginclude_HEADERS =            \
+       howto.i                 \
+       $(howto_swiginclude_headers)
+
+howto_pylib_LTLIBRARIES =              \
+       _howto.la
+
+_howto_la_SOURCES =                    \
+       howto.cc                        \
+       $(howto_la_swig_sources)
+
+_howto_la_LIBADD =                     \
+       $(STD_SWIG_LA_LIB_ADD)          \
+       $(howto_la_swig_libadd)
+
+_howto_la_LDFLAGS =                    \
+       $(STD_SWIG_LA_LD_FLAGS)         \
+       $(howto_la_swig_ldflags)
+
+_howto_la_CXXFLAGS =                   \
+       $(STD_SWIG_CXX_FLAGS)           \
+       $(howto_la_swig_cxxflags)
+
+howto_python_PYTHON =                  \
+       howto.py                        \
+       $(howto_python)
+
+## Entry rule for running SWIG
+
+howto.h howto.py howto.cc: howto.i
+## This rule will get called only when MAKE decides that one of the
+## targets needs to be created or re-created, because:
+##
+## * The .i file is newer than any or all of the generated files;
+##
+## * Any or all of the .cc, .h, or .py files does not exist and is
+##   needed (in the case this file is not needed, the rule for it is
+##   ignored); or
+##
+## * Some SWIG-based dependecy of the .cc file isn't met and hence the
+##   .cc file needs be be regenerated.  Explanation: Because MAKE
+##   knows how to handle dependencies for .cc files (regardless of
+##   their name or extension), then the .cc file is used as a target
+##   instead of the .i file -- but with the dependencies of the .i
+##   file.  It is this last reason why the line:
+##
+##             if test -f $@; then :; else
+##
+##   cannot be used in this case: If a .i file dependecy is not met,
+##   then the .cc file needs to be rebuilt.  But if the stamp is newer
+##   than the .cc file, and the .cc file exists, then in the original
+##   version (with the 'test' above) the internal MAKE call will not
+##   be issued and hence the .cc file will not be rebuilt.
+##
+## Once execution gets to here, it should always proceed no matter the
+## state of a stamp (as discussed in link above).  The
+## $(DEPDIR)/howto-generate stuff is used to allow for parallel
+## builds to "do the right thing".  The stamp has no relationship with
+## either the target files or dependency file; it is used solely for
+## the protection of multiple builds during a given call to MAKE.
+##
+## Catch signals SIGHUP (1), SIGINT (2), SIGPIPE (13), and SIGTERM
+## (15).  At a caught signal, the quoted command will be issued before
+## exiting.  In this case, remove any stamp, whether temporary of not.
+## The trap is valid until the process exits; the process includes all
+## commands appended via "\"s.
+##
+       trap 'rm -rf $(DEPDIR)/howto-generate-*' 1 2 13 15; \
+##
+## Create a temporary directory, which acts as a lock.  The first
+## process to create the directory will succeed and issue the MAKE
+## command to do the actual work, while all subsequent processes will
+## fail -- leading them to wait for the first process to finish.
+##
+       if mkdir $(DEPDIR)/howto-generate-lock 2>/dev/null; then \
+##
+## This code is being executed by the first process to succeed in
+## creating the directory lock.
+##
+## Remove the stamp associated with this filename.
+##
+               rm -f $(DEPDIR)/howto-generate-stamp; \
+##
+## Tell MAKE to run the rule for creating this stamp.
+##
+               $(MAKE) $(AM_MAKEFLAGS) $(DEPDIR)/howto-generate-stamp WHAT=$<; 
\
+##
+## Now that the .cc, .h, and .py files have been (re)created from the
+## .i file, future checking of this rule during the same MAKE
+## execution will come back that the rule doesn't need to be executed
+## because none of the conditions mentioned at the start of this rule
+## will be positive.  Remove the the directory lock, which frees up
+## any waiting process(es) to continue.
+##
+               rmdir $(DEPDIR)/howto-generate-lock; \
+       else \
+##
+## This code is being executed by any follower processes while the
+## directory lock is in place.
+##
+## Wait until the first process is done, testing once per second.
+##
+               while test -d $(DEPDIR)/howto-generate-lock; do \
+                       sleep 1; \
+               done; \
+##
+## Succeed if and only if the first process succeeded; exit this
+## process returning the status of the generated stamp.
+##
+               test -f $(DEPDIR)/howto-generate-stamp; \
+               exit $$?; \
+       fi;
+
+$(DEPDIR)/howto-generate-stamp:
+## This rule will be called only by the first process issuing the
+## above rule to succeed in creating the lock directory, after
+## removing the actual stamp file in order to guarantee that MAKE will
+## execute this rule.
+##
+## Call SWIG to generate the various output files; special
+## post-processing on 'mingw32' host OS for the dependency file.
+##
+       if $(SWIG) $(STD_SWIG_PYTHON_ARGS) $(howto_swig_args) \
+               -MD -MF $(DEPDIR)/howto.Std \
+               -module howto -o howto.cc $(WHAT); then \
+           if test $(host_os) = mingw32; then \
+               $(RM) $(DEPDIR)/howto.Sd; \
+               $(SED) 's,\\\\,/,g' < $(DEPDIR)/howto.Std \
+                       > $(DEPDIR)/howto.Sd; \
+               $(RM) $(DEPDIR)/howto.Std; \
+               $(MV) $(DEPDIR)/howto.Sd $(DEPDIR)/howto.Std; \
+           fi; \
+       else \
+           $(RM) $(DEPDIR)/howto.S*; exit 1; \
+       fi;
+##
+## Mess with the SWIG output .Std dependency file, to create a
+## dependecy file valid for the input .i file: Basically, simulate the
+## dependency file created for libraries by GNU's libtool for C++,
+## where all of the dependencies for the target are first listed, then
+## each individual dependency is listed as a target with no further
+## dependencies.
+##
+## (1) remove the current dependency file
+##
+       $(RM) $(DEPDIR)/howto.d
+##
+## (2) Copy the whole SWIG file:
+##
+       cp $(DEPDIR)/howto.Std $(DEPDIR)/howto.d
+##
+## (3) all a carriage return to the end of the dependency file.
+##
+       echo "" >> $(DEPDIR)/howto.d
+##
+## (4) from the SWIG file, remove the first line (the target); remove
+##     trailing " \" and " " from each line.  Append ":" to each line,
+##     followed by 2 carriage returns, then append this to the end of
+##     the dependency file.
+##
+       $(SED) -e '1d;s, \\,,g;s, ,,g' < $(DEPDIR)/howto.Std | \
+               awk '{ printf "%s:\n\n", $$0 }' >> $(DEPDIR)/howto.d
+##
+## (5) remove the SWIG-generated file
+##
+       $(RM) $(DEPDIR)/howto.Std
+##
+## Create the stamp for this filename generation, to signal success in
+## executing this rule; allows other threads waiting on this process
+## to continue.
+##
+       touch $(DEPDIR)/howto-generate-stamp
+
+# KLUDGE: Force runtime include of a SWIG dependency file.  This is
+# not guaranteed to be portable, but will probably work.  If it works,
+# we have accurate dependencies for our swig stuff, which is good.
+
address@hidden@ @address@hidden/$(DEPDIR)/address@hidden@
+

Modified: 
gnuradio/branches/developers/michaelld/am_swig_4/gr-msdd6000/src/Makefile.swig.gen
===================================================================
--- 
gnuradio/branches/developers/michaelld/am_swig_4/gr-msdd6000/src/Makefile.swig.gen
  2009-03-12 23:30:32 UTC (rev 10588)
+++ 
gnuradio/branches/developers/michaelld/am_swig_4/gr-msdd6000/src/Makefile.swig.gen
  2009-03-13 01:20:31 UTC (rev 10589)
@@ -233,13 +233,12 @@
 ##
        echo "" >> $(DEPDIR)/msdd.d
 ##
-## (4) from the SWIG file, remove the first line (the target) as well
-##     as the onefor the current .i file; remove trailing " \" and " "
-##     from each line.  Append ":" to each line, followed by 2
-##     carriage returns, then append this to the end of the dependency
-##     file.
+## (4) from the SWIG file, remove the first line (the target); remove
+##     trailing " \" and " " from each line.  Append ":" to each line,
+##     followed by 2 carriage returns, then append this to the end of
+##     the dependency file.
 ##
-       $(SED) -e '1d;/msdd.i/d;s, \\,,g;s, ,,g' < $(DEPDIR)/msdd.Std | \
+       $(SED) -e '1d;s, \\,,g;s, ,,g' < $(DEPDIR)/msdd.Std | \
                awk '{ printf "%s:\n\n", $$0 }' >> $(DEPDIR)/msdd.d
 ##
 ## (5) remove the SWIG-generated file

Modified: 
gnuradio/branches/developers/michaelld/am_swig_4/gr-pager/src/Makefile.swig.gen
===================================================================
--- 
gnuradio/branches/developers/michaelld/am_swig_4/gr-pager/src/Makefile.swig.gen 
    2009-03-12 23:30:32 UTC (rev 10588)
+++ 
gnuradio/branches/developers/michaelld/am_swig_4/gr-pager/src/Makefile.swig.gen 
    2009-03-13 01:20:31 UTC (rev 10589)
@@ -233,13 +233,12 @@
 ##
        echo "" >> $(DEPDIR)/pager_swig.d
 ##
-## (4) from the SWIG file, remove the first line (the target) as well
-##     as the onefor the current .i file; remove trailing " \" and " "
-##     from each line.  Append ":" to each line, followed by 2
-##     carriage returns, then append this to the end of the dependency
-##     file.
+## (4) from the SWIG file, remove the first line (the target); remove
+##     trailing " \" and " " from each line.  Append ":" to each line,
+##     followed by 2 carriage returns, then append this to the end of
+##     the dependency file.
 ##
-       $(SED) -e '1d;/pager_swig.i/d;s, \\,,g;s, ,,g' < 
$(DEPDIR)/pager_swig.Std | \
+       $(SED) -e '1d;s, \\,,g;s, ,,g' < $(DEPDIR)/pager_swig.Std | \
                awk '{ printf "%s:\n\n", $$0 }' >> $(DEPDIR)/pager_swig.d
 ##
 ## (5) remove the SWIG-generated file

Modified: 
gnuradio/branches/developers/michaelld/am_swig_4/gr-qtgui/src/lib/Makefile.swig.gen
===================================================================
--- 
gnuradio/branches/developers/michaelld/am_swig_4/gr-qtgui/src/lib/Makefile.swig.gen
 2009-03-12 23:30:32 UTC (rev 10588)
+++ 
gnuradio/branches/developers/michaelld/am_swig_4/gr-qtgui/src/lib/Makefile.swig.gen
 2009-03-13 01:20:31 UTC (rev 10589)
@@ -233,13 +233,12 @@
 ##
        echo "" >> $(DEPDIR)/qtgui.d
 ##
-## (4) from the SWIG file, remove the first line (the target) as well
-##     as the onefor the current .i file; remove trailing " \" and " "
-##     from each line.  Append ":" to each line, followed by 2
-##     carriage returns, then append this to the end of the dependency
-##     file.
+## (4) from the SWIG file, remove the first line (the target); remove
+##     trailing " \" and " " from each line.  Append ":" to each line,
+##     followed by 2 carriage returns, then append this to the end of
+##     the dependency file.
 ##
-       $(SED) -e '1d;/qtgui.i/d;s, \\,,g;s, ,,g' < $(DEPDIR)/qtgui.Std | \
+       $(SED) -e '1d;s, \\,,g;s, ,,g' < $(DEPDIR)/qtgui.Std | \
                awk '{ printf "%s:\n\n", $$0 }' >> $(DEPDIR)/qtgui.d
 ##
 ## (5) remove the SWIG-generated file

Modified: 
gnuradio/branches/developers/michaelld/am_swig_4/gr-radio-astronomy/src/lib/Makefile.swig.gen
===================================================================
--- 
gnuradio/branches/developers/michaelld/am_swig_4/gr-radio-astronomy/src/lib/Makefile.swig.gen
       2009-03-12 23:30:32 UTC (rev 10588)
+++ 
gnuradio/branches/developers/michaelld/am_swig_4/gr-radio-astronomy/src/lib/Makefile.swig.gen
       2009-03-13 01:20:31 UTC (rev 10589)
@@ -233,13 +233,12 @@
 ##
        echo "" >> $(DEPDIR)/ra.d
 ##
-## (4) from the SWIG file, remove the first line (the target) as well
-##     as the onefor the current .i file; remove trailing " \" and " "
-##     from each line.  Append ":" to each line, followed by 2
-##     carriage returns, then append this to the end of the dependency
-##     file.
+## (4) from the SWIG file, remove the first line (the target); remove
+##     trailing " \" and " " from each line.  Append ":" to each line,
+##     followed by 2 carriage returns, then append this to the end of
+##     the dependency file.
 ##
-       $(SED) -e '1d;/ra.i/d;s, \\,,g;s, ,,g' < $(DEPDIR)/ra.Std | \
+       $(SED) -e '1d;s, \\,,g;s, ,,g' < $(DEPDIR)/ra.Std | \
                awk '{ printf "%s:\n\n", $$0 }' >> $(DEPDIR)/ra.d
 ##
 ## (5) remove the SWIG-generated file

Modified: 
gnuradio/branches/developers/michaelld/am_swig_4/gr-trellis/src/lib/Makefile.swig.gen
===================================================================
--- 
gnuradio/branches/developers/michaelld/am_swig_4/gr-trellis/src/lib/Makefile.swig.gen
       2009-03-12 23:30:32 UTC (rev 10588)
+++ 
gnuradio/branches/developers/michaelld/am_swig_4/gr-trellis/src/lib/Makefile.swig.gen
       2009-03-13 01:20:31 UTC (rev 10589)
@@ -233,13 +233,12 @@
 ##
        echo "" >> $(DEPDIR)/trellis.d
 ##
-## (4) from the SWIG file, remove the first line (the target) as well
-##     as the onefor the current .i file; remove trailing " \" and " "
-##     from each line.  Append ":" to each line, followed by 2
-##     carriage returns, then append this to the end of the dependency
-##     file.
+## (4) from the SWIG file, remove the first line (the target); remove
+##     trailing " \" and " " from each line.  Append ":" to each line,
+##     followed by 2 carriage returns, then append this to the end of
+##     the dependency file.
 ##
-       $(SED) -e '1d;/trellis.i/d;s, \\,,g;s, ,,g' < $(DEPDIR)/trellis.Std | \
+       $(SED) -e '1d;s, \\,,g;s, ,,g' < $(DEPDIR)/trellis.Std | \
                awk '{ printf "%s:\n\n", $$0 }' >> $(DEPDIR)/trellis.d
 ##
 ## (5) remove the SWIG-generated file

Modified: 
gnuradio/branches/developers/michaelld/am_swig_4/gr-usrp/src/Makefile.swig.gen
===================================================================
--- 
gnuradio/branches/developers/michaelld/am_swig_4/gr-usrp/src/Makefile.swig.gen  
    2009-03-12 23:30:32 UTC (rev 10588)
+++ 
gnuradio/branches/developers/michaelld/am_swig_4/gr-usrp/src/Makefile.swig.gen  
    2009-03-13 01:20:31 UTC (rev 10589)
@@ -233,13 +233,12 @@
 ##
        echo "" >> $(DEPDIR)/usrp_swig.d
 ##
-## (4) from the SWIG file, remove the first line (the target) as well
-##     as the onefor the current .i file; remove trailing " \" and " "
-##     from each line.  Append ":" to each line, followed by 2
-##     carriage returns, then append this to the end of the dependency
-##     file.
+## (4) from the SWIG file, remove the first line (the target); remove
+##     trailing " \" and " " from each line.  Append ":" to each line,
+##     followed by 2 carriage returns, then append this to the end of
+##     the dependency file.
 ##
-       $(SED) -e '1d;/usrp_swig.i/d;s, \\,,g;s, ,,g' < $(DEPDIR)/usrp_swig.Std 
| \
+       $(SED) -e '1d;s, \\,,g;s, ,,g' < $(DEPDIR)/usrp_swig.Std | \
                awk '{ printf "%s:\n\n", $$0 }' >> $(DEPDIR)/usrp_swig.d
 ##
 ## (5) remove the SWIG-generated file

Modified: 
gnuradio/branches/developers/michaelld/am_swig_4/gr-usrp2/src/Makefile.swig.gen
===================================================================
--- 
gnuradio/branches/developers/michaelld/am_swig_4/gr-usrp2/src/Makefile.swig.gen 
    2009-03-12 23:30:32 UTC (rev 10588)
+++ 
gnuradio/branches/developers/michaelld/am_swig_4/gr-usrp2/src/Makefile.swig.gen 
    2009-03-13 01:20:31 UTC (rev 10589)
@@ -233,13 +233,12 @@
 ##
        echo "" >> $(DEPDIR)/usrp2.d
 ##
-## (4) from the SWIG file, remove the first line (the target) as well
-##     as the onefor the current .i file; remove trailing " \" and " "
-##     from each line.  Append ":" to each line, followed by 2
-##     carriage returns, then append this to the end of the dependency
-##     file.
+## (4) from the SWIG file, remove the first line (the target); remove
+##     trailing " \" and " " from each line.  Append ":" to each line,
+##     followed by 2 carriage returns, then append this to the end of
+##     the dependency file.
 ##
-       $(SED) -e '1d;/usrp2.i/d;s, \\,,g;s, ,,g' < $(DEPDIR)/usrp2.Std | \
+       $(SED) -e '1d;s, \\,,g;s, ,,g' < $(DEPDIR)/usrp2.Std | \
                awk '{ printf "%s:\n\n", $$0 }' >> $(DEPDIR)/usrp2.d
 ##
 ## (5) remove the SWIG-generated file

Modified: 
gnuradio/branches/developers/michaelld/am_swig_4/gr-video-sdl/src/Makefile.swig.gen
===================================================================
--- 
gnuradio/branches/developers/michaelld/am_swig_4/gr-video-sdl/src/Makefile.swig.gen
 2009-03-12 23:30:32 UTC (rev 10588)
+++ 
gnuradio/branches/developers/michaelld/am_swig_4/gr-video-sdl/src/Makefile.swig.gen
 2009-03-13 01:20:31 UTC (rev 10589)
@@ -233,13 +233,12 @@
 ##
        echo "" >> $(DEPDIR)/video_sdl.d
 ##
-## (4) from the SWIG file, remove the first line (the target) as well
-##     as the onefor the current .i file; remove trailing " \" and " "
-##     from each line.  Append ":" to each line, followed by 2
-##     carriage returns, then append this to the end of the dependency
-##     file.
+## (4) from the SWIG file, remove the first line (the target); remove
+##     trailing " \" and " " from each line.  Append ":" to each line,
+##     followed by 2 carriage returns, then append this to the end of
+##     the dependency file.
 ##
-       $(SED) -e '1d;/video_sdl.i/d;s, \\,,g;s, ,,g' < $(DEPDIR)/video_sdl.Std 
| \
+       $(SED) -e '1d;s, \\,,g;s, ,,g' < $(DEPDIR)/video_sdl.Std | \
                awk '{ printf "%s:\n\n", $$0 }' >> $(DEPDIR)/video_sdl.d
 ##
 ## (5) remove the SWIG-generated file

Modified: 
gnuradio/branches/developers/michaelld/am_swig_4/usrp/host/swig/Makefile.swig.gen
===================================================================
--- 
gnuradio/branches/developers/michaelld/am_swig_4/usrp/host/swig/Makefile.swig.gen
   2009-03-12 23:30:32 UTC (rev 10588)
+++ 
gnuradio/branches/developers/michaelld/am_swig_4/usrp/host/swig/Makefile.swig.gen
   2009-03-13 01:20:31 UTC (rev 10589)
@@ -233,13 +233,12 @@
 ##
        echo "" >> $(DEPDIR)/usrp_prims.d
 ##
-## (4) from the SWIG file, remove the first line (the target) as well
-##     as the onefor the current .i file; remove trailing " \" and " "
-##     from each line.  Append ":" to each line, followed by 2
-##     carriage returns, then append this to the end of the dependency
-##     file.
+## (4) from the SWIG file, remove the first line (the target); remove
+##     trailing " \" and " " from each line.  Append ":" to each line,
+##     followed by 2 carriage returns, then append this to the end of
+##     the dependency file.
 ##
-       $(SED) -e '1d;/usrp_prims.i/d;s, \\,,g;s, ,,g' < 
$(DEPDIR)/usrp_prims.Std | \
+       $(SED) -e '1d;s, \\,,g;s, ,,g' < $(DEPDIR)/usrp_prims.Std | \
                awk '{ printf "%s:\n\n", $$0 }' >> $(DEPDIR)/usrp_prims.d
 ##
 ## (5) remove the SWIG-generated file





reply via email to

[Prev in Thread] Current Thread [Next in Thread]