diff options
| author | jcorgan | 2009-02-10 04:53:37 +0000 |
|---|---|---|
| committer | jcorgan | 2009-02-10 04:53:37 +0000 |
| commit | 7783dc88c6acf839b59c7c3358094f85e0012ada (patch) | |
| tree | 42b3ed5759abef32e75b28d9936aa660cc47ab68 /gnuradio-core/src/lib/swig/Makefile.am | |
| parent | 417a36b82e23fa681e361541c1824ba4de811a7a (diff) | |
| download | gnuradio-7783dc88c6acf839b59c7c3358094f85e0012ada.tar.gz gnuradio-7783dc88c6acf839b59c7c3358094f85e0012ada.tar.bz2 gnuradio-7783dc88c6acf839b59c7c3358094f85e0012ada.zip | |
Merged r10385:10413 from michaelld/swig_tweaks into trunk. Passes distcheck.
git-svn-id: http://gnuradio.org/svn/gnuradio/trunk@10414 221aa14e-8319-0410-a670-987f0aec2ac5
Diffstat (limited to 'gnuradio-core/src/lib/swig/Makefile.am')
| -rw-r--r-- | gnuradio-core/src/lib/swig/Makefile.am | 12 |
1 files changed, 7 insertions, 5 deletions
diff --git a/gnuradio-core/src/lib/swig/Makefile.am b/gnuradio-core/src/lib/swig/Makefile.am index d468b41a9..98c032199 100644 --- a/gnuradio-core/src/lib/swig/Makefile.am +++ b/gnuradio-core/src/lib/swig/Makefile.am @@ -35,11 +35,13 @@ EXTRA_DIST = gen-swig-bug-fix LOCAL_IFILES = \ gnuradio.i \ - shared_ptr.i \ + gr_swig_block_magic.i \ + gr_shared_ptr.i \ sw_general.i \ sw_gengen.i \ sw_filter.i \ - sw_io.i + sw_io.i \ + sw_runtime.i ALL_IFILES = \ $(LOCAL_IFILES) @@ -99,7 +101,7 @@ _gnuradio_swig_py_io_la_CXXFLAGS = @swig_CXXFLAGS@ # ---------------------------------------------------------------- -# Part 1: gnuradio.i -> gnuradio_swig_py_runtime +# Part 1: sw_runtime.i -> gnuradio_swig_py_runtime # # We continue to call this gnuradio.i to avoid having to touch # lots of code in other modules @@ -123,8 +125,8 @@ _gnuradio_swig_py_runtime_la_LDFLAGS = -module -avoid-version $(NO_UNDEFINED) gnuradio_swig_py_runtime.py gnuradio_swig_py_runtime.h: gnuradio_swig_py_runtime.cc -gnuradio_swig_py_runtime.cc : $(srcdir)/gnuradio.i - if $(SWIG) $(STD_SWIG_PYTHON_ARGS) -MMD -MF gnuradio_swig_py_runtime.Td -module gnuradio_swig_py_runtime -o gnuradio_swig_py_runtime.cc $(srcdir)/gnuradio.i ;\ +gnuradio_swig_py_runtime.cc : $(srcdir)/sw_runtime.i + if $(SWIG) $(STD_SWIG_PYTHON_ARGS) -MMD -MF gnuradio_swig_py_runtime.Td -module gnuradio_swig_py_runtime -o gnuradio_swig_py_runtime.cc $(srcdir)/sw_runtime.i ;\ then if test $(host_os) = mingw32; \ then sed 's,\\\\,/,g' <gnuradio_swig_py_runtime.Td >gnuradio_swig_py_runtime.d; rm -f gnuradio_swig_py_runtime.Td; \ else mv -f gnuradio_swig_py_runtime.Td gnuradio_swig_py_runtime.d; fi \ |