diff options
| author | Johnathan Corgan <johnathan@corganlabs.com> | 2013-03-15 03:24:14 -0700 |
|---|---|---|
| committer | Johnathan Corgan <johnathan@corganlabs.com> | 2013-03-15 03:24:14 -0700 |
| commit | c2ef28e50696170f0347118d9a13fe38f3255fae (patch) | |
| tree | c7f089e1948774ab1d0b505bdd5367b441070b49 | |
| parent | 928a9ada1c7caa739ee57f49da4446a04d301b12 (diff) | |
blocks: minor cleanup of added blocks
| -rw-r--r-- | gr-blocks/lib/CMakeLists.txt | 4 | ||||
| -rw-r--r-- | gr-blocks/swig/blocks_swig.i | 6 |
2 files changed, 5 insertions, 5 deletions
diff --git a/gr-blocks/lib/CMakeLists.txt b/gr-blocks/lib/CMakeLists.txt index 8fdaf8ecdd..1a322ac82a 100644 --- a/gr-blocks/lib/CMakeLists.txt +++ b/gr-blocks/lib/CMakeLists.txt @@ -194,6 +194,7 @@ list(APPEND gr_blocks_sources peak_detector2_fb_impl.cc probe_rate_impl.cc regenerate_bb_impl.cc + repack_bits_bb_impl.cc repeat_impl.cc rms_cf_impl.cc rms_ff_impl.cc @@ -248,8 +249,7 @@ list(APPEND blocks_libs ${BLOCKS_LIBRARIES} ) -add_library(gnuradio-blocks SHARED ${gr_blocks_sources} - repack_bits_bb_impl.cc) +add_library(gnuradio-blocks SHARED ${gr_blocks_sources}) add_dependencies(gnuradio-blocks blocks_generated_includes) target_link_libraries(gnuradio-blocks ${blocks_libs}) diff --git a/gr-blocks/swig/blocks_swig.i b/gr-blocks/swig/blocks_swig.i index e5d091b9df..14d6674e49 100644 --- a/gr-blocks/swig/blocks_swig.i +++ b/gr-blocks/swig/blocks_swig.i @@ -172,12 +172,12 @@ #include "blocks/sub_cc.h" #include "blocks/tag_debug.h" #include "blocks/tagged_file_sink.h" +#include "blocks/tagged_stream_mux.h" #include "blocks/tagged_stream_to_pdu.h" #include "blocks/threshold_ff.h" #include "blocks/throttle.h" #include "blocks/transcendental.h" #include "blocks/tuntap_pdu.h" -#include "blocks/tagged_stream_mux.h" #include "blocks/uchar_to_float.h" #include "blocks/udp_sink.h" #include "blocks/udp_source.h" @@ -336,12 +336,12 @@ %include "blocks/sub_ii.h" %include "blocks/sub_cc.h" %include "blocks/tagged_file_sink.h" +%include "blocks/tagged_stream_mux.h" %include "blocks/tagged_stream_to_pdu.h" %include "blocks/threshold_ff.h" %include "blocks/throttle.h" %include "blocks/transcendental.h" %include "blocks/tuntap_pdu.h" -%include "blocks/tagged_stream_mux.h" %include "blocks/uchar_to_float.h" %include "blocks/udp_sink.h" %include "blocks/udp_source.h" @@ -498,12 +498,12 @@ GR_SWIG_BLOCK_MAGIC2(blocks, sub_ii); GR_SWIG_BLOCK_MAGIC2(blocks, sub_cc); GR_SWIG_BLOCK_MAGIC2(blocks, tag_debug); GR_SWIG_BLOCK_MAGIC2(blocks, tagged_file_sink); +GR_SWIG_BLOCK_MAGIC2(blocks, tagged_stream_mux); GR_SWIG_BLOCK_MAGIC2(blocks, tagged_stream_to_pdu); GR_SWIG_BLOCK_MAGIC2(blocks, threshold_ff); GR_SWIG_BLOCK_MAGIC2(blocks, throttle); GR_SWIG_BLOCK_MAGIC2(blocks, transcendental); GR_SWIG_BLOCK_MAGIC2(blocks, tuntap_pdu); -GR_SWIG_BLOCK_MAGIC2(blocks, tagged_stream_mux); GR_SWIG_BLOCK_MAGIC2(blocks, uchar_to_float); GR_SWIG_BLOCK_MAGIC2(blocks, udp_sink); GR_SWIG_BLOCK_MAGIC2(blocks, udp_source); |