diff options
Diffstat (limited to 'gr-howto-write-a-block-cmake/swig')
4 files changed, 7 insertions, 29 deletions
diff --git a/gr-howto-write-a-block-cmake/swig/CMakeLists.txt b/gr-howto-write-a-block-cmake/swig/CMakeLists.txt index cd3253666..676cc76ca 100644 --- a/gr-howto-write-a-block-cmake/swig/CMakeLists.txt +++ b/gr-howto-write-a-block-cmake/swig/CMakeLists.txt @@ -50,7 +50,5 @@ GR_SWIG_INSTALL(TARGETS howto_swig DESTINATION ${GR_PYTHON_DIR}/howto) install( FILES howto_swig.i - howto_square_ff.i - howto_square2_ff.i DESTINATION include/howto/swig ) diff --git a/gr-howto-write-a-block-cmake/swig/howto_square2_ff.i b/gr-howto-write-a-block-cmake/swig/howto_square2_ff.i deleted file mode 100644 index 683a93d61..000000000 --- a/gr-howto-write-a-block-cmake/swig/howto_square2_ff.i +++ /dev/null @@ -1,9 +0,0 @@ -GR_SWIG_BLOCK_MAGIC(howto,square2_ff); - -howto_square2_ff_sptr howto_make_square2_ff (); - -class howto_square2_ff : public gr_sync_block -{ -private: - howto_square2_ff (); -}; diff --git a/gr-howto-write-a-block-cmake/swig/howto_square_ff.i b/gr-howto-write-a-block-cmake/swig/howto_square_ff.i deleted file mode 100644 index f8ae76986..000000000 --- a/gr-howto-write-a-block-cmake/swig/howto_square_ff.i +++ /dev/null @@ -1,16 +0,0 @@ -/* - * First arg is the package prefix. - * Second arg is the name of the class minus the prefix. - * - * This does some behind-the-scenes magic so we can - * access howto_square_ff from python as howto.square_ff - */ -GR_SWIG_BLOCK_MAGIC(howto,square_ff); - -howto_square_ff_sptr howto_make_square_ff (); - -class howto_square_ff : public gr_block -{ -private: - howto_square_ff (); -}; diff --git a/gr-howto-write-a-block-cmake/swig/howto_swig.i b/gr-howto-write-a-block-cmake/swig/howto_swig.i index d0bbcdc11..52100057c 100644 --- a/gr-howto-write-a-block-cmake/swig/howto_swig.i +++ b/gr-howto-write-a-block-cmake/swig/howto_swig.i @@ -1,5 +1,7 @@ /* -*- c++ -*- */ +#define HOWTO_API + %include "gnuradio.i" // the common stuff %{ @@ -7,8 +9,11 @@ #include "howto_square2_ff.h" %} -%include "howto_square_ff.i" -%include "howto_square2_ff.i" +GR_SWIG_BLOCK_MAGIC(howto,square_ff); +%include "howto_square_ff.h" + +GR_SWIG_BLOCK_MAGIC(howto,square2_ff); +%include "howto_square2_ff.h" #if SWIGGUILE %scheme %{ |