diff options
| author | jcorgan <jcorgan@221aa14e-8319-0410-a670-987f0aec2ac5> | 2009-02-02 14:27:28 +0000 |
|---|---|---|
| committer | jcorgan <jcorgan@221aa14e-8319-0410-a670-987f0aec2ac5> | 2009-02-02 14:27:28 +0000 |
| commit | 8193fd8a044a18471a6091249195d15ae6d814be (patch) | |
| tree | e9b491d81ad03024280209ac677d589c841b8f98 /gr-howto-write-a-block/src/lib | |
| parent | 09f236be864aaa3b5216eb42676eafb38d47b587 (diff) | |
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-howto-write-a-block/src/lib')
| -rw-r--r-- | gr-howto-write-a-block/src/lib/Makefile.am | 11 |
1 files changed, 6 insertions, 5 deletions
diff --git a/gr-howto-write-a-block/src/lib/Makefile.am b/gr-howto-write-a-block/src/lib/Makefile.am index 04bac39d7c..c6fe7ca441 100644 --- a/gr-howto-write-a-block/src/lib/Makefile.am +++ b/gr-howto-write-a-block/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,7 +30,7 @@ ourlibdir = $(grpyexecdir) AM_CPPFLAGS = $(STD_DEFINES_AND_INCLUDES) $(PYTHON_CPPFLAGS) -SWIGPYTHONARGS = $(SWIGPYTHONFLAGS) $(SWIGGRFLAGS) +SWIG_PYTHON_ARGS = $(SWIG_PYTHON_FLAGS) $(SWIGGRFLAGS) ALL_IFILES = \ $(LOCAL_IFILES) \ @@ -41,7 +41,7 @@ NON_LOCAL_IFILES = \ LOCAL_IFILES = \ - $(top_srcdir)/src/lib/howto.i + $(srcdir)/howto.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,8 +72,9 @@ _howto_la_LIBADD = \ $(PYTHON_LDFLAGS) \ -lstdc++ -howto.cc howto.py: $(LOCAL_IFILES) $(ALL_IFILES) - $(SWIG) $(SWIGPYTHONARGS) -module howto -o howto.cc $(LOCAL_IFILES) +howto.cc howto.py: $(ALL_IFILES) + $(SWIG) $(STD_SWIG_PYTHON_ARGS) -module howto \ + -o howto.cc $(LOCAL_IFILES) # These headers get installed in ${prefix}/include/gnuradio grinclude_HEADERS = \ |