[Commit-gnuradio] [gnuradio] 01/01: Merge branch 'master' into next

[git]

This is an automated email from the git hooks/post-receive script.

jcorgan pushed a commit to branch next
in repository gnuradio.

commit 99d24d23e95ea0235a8ea2957c289461625765a3
Merge: e1e9128 0d5fd62
Author: Johnathan Corgan <address@hidden>
Date:   Wed Mar 22 09:23:30 2017 -0700

    Merge branch 'master' into next
    
    Conflicts:
        gr-wxgui/lib/CMakeLists.txt

 cmake/Modules/GrSwig.cmake           | 3 ---
 cmake/Modules/UseSWIG.cmake          | 1 +
 gnuradio-runtime/CMakeLists.txt      | 3 +--
 gnuradio-runtime/lib/CMakeLists.txt  | 5 -----
 gnuradio-runtime/swig/CMakeLists.txt | 1 -
 gr-analog/CMakeLists.txt             | 1 +
 gr-audio/lib/CMakeLists.txt          | 4 +---
 gr-blocks/CMakeLists.txt             | 2 ++
 gr-blocks/lib/CMakeLists.txt         | 4 ----
 gr-blocks/tests/CMakeLists.txt       | 6 +-----
 gr-comedi/lib/CMakeLists.txt         | 2 --
 gr-digital/CMakeLists.txt            | 2 --
 gr-digital/lib/CMakeLists.txt        | 4 ----
 gr-dtv/CMakeLists.txt                | 1 +
 gr-dtv/lib/CMakeLists.txt            | 5 -----
 gr-fec/lib/CMakeLists.txt            | 7 ++-----
 gr-fft/CMakeLists.txt                | 1 -
 gr-filter/lib/CMakeLists.txt         | 2 --
 gr-qtgui/lib/CMakeLists.txt          | 3 ---
 gr-trellis/lib/CMakeLists.txt        | 2 --
 gr-uhd/lib/CMakeLists.txt            | 6 ------
 gr-video-sdl/lib/CMakeLists.txt      | 2 --
 gr-vocoder/lib/CMakeLists.txt        | 6 ------
 gr-wavelet/CMakeLists.txt            | 3 ---
 gr-wavelet/lib/CMakeLists.txt        | 7 -------
 25 files changed, 10 insertions(+), 73 deletions(-)

diff --cc gr-vocoder/lib/CMakeLists.txt
index e26cb18,5617d5f..ca5647a
--- a/gr-vocoder/lib/CMakeLists.txt
+++ b/gr-vocoder/lib/CMakeLists.txt
@@@ -97,16 -206,23 +92,15 @@@ GR_INCLUDE_SUBDIRECTORY(g7xx
  list(APPEND vocoder_libs
      gnuradio-runtime
      ${Boost_LIBRARIES}
-     ${LOG4CPP_LIBRARIES}
  )
  
 -if(GR_USE_SYSTEM_LIBCODEC2)
 +if(LIBCODEC2_LIBRARIES)
    list(APPEND vocoder_libs ${LIBCODEC2_LIBRARIES})
 -endif(GR_USE_SYSTEM_LIBCODEC2)
 +endif(LIBCODEC2_LIBRARIES)
  
 -if(GR_USE_SYSTEM_LIBGSM)
 +if(LIBGSM_LIBRARIES)
    list(APPEND vocoder_libs ${LIBGSM_LIBRARIES})
 -endif(GR_USE_SYSTEM_LIBGSM)
 +endif(LIBGSM_LIBRARIES)
  
  add_library(gnuradio-vocoder SHARED ${gr_vocoder_sources})
  target_link_libraries(gnuradio-vocoder ${vocoder_libs})