diff options
| -rw-r--r-- | Makefile.common | 2 | ||||
| -rw-r--r-- | gruel/src/swig/CMakeLists.txt | 1 | ||||
| -rw-r--r-- | gruel/src/swig/Makefile.am | 10 | ||||
| -rw-r--r-- | gruel/src/swig/Makefile.swig.gen | 2 | ||||
| -rw-r--r-- | gruel/src/swig/pmt_swig.i | 8 |
5 files changed, 10 insertions, 13 deletions
diff --git a/Makefile.common b/Makefile.common index a4d5817ff..39cd5106f 100644 --- a/Makefile.common +++ b/Makefile.common @@ -42,9 +42,11 @@ LTVERSIONFLAGS = -version-info 0:0:0 -release $(LIBVER) # includes grincludedir = $(includedir)/gnuradio +gruelincludedir = $(includedir)/gruel # swig includes swigincludedir = $(grincludedir)/swig +gruelswigincludedir = $(gruelincludedir)/swig # Guile scheme code ends up under here: guiledir = $(prefix)/share/guile/site diff --git a/gruel/src/swig/CMakeLists.txt b/gruel/src/swig/CMakeLists.txt index c9651eb3f..7d69ee549 100644 --- a/gruel/src/swig/CMakeLists.txt +++ b/gruel/src/swig/CMakeLists.txt @@ -39,6 +39,7 @@ GR_SWIG_INSTALL( install( FILES gr_intrusive_ptr.i pmt_swig.i + ${CMAKE_CURRENT_BINARY_DIR}/pmt_swig_doc.i DESTINATION ${GR_INCLUDE_DIR}/gnuradio/swig COMPONENT "gruel_swig" ) diff --git a/gruel/src/swig/Makefile.am b/gruel/src/swig/Makefile.am index bf43e01fa..9953d5566 100644 --- a/gruel/src/swig/Makefile.am +++ b/gruel/src/swig/Makefile.am @@ -33,6 +33,7 @@ AM_CPPFLAGS = \ ############################## # SWIG interface and library TOP_SWIG_IFILES = \ + pmt_swig_doc.i \ pmt_swig.i TOP_SWIG_DOC_IFILES = \ @@ -41,12 +42,12 @@ TOP_SWIG_DOC_IFILES = \ BUILT_SOURCES += \ $(TOP_SWIG_DOC_IFILES) +EXTRA_DIST += \ + $(TOP_SWIG_DOC_IFILES) + $(TOP_SWIG_DOC_IFILES): `echo "" > $@` -install-data-local: - cp -p $(TOP_SWIG_DOC_IFILES) $(swigincludedir) - # Install so that they end up available as: # import gruel.pmt # This ends up at: @@ -60,5 +61,6 @@ pmt_swig_la_swig_libadd = \ # additional SWIG files to be installed pmt_swig_swiginclude_headers = \ - gr_intrusive_ptr.i + gr_intrusive_ptr.i \ + $(TOP_SWIG_DOC_IFILES) diff --git a/gruel/src/swig/Makefile.swig.gen b/gruel/src/swig/Makefile.swig.gen index 97aff8104..0abba0299 100644 --- a/gruel/src/swig/Makefile.swig.gen +++ b/gruel/src/swig/Makefile.swig.gen @@ -50,7 +50,7 @@ pmt_swig_scmdir = $(guiledir) ## SWIG headers are always installed into the same directory. -pmt_swig_swigincludedir = $(swigincludedir) +pmt_swig_swigincludedir = $(gruelswigincludedir) ## This is a template file for a "generated" Makefile addition (in ## this case, "Makefile.swig.gen"). By including the top-level diff --git a/gruel/src/swig/pmt_swig.i b/gruel/src/swig/pmt_swig.i index afc80433a..0c937edfc 100644 --- a/gruel/src/swig/pmt_swig.i +++ b/gruel/src/swig/pmt_swig.i @@ -55,14 +55,6 @@ } -/*! - * \brief this is a test function. - * - * this is only a test. - */ -bool test_pmt_is_symbol(void); - - // Template intrusive_ptr for Swig to avoid dereferencing issues namespace pmt{ class pmt_base; |