diff options
| author | Tom Rondeau | 2011-12-30 13:49:14 -0500 |
|---|---|---|
| committer | Tom Rondeau | 2011-12-30 13:49:14 -0500 |
| commit | dd84c8dfcb30617dbac56f49a57c1e363afe643b (patch) | |
| tree | e6e4e71634dc4dc3f5e85ab5ff2c92e7ada8fa78 /gr-digital/include/CMakeLists.txt | |
| parent | 0cdc6e67f575f6c86ad12734f87cf83aed72b102 (diff) | |
| parent | 9838bb040af5eb21cd88dbc9aae8d4bdf2838854 (diff) | |
| download | gnuradio-dd84c8dfcb30617dbac56f49a57c1e363afe643b.tar.gz gnuradio-dd84c8dfcb30617dbac56f49a57c1e363afe643b.tar.bz2 gnuradio-dd84c8dfcb30617dbac56f49a57c1e363afe643b.zip | |
Merge branch 'master' into next
Conflicts:
gr-digital/examples/Makefile.am
gr-digital/include/Makefile.am
gr-digital/lib/Makefile.am
gr-digital/python/Makefile.am
gr-digital/swig/Makefile.am
Diffstat (limited to 'gr-digital/include/CMakeLists.txt')
| -rw-r--r-- | gr-digital/include/CMakeLists.txt | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/gr-digital/include/CMakeLists.txt b/gr-digital/include/CMakeLists.txt index cf20bd1e7..81ed8d368 100644 --- a/gr-digital/include/CMakeLists.txt +++ b/gr-digital/include/CMakeLists.txt @@ -22,6 +22,7 @@ ######################################################################## install(FILES digital_api.h + digital_impl_mpsk_snr_est.h digital_binary_slicer_fb.h digital_clock_recovery_mm_cc.h digital_clock_recovery_mm_ff.h @@ -37,12 +38,14 @@ install(FILES digital_kurtotic_equalizer_cc.h digital_metric_type.h digital_mpsk_receiver_cc.h + digital_mpsk_snr_est_cc.h digital_ofdm_cyclic_prefixer.h digital_ofdm_frame_acquisition.h digital_ofdm_frame_sink.h digital_ofdm_insert_preamble.h digital_ofdm_mapper_bcv.h digital_ofdm_sampler.h + digital_probe_mpsk_snr_est_c.h digital_gmskmod_bc.h digital_cpmmod_bc.h DESTINATION ${GR_INCLUDE_DIR}/gnuradio |