diff options
| author | Tom Rondeau | 2011-12-04 11:19:37 -0500 |
|---|---|---|
| committer | Tom Rondeau | 2011-12-04 11:19:37 -0500 |
| commit | 7209280a2b21fb31e5533a17047ed8c6ba5527f1 (patch) | |
| tree | f3ef58059fa9a55be67230ad1949d57ab2c1a4b8 /gr-comedi | |
| parent | 5c1576570e156633c9531932baa79fda9ff9a573 (diff) | |
| parent | f536b394f20ef88b426bf4bb6e9b69f6efb9847e (diff) | |
| download | gnuradio-7209280a2b21fb31e5533a17047ed8c6ba5527f1.tar.gz gnuradio-7209280a2b21fb31e5533a17047ed8c6ba5527f1.tar.bz2 gnuradio-7209280a2b21fb31e5533a17047ed8c6ba5527f1.zip | |
Merge branch 'more_swigness_docs'
Diffstat (limited to 'gr-comedi')
| -rw-r--r-- | gr-comedi/src/CMakeLists.txt | 4 | ||||
| -rw-r--r-- | gr-comedi/src/Makefile.am | 16 | ||||
| -rw-r--r-- | gr-comedi/src/comedi.i | 3 | ||||
| -rw-r--r-- | gr-comedi/src/comedi_sink_s.h | 2 |
4 files changed, 24 insertions, 1 deletions
diff --git a/gr-comedi/src/CMakeLists.txt b/gr-comedi/src/CMakeLists.txt index 2573940dc..6ad14737b 100644 --- a/gr-comedi/src/CMakeLists.txt +++ b/gr-comedi/src/CMakeLists.txt @@ -72,6 +72,9 @@ set(GR_SWIG_INCLUDE_DIRS ${GNURADIO_CORE_SWIG_INCLUDE_DIRS} ) +set(GR_SWIG_DOC_FILE ${CMAKE_CURRENT_BINARY_DIR}/comedi_swig_doc.i) +set(GR_SWIG_DOC_DIRS ${CMAKE_CURRENT_SOURCE_DIR}) + set(GR_SWIG_LIBRARIES gnuradio-comedi) GR_SWIG_MAKE(comedi comedi.i) @@ -84,6 +87,7 @@ GR_SWIG_INSTALL( install( FILES comedi.i + ${CMAKE_CURRENT_BINARY_DIR}/comedi_swig_doc.i DESTINATION ${GR_INCLUDE_DIR}/gnuradio/swig COMPONENT "comedi_swig" ) diff --git a/gr-comedi/src/Makefile.am b/gr-comedi/src/Makefile.am index 47f689adb..d6a287db5 100644 --- a/gr-comedi/src/Makefile.am +++ b/gr-comedi/src/Makefile.am @@ -59,6 +59,18 @@ libgnuradio_comedi_la_LDFLAGS = $(NO_UNDEFINED) $(LTVERSIONFLAGS) TOP_SWIG_IFILES = \ comedi.i +TOP_SWIG_DOC_IFILES = \ + comedi_swig_doc.i + +BUILT_SOURCES += \ + $(TOP_SWIG_DOC_IFILES) + +EXTRA_DIST += \ + $(TOP_SWIG_DOC_IFILES) + +$(TOP_SWIG_DOC_IFILES): + `echo "" > $@` + # Install so that they end up available as: # import gnuradio.comedi # This ends up at: @@ -70,6 +82,10 @@ comedi_pythondir_category = \ comedi_la_swig_libadd = \ libgnuradio-comedi.la +# additional SWIG files to be installed +comedi_swig_swiginclude_headers = \ + $(TOP_SWIG_DOC_IFILES) + if PYTHON TESTS += run_tests endif diff --git a/gr-comedi/src/comedi.i b/gr-comedi/src/comedi.i index 36865afbe..a15b4d3b9 100644 --- a/gr-comedi/src/comedi.i +++ b/gr-comedi/src/comedi.i @@ -22,6 +22,9 @@ %include "gnuradio.i" // the common stuff +//load generated python docstrings +%include "comedi_swig_doc.i" + %{ #include "comedi_sink_s.h" #include "comedi_source_s.h" diff --git a/gr-comedi/src/comedi_sink_s.h b/gr-comedi/src/comedi_sink_s.h index 22f0428d4..b36d41304 100644 --- a/gr-comedi/src/comedi_sink_s.h +++ b/gr-comedi/src/comedi_sink_s.h @@ -31,7 +31,7 @@ class comedi_sink_s; typedef boost::shared_ptr<comedi_sink_s> comedi_sink_s_sptr; /*! - * \brief make an COMEDI sink. + * \brief make a COMEDI sink. * * \param sampling_freq sampling rate in Hz * \param dev COMEDI device name, e.g., "/dev/comedi0" |