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-atsc | |
| 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-atsc')
| -rw-r--r-- | gr-atsc/src/lib/Makefile.am | 12 |
1 files changed, 5 insertions, 7 deletions
diff --git a/gr-atsc/src/lib/Makefile.am b/gr-atsc/src/lib/Makefile.am index 256cf768aa..21a25bc155 100644 --- a/gr-atsc/src/lib/Makefile.am +++ b/gr-atsc/src/lib/Makefile.am @@ -1,5 +1,5 @@ # -# Copyright 2001,2004,2005,2006,2008 Free Software Foundation, Inc. +# Copyright 2001,2004,2005,2006,2008,2009 Free Software Foundation, Inc. # # This file is part of GNU Radio # @@ -214,9 +214,6 @@ test_atsci_LDADD = \ # It builds the atsc module which we'll load into python # ------------------------------------------------------------------------ -SWIGCPPPYTHONARGS = -fvirtual -python -modern $(PYTHON_CPPFLAGS) \ - $(STD_DEFINES_AND_INCLUDES) $(WITH_SWIG_INCLUDES) $(WITH_INCLUDES) - ALL_IFILES = \ $(LOCAL_IFILES) \ $(NON_LOCAL_IFILES) @@ -225,7 +222,7 @@ NON_LOCAL_IFILES = \ $(GNURADIO_I) LOCAL_IFILES = \ - $(top_srcdir)/gr-atsc/src/lib/atsc.i + $(srcdir)/atsc.i # These files are built by SWIG. The first is the C++ glue. # The second is the python wrapper that loads the _atsc shared library @@ -256,8 +253,9 @@ _atsc_la_LIBADD = \ libatsc.la \ -lstdc++ -atsc.cc atsc.py: atsc.i $(ALL_IFILES) - $(SWIG) $(SWIGCPPPYTHONARGS) -module atsc -o atsc.cc $(LOCAL_IFILES) +atsc.cc atsc.py: $(ALL_IFILES) + $(SWIG) $(STD_SWIG_PYTHON_ARGS) -module atsc \ + -o atsc.cc $(LOCAL_IFILES) # These swig headers get installed in ${prefix}/include/gnuradio/swig swiginclude_HEADERS = \ |