diff options
| author | Martin Braun <martin.braun@ettus.com> | 2018-02-03 16:58:15 +0100 |
|---|---|---|
| committer | Martin Braun <martin.braun@ettus.com> | 2018-02-03 16:58:43 +0100 |
| commit | db7e26bc73fd71bc88249131f57f7edef308fa63 (patch) | |
| tree | d084ad2615012d53c50a230821761349eb978d56 /gr-vocoder/grc | |
| parent | 3c63f7334d6de70d655aa97fcccbfb950645f4d4 (diff) | |
| parent | a35e10870bbb9a71b3ab66b1dc58135e08c9543e (diff) | |
Merge branch 'master' into next
Diffstat (limited to 'gr-vocoder/grc')
| -rw-r--r-- | gr-vocoder/grc/CMakeLists.txt.orig | 53 |
1 files changed, 0 insertions, 53 deletions
diff --git a/gr-vocoder/grc/CMakeLists.txt.orig b/gr-vocoder/grc/CMakeLists.txt.orig deleted file mode 100644 index fd320545ad..0000000000 --- a/gr-vocoder/grc/CMakeLists.txt.orig +++ /dev/null @@ -1,53 +0,0 @@ -# Copyright 2011,2016 Free Software Foundation, Inc. -# -# This file is part of GNU Radio -# -# GNU Radio is free software; you can redistribute it and/or modify -# it under the terms of the GNU General Public License as published by -# the Free Software Foundation; either version 3, or (at your option) -# any later version. -# -# GNU Radio is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. -# -# You should have received a copy of the GNU General Public License -# along with GNU Radio; see the file COPYING. If not, write to -# the Free Software Foundation, Inc., 51 Franklin Street, -# Boston, MA 02110-1301, USA. - -install(FILES - vocoder_alaw_decode_bs.xml - vocoder_alaw_encode_sb.xml - vocoder_block_tree.xml - vocoder_cvsd_decode_bs.xml - vocoder_cvsd_decode.xml - vocoder_cvsd_encode_sb.xml - vocoder_cvsd_encode.xml - vocoder_g721_decode_bs.xml - vocoder_g721_encode_sb.xml - vocoder_g723_24_decode_bs.xml - vocoder_g723_24_encode_sb.xml - vocoder_g723_40_decode_bs.xml - vocoder_g723_40_encode_sb.xml - vocoder_ulaw_decode_bs.xml - vocoder_ulaw_encode_sb.xml - DESTINATION ${GRC_BLOCKS_DIR} -) - -if(LIBCODEC2_FOUND) - install(FILES - vocoder_codec2_decode_ps.xml - vocoder_codec2_encode_sp.xml - DESTINATION ${GRC_BLOCKS_DIR} - ) -endif(LIBCODEC2_FOUND) - -if(LIBGSM_FOUND) - install(FILES - vocoder_gsm_fr_decode_ps.xml - vocoder_gsm_fr_encode_sp.xml - DESTINATION ${GRC_BLOCKS_DIR} - ) -endif(LIBGSM_FOUND) |