[Commit-gnuradio] [gnuradio] 07/07: Merge branch 'staticlibs'

[git]

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

trondeau pushed a commit to branch master
in repository gnuradio.

commit 2a37bd9cce06991b370611d4fdcf1136c720ff3f
Merge: 830d0ef f14e02c
Author: Tom Rondeau <address@hidden>
Date:   Sun Jun 29 22:02:31 2014 -0400

    Merge branch 'staticlibs'

 gnuradio-runtime/CMakeLists.txt              |  40 +++++----
 gnuradio-runtime/include/gnuradio/prefs.h    |   1 -
 gnuradio-runtime/include/pmt/pmt.h           |   3 +-
 gnuradio-runtime/lib/CMakeLists.txt          |  16 +++-
 gnuradio-runtime/lib/pmt/CMakeLists.txt      |  19 +++-
 gnuradio-runtime/lib/pmt/pmt.cc              |   9 +-
 gnuradio-runtime/lib/prefs.cc                |  16 +---
 gnuradio-runtime/python/gnuradio/gr/prefs.py | 127 ---------------------------
 gnuradio-runtime/python/pmt/__init__.py      |   5 +-
 gnuradio-runtime/python/pmt/pmt_to_python.py |  11 ++-
 gnuradio-runtime/swig/pmt_swig.i             |   6 +-
 gnuradio-runtime/swig/prefs.i                |   2 -
 gr-analog/lib/CMakeLists.txt                 |  28 ++++--
 gr-atsc/lib/CMakeLists.txt                   |  13 +++
 gr-audio/lib/CMakeLists.txt                  |  13 +++
 gr-blocks/lib/CMakeLists.txt                 |  15 ++++
 gr-blocks/python/blocks/qa_keep_one_in_n.py  |   1 -
 gr-channels/lib/CMakeLists.txt               |  20 +++++
 gr-comedi/lib/CMakeLists.txt                 |  13 +++
 gr-digital/lib/CMakeLists.txt                |  20 +++++
 gr-fec/lib/CMakeLists.txt                    |  13 +++
 gr-fft/lib/CMakeLists.txt                    |  13 +++
 gr-filter/lib/CMakeLists.txt                 |  18 ++++
 gr-noaa/lib/CMakeLists.txt                   |  13 +++
 gr-pager/lib/CMakeLists.txt                  |  13 +++
 gr-qtgui/lib/CMakeLists.txt                  |  23 +++--
 gr-trellis/lib/CMakeLists.txt                |  28 ++++--
 gr-video-sdl/lib/CMakeLists.txt              |  18 +++-
 gr-vocoder/lib/CMakeLists.txt                |  13 +++
 gr-wavelet/lib/CMakeLists.txt                |  16 ++++
 gr-wxgui/lib/CMakeLists.txt                  |  13 +++
 gr-zeromq/lib/CMakeLists.txt                 |  13 +++
 volk/lib/CMakeLists.txt                      |  14 ++-
 33 files changed, 394 insertions(+), 192 deletions(-)