diff options
| author | Tom Rondeau <trondeau@vt.edu> | 2011-12-04 11:19:37 -0500 |
|---|---|---|
| committer | Tom Rondeau <trondeau@vt.edu> | 2011-12-04 11:19:37 -0500 |
| commit | 7209280a2b21fb31e5533a17047ed8c6ba5527f1 (patch) | |
| tree | f3ef58059fa9a55be67230ad1949d57ab2c1a4b8 /gr-trellis/src/lib | |
| parent | 5c1576570e156633c9531932baa79fda9ff9a573 (diff) | |
| parent | f536b394f20ef88b426bf4bb6e9b69f6efb9847e (diff) | |
Merge branch 'more_swigness_docs'
Diffstat (limited to 'gr-trellis/src/lib')
| -rw-r--r-- | gr-trellis/src/lib/CMakeLists.txt | 5 | ||||
| -rw-r--r-- | gr-trellis/src/lib/Makefile.am | 15 | ||||
| -rw-r--r-- | gr-trellis/src/lib/trellis.i | 3 |
3 files changed, 22 insertions, 1 deletions
diff --git a/gr-trellis/src/lib/CMakeLists.txt b/gr-trellis/src/lib/CMakeLists.txt index 36434fe9fa..60e86b87cd 100644 --- a/gr-trellis/src/lib/CMakeLists.txt +++ b/gr-trellis/src/lib/CMakeLists.txt @@ -185,6 +185,7 @@ if(ENABLE_PYTHON) trellis_siso_combined_f.i trellis_constellation_metrics_cf.i ${CMAKE_CURRENT_BINARY_DIR}/trellis_generated.i + ${CMAKE_CURRENT_BINARY_DIR}/trellis_swig_doc.i DESTINATION ${GR_INCLUDE_DIR}/gnuradio/swig COMPONENT "trellis_swig" ) @@ -204,6 +205,10 @@ set(GR_SWIG_INCLUDE_DIRS ${GNURADIO_CORE_SWIG_INCLUDE_DIRS} ${GR_DIGITAL_SWIG_INCLUDE_DIRS} ) + +set(GR_SWIG_DOC_FILE ${CMAKE_CURRENT_BINARY_DIR}/trellis_swig_doc.i) +set(GR_SWIG_DOC_DIRS ${CMAKE_CURRENT_SOURCE_DIR} ${CMAKE_CURRENT_BINARY_DIR}) + set(GR_SWIG_LIBRARIES gnuradio-trellis) GR_SWIG_MAKE(trellis trellis.i) diff --git a/gr-trellis/src/lib/Makefile.am b/gr-trellis/src/lib/Makefile.am index 435a093d67..2a86fe1961 100644 --- a/gr-trellis/src/lib/Makefile.am +++ b/gr-trellis/src/lib/Makefile.am @@ -124,6 +124,18 @@ trellis.py trellis.scm: trellis_generated.i TOP_SWIG_IFILES = \ trellis.i +TOP_SWIG_DOC_IFILES = \ + trellis_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.trellis # This ends up at: @@ -144,7 +156,8 @@ trellis_swiginclude_headers = \ trellis_siso_f.i \ trellis_siso_combined_f.i \ trellis_constellation_metrics_cf.i \ - trellis_generated.i + trellis_generated.i \ + $(TOP_SWIG_DOC_IFILES) # Do creation and inclusion of other Makefiles last diff --git a/gr-trellis/src/lib/trellis.i b/gr-trellis/src/lib/trellis.i index d01ab529a8..70775af413 100644 --- a/gr-trellis/src/lib/trellis.i +++ b/gr-trellis/src/lib/trellis.i @@ -22,6 +22,9 @@ %include "gnuradio.i" // the common stuff +//load generated python docstrings +%include "trellis_swig_doc.i" + %{ #include "fsm.h" #include "interleaver.h" |