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-comedi | |
| 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-comedi')
| -rw-r--r-- | gr-comedi/src/Makefile.am | 14 |
1 files changed, 5 insertions, 9 deletions
diff --git a/gr-comedi/src/Makefile.am b/gr-comedi/src/Makefile.am index 6fc028998..c276629e4 100644 --- a/gr-comedi/src/Makefile.am +++ b/gr-comedi/src/Makefile.am @@ -1,5 +1,5 @@ # -# Copyright 2005,2008 Free Software Foundation, Inc. +# Copyright 2005,2008,2009 Free Software Foundation, Inc. # # This file is part of GNU Radio # @@ -33,7 +33,7 @@ EXTRA_DIST = run_tests.in TESTS = run_tests LOCAL_IFILES = \ - $(top_srcdir)/gr-comedi/src/comedi.i + $(srcdir)/comedi.i NON_LOCAL_IFILES = \ $(GNURADIO_I) @@ -51,10 +51,6 @@ ourpython_PYTHON = \ AM_CPPFLAGS = $(STD_DEFINES_AND_INCLUDES) $(PYTHON_CPPFLAGS) $(WITH_INCLUDES) -SWIGCPPPYTHONARGS = -c++ -python $(PYTHON_CPPFLAGS) \ - $(STD_DEFINES_AND_INCLUDES) $(WITH_SWIG_INCLUDES) $(WITH_INCLUDES) -# -I$(swigincludedir) $(S-I$(grincludedir) -I$(comediincludedir) - ourlib_LTLIBRARIES = _comedi.la _comedi_la_SOURCES = \ @@ -84,9 +80,9 @@ _comedi_la_LDFLAGS = $(NO_UNDEFINED) -module -avoid-version _comedi_la_CXXFLAGS = @swig_CXXFLAGS@ -comedi.cc comedi.py: $(LOCAL_IFILES) - $(SWIG) $(SWIGCPPPYTHONARGS) -module comedi -o comedi.cc $(LOCAL_IFILES) - +comedi.cc comedi.py: $(ALL_IFILES) + $(SWIG) $(STD_SWIG_PYTHON_ARGS) -module comedi \ + -o comedi.cc $(LOCAL_IFILES) noinst_PYTHON = \ qa_comedi.py |