diff options
| author | jcorgan | 2009-02-02 14:27:28 +0000 |
|---|---|---|
| committer | jcorgan | 2009-02-02 14:27:28 +0000 |
| commit | 8193fd8a044a18471a6091249195d15ae6d814be (patch) | |
| tree | e9b491d81ad03024280209ac677d589c841b8f98 /gr-trellis/src/lib | |
| parent | 09f236be864aaa3b5216eb42676eafb38d47b587 (diff) | |
| download | gnuradio-8193fd8a044a18471a6091249195d15ae6d814be.tar.gz gnuradio-8193fd8a044a18471a6091249195d15ae6d814be.tar.bz2 gnuradio-8193fd8a044a18471a6091249195d15ae6d814be.zip | |
Merged r10288:10370 from michaelld/swigpythonargs into trunk. Passes distcheck.
git-svn-id: http://gnuradio.org/svn/gnuradio/trunk@10371 221aa14e-8319-0410-a670-987f0aec2ac5
Diffstat (limited to 'gr-trellis/src/lib')
| -rw-r--r-- | gr-trellis/src/lib/Makefile.am | 10 |
1 files changed, 4 insertions, 6 deletions
diff --git a/gr-trellis/src/lib/Makefile.am b/gr-trellis/src/lib/Makefile.am index c2c2f057f..acde93ab9 100644 --- a/gr-trellis/src/lib/Makefile.am +++ b/gr-trellis/src/lib/Makefile.am @@ -1,5 +1,5 @@ # -# Copyright 2004,2005,2006,2007,2008 Free Software Foundation, Inc. +# Copyright 2004,2005,2006,2007,2008,2009 Free Software Foundation, Inc. # # This file is part of GNU Radio # @@ -30,9 +30,6 @@ ourlibdir = $(grpyexecdir) AM_CPPFLAGS = $(STD_DEFINES_AND_INCLUDES) $(PYTHON_CPPFLAGS) $(WITH_INCLUDES) -SWIGPYTHONARGS = $(SWIGPYTHONFLAGS) $(STD_DEFINES_AND_INCLUDES) \ - $(WITH_SWIG_INCLUDES) $(WITH_INCLUDES) - # ---------------------------------------------------------------- # these scripts generate trellis codes from template files @@ -107,7 +104,7 @@ NON_LOCAL_IFILES = \ $(GNURADIO_I) LOCAL_IFILES = \ - $(top_srcdir)/gr-trellis/src/lib/trellis.i + $(srcdir)/trellis.i EXTRA_DIST = \ $(CODE_GENERATOR) \ @@ -146,7 +143,8 @@ _trellis_la_LIBADD = \ _trellis_la_CXXFLAGS = @swig_CXXFLAGS@ trellis.cc trellis.py: $(ALL_IFILES) $(grinclude_HEADERS) - $(SWIG) $(SWIGPYTHONARGS) -module trellis -o trellis.cc $(LOCAL_IFILES) + $(SWIG) $(STD_SWIG_PYTHON_ARGS) -module trellis \ + -o trellis.cc $(LOCAL_IFILES) # These headers get installed in ${prefix}/include/gnuradio grinclude_HEADERS = \ |