3 files changed, 22 insertions, 1 deletions
diff --git a/gr-uhd/swig/CMakeLists.txt b/gr-uhd/swig/CMakeLists.txt
index 4c778b05c..26470b3b9 100644
--- a/gr-uhd/swig/CMakeLists.txt
+++ b/gr-uhd/swig/CMakeLists.txt
@@ -29,6 +29,10 @@ set(GR_SWIG_INCLUDE_DIRS
     ${GR_UHD_INCLUDE_DIRS}
     ${GNURADIO_CORE_SWIG_INCLUDE_DIRS}
 )
+
+set(GR_SWIG_DOC_FILE ${CMAKE_CURRENT_BINARY_DIR}/uhd_swig_doc.i)
+set(GR_SWIG_DOC_DIRS ${CMAKE_CURRENT_SOURCE_DIR}/../include)
+
 link_directories(${UHD_LIBRARY_DIRS})
 set(GR_SWIG_LIBRARIES gnuradio-uhd ${UHD_LIBRARIES})
 
@@ -42,6 +46,7 @@ GR_SWIG_INSTALL(
 
 install(
     FILES uhd_swig.i
+    ${CMAKE_CURRENT_BINARY_DIR}/uhd_swig_doc.i
     DESTINATION ${GR_INCLUDE_DIR}/gnuradio/swig
     COMPONENT "uhd_swig"
 )
diff --git a/gr-uhd/swig/Makefile.am b/gr-uhd/swig/Makefile.am
index 035fb2112..ee868b15f 100644
--- a/gr-uhd/swig/Makefile.am
+++ b/gr-uhd/swig/Makefile.am
@@ -48,6 +48,18 @@ endif
 TOP_SWIG_IFILES = \
 	uhd_swig.i
 
+TOP_SWIG_DOC_IFILES = \
+	uhd_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.uhd
 # This ends up at:
@@ -64,7 +76,8 @@ uhd_swig_python = \
 	__init__.py
 
 # additional SWIG files to be installed
-uhd_swig_swiginclude_headers =
+uhd_swig_swiginclude_headers =	\
+	$(TOP_SWIG_DOC_IFILES)
 
 uhd_swig_swig_args = $(UHD_CPPFLAGS)
 
diff --git a/gr-uhd/swig/uhd_swig.i b/gr-uhd/swig/uhd_swig.i
index 6ff9d9843..0b2f9febc 100644
--- a/gr-uhd/swig/uhd_swig.i
+++ b/gr-uhd/swig/uhd_swig.i
@@ -34,6 +34,9 @@
 ////////////////////////////////////////////////////////////////////////
 %include "gnuradio.i"
 
+//load generated python docstrings
+%include "uhd_swig_doc.i"
+
 ////////////////////////////////////////////////////////////////////////
 // block headers
 ////////////////////////////////////////////////////////////////////////