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-radio-astronomy/src | |
| 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-radio-astronomy/src')
| -rw-r--r-- | gr-radio-astronomy/src/lib/Makefile.am | 9 |
1 files changed, 3 insertions, 6 deletions
diff --git a/gr-radio-astronomy/src/lib/Makefile.am b/gr-radio-astronomy/src/lib/Makefile.am index f3351bf88..bfd1928b4 100644 --- a/gr-radio-astronomy/src/lib/Makefile.am +++ b/gr-radio-astronomy/src/lib/Makefile.am @@ -1,5 +1,5 @@ # -# Copyright 2004,2005,2006,2008 Free Software Foundation, Inc. +# Copyright 2004,2005,2006,2008,2009 Free Software Foundation, Inc. # # This file is part of GNU Radio # @@ -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) - ALL_IFILES = \ $(LOCAL_IFILES) \ $(NON_LOCAL_IFILES) @@ -41,7 +38,7 @@ NON_LOCAL_IFILES = \ $(GNURADIO_I) LOCAL_IFILES = \ - $(top_srcdir)/gr-radio-astronomy/src/lib/ra.i + $(srcdir)/ra.i # These files are built by SWIG. The first is the C++ glue. # The second is the python wrapper that loads the _howto shared library @@ -72,7 +69,7 @@ _ra_la_LIBADD = \ -lstdc++ ra.cc ra.py: $(ALL_IFILES) - $(SWIG) $(SWIGPYTHONARGS) -module ra -o ra.cc $(LOCAL_IFILES) + $(SWIG) $(STD_SWIG_PYTHON_ARGS) -module ra -o ra.cc $(LOCAL_IFILES) # These headers get installed in ${prefix}/include/gnuradio grinclude_HEADERS = |