[Commit-gnuradio] r10438 - in gnuradio/branches/developers/michaelld/am_swig: . config gnuradio-core/src/lib/swig gr-usrp2/src

[michaelld]

Author: michaelld
Date: 2009-02-11 07:50:57 -0700 (Wed, 11 Feb 2009)
New Revision: 10438

Modified:
   gnuradio/branches/developers/michaelld/am_swig/Makefile.swig
   gnuradio/branches/developers/michaelld/am_swig/config/grc_gnuradio_core.m4
   
gnuradio/branches/developers/michaelld/am_swig/gnuradio-core/src/lib/swig/Makefile.am
   gnuradio/branches/developers/michaelld/am_swig/gr-usrp2/src/Makefile.am
Log:
Clean-up & adding in some neglected files.  Added in rules for .i.py
and .i.h to allow distcheck to work.  Still WIP.



Modified: gnuradio/branches/developers/michaelld/am_swig/Makefile.swig
===================================================================
--- gnuradio/branches/developers/michaelld/am_swig/Makefile.swig        
2009-02-11 13:34:44 UTC (rev 10437)
+++ gnuradio/branches/developers/michaelld/am_swig/Makefile.swig        
2009-02-11 14:50:57 UTC (rev 10438)
@@ -57,8 +57,17 @@
 
 SUFFIXES = .i
 
-# how to convert from .i to .cc (and also .py, .h)
+# how to convert from .i to .py or .h: remove the .cc file, to force
+# re-compiling / re-wrapping using SWIG.
 
+.i.h:
+       $(RM) $*.cc
+
+.i.py:
+       $(RM) $*.cc
+
+# how to convert from .i to .cc
+
 .i.cc:
        if $(SWIG) $(STD_SWIG_PYTHON_ARGS) -MD -MF $(DEPDIR)/$*.Std \
                -module $* -o $*.cc $<; then \

Modified: 
gnuradio/branches/developers/michaelld/am_swig/config/grc_gnuradio_core.m4
===================================================================
--- gnuradio/branches/developers/michaelld/am_swig/config/grc_gnuradio_core.m4  
2009-02-11 13:34:44 UTC (rev 10437)
+++ gnuradio/branches/developers/michaelld/am_swig/config/grc_gnuradio_core.m4  
2009-02-11 14:50:57 UTC (rev 10438)
@@ -69,17 +69,6 @@
        
gnuradio_core_LIBDIRPATH="\${abs_top_builddir}/gnuradio-core/src/lib:\${abs_top_builddir}/gnuradio-core/src/lib/.libs"
        
gnuradio_core_SWIGDIRPATH="\${abs_top_builddir}/gnuradio-core/src/lib/swig:\${abs_top_builddir}/gnuradio-core/src/lib/swig/.libs:\${abs_top_srcdir}/gnuradio-core/src/lib/swig"
        gnuradio_core_PYDIRPATH="\${abs_top_srcdir}/gnuradio-core/src/python"
-
-        dnl kludge up initial swig dependency files by
-       dnl Making sure the files exist.
-#        AC_CONFIG_COMMANDS([swig_deps], [
-#          mkdir -p gnuradio-core/src/lib/swig/${DEPDIR}
-#          pushd gnuradio-core/src/lib/swig/${DEPDIR} 2>&1 > /dev/null
-#           touch gnuradio_swig_py_runtime.d gnuradio_swig_py_general.d
-#            touch gnuradio_swig_py_gengen.d gnuradio_swig_py_filter.d
-#            touch gnuradio_swig_py_io.d
-#          popd 2>&1 > /dev/null
-#        ])
     fi
 
     dnl other externally-required gnuradio-core variables

Modified: 
gnuradio/branches/developers/michaelld/am_swig/gnuradio-core/src/lib/swig/Makefile.am
===================================================================
--- 
gnuradio/branches/developers/michaelld/am_swig/gnuradio-core/src/lib/swig/Makefile.am
       2009-02-11 13:34:44 UTC (rev 10437)
+++ 
gnuradio/branches/developers/michaelld/am_swig/gnuradio-core/src/lib/swig/Makefile.am
       2009-02-11 14:50:57 UTC (rev 10438)
@@ -44,7 +44,12 @@
 swiginclude_HEADERS =                          \
        $(srcdir)/gnuradio.i                    \
        $(srcdir)/gr_swig_block_magic.i         \
-       $(srcdir)/gr_shared_ptr.i
+       $(srcdir)/gr_shared_ptr.i               \
+       $(srcdir)/gnuradio_swig_py_runtime.i    \
+       $(srcdir)/gnuradio_swig_py_general.i    \
+       $(srcdir)/gnuradio_swig_py_gengen.i     \
+       $(srcdir)/gnuradio_swig_py_filter.i     \
+       $(srcdir)/gnuradio_swig_py_io.i
 
 # Just the built Python sources, since they're used multiple times.
 

Modified: 
gnuradio/branches/developers/michaelld/am_swig/gr-usrp2/src/Makefile.am
===================================================================
--- gnuradio/branches/developers/michaelld/am_swig/gr-usrp2/src/Makefile.am     
2009-02-11 13:34:44 UTC (rev 10437)
+++ gnuradio/branches/developers/michaelld/am_swig/gr-usrp2/src/Makefile.am     
2009-02-11 14:50:57 UTC (rev 10438)
@@ -80,7 +80,7 @@
 swiginclude_HEADERS = $(srcdir)/usrp2.i
 
 # Generated by SWIG wrapper generator
-BUILT_SOURCES = usrp2.cc usrp2.py                      
+BUILT_SOURCES = usrp2.cc usrp2.py
 
 # Install the SWIG python output
 ourpython_PYTHON = usrp2.py