diff options
| author | Johnathan Corgan <johnathan@corganlabs.com> | 2013-03-15 09:57:31 -0700 |
|---|---|---|
| committer | Johnathan Corgan <johnathan@corganlabs.com> | 2013-03-15 09:57:31 -0700 |
| commit | e965a5bb209ad46a509ccd21f393667fd69d95f9 (patch) | |
| tree | 40d683ef8f80980f12eac6cfe7f3423c49b45f87 /gr-blocks/include/blocks/CMakeLists.txt | |
| parent | 2bf9c4cb4b0b426690f353fc1662a13e70c0d5e0 (diff) | |
| parent | 27990ca9e236931e39a830e48f0a1efe13ec085f (diff) | |
Merge branch 'ofdm-master' into ofdm-next
Added fixups for next branch changes
Conflicts:
CMakeLists.txt
gnuradio-core/src/lib/io/gr_message_sink.cc
gnuradio-core/src/lib/io/gr_message_sink.h
gnuradio-core/src/lib/io/gr_message_sink.i
gnuradio-core/src/lib/io/gr_message_source.cc
gnuradio-core/src/lib/io/gr_message_source.h
gnuradio-core/src/lib/io/gr_message_source.i
gr-blocks/CMakeLists.txt
gr-digital/CMakeLists.txt
gr-digital/grc/digital_block_tree.xml
gr-digital/include/digital/CMakeLists.txt
gr-digital/include/digital_ofdm_cyclic_prefixer.h
gr-digital/lib/CMakeLists.txt
gr-digital/lib/digital_ofdm_cyclic_prefixer.cc
gr-digital/lib/ofdm_cyclic_prefixer_impl.h
gr-digital/python/CMakeLists.txt
gr-digital/swig/CMakeLists.txt
gr-digital/swig/digital_swig.i
Diffstat (limited to 'gr-blocks/include/blocks/CMakeLists.txt')
| -rw-r--r-- | gr-blocks/include/blocks/CMakeLists.txt | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/gr-blocks/include/blocks/CMakeLists.txt b/gr-blocks/include/blocks/CMakeLists.txt index 82d4179c72..0f158ff473 100644 --- a/gr-blocks/include/blocks/CMakeLists.txt +++ b/gr-blocks/include/blocks/CMakeLists.txt @@ -65,8 +65,8 @@ endmacro(expand_h) # Invoke macro to generate various sources ######################################################################## expand_h(add_XX ss ii cc) -expand_h(add_const_XX ss ii ff cc) -expand_h(add_const_vXX ss ii ff cc) +expand_h(add_const_XX bb ss ii ff cc) +expand_h(add_const_vXX bb ss ii ff cc) expand_h(and_XX bb ss ii) expand_h(and_const_XX bb ss ii) expand_h(argmax_XX fs is ss) @@ -156,6 +156,7 @@ install(FILES random_pdu.h probe_rate.h regenerate_bb.h + repack_bits_bb.h repeat.h rms_cf.h rms_ff.h @@ -175,6 +176,7 @@ install(FILES throttle.h transcendental.h tuntap_pdu.h + tagged_stream_mux.h uchar_to_float.h udp_sink.h udp_source.h |