From 14d3c3dd2745b7c606f078777829d72e186a5142 Mon Sep 17 00:00:00 2001
From: Carles Fernandez <carles.fernandez@gmail.com>
Date: Wed, 6 Jan 2016 02:05:34 +0100
Subject: [PATCH] cleaning includes and removing gnuradio-trellis and
 gnuradio-fec dependencies

---
 CMakeLists.txt                                 | 18 +++++++-----------
 .../galileo_e1b_telemetry_decoder_cc.cc        |  1 -
 .../galileo_e1b_telemetry_decoder_cc.h         |  3 ---
 .../galileo_e5a_telemetry_decoder_cc.cc        |  1 -
 .../galileo_e5a_telemetry_decoder_cc.h         |  3 ---
 .../libs/gps_l1_ca_subframe_fsm.cc             |  6 +++++-
 .../libs/gps_l1_ca_subframe_fsm.h              | 10 ----------
 7 files changed, 12 insertions(+), 30 deletions(-)

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 5ca11a594..3e0849406 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -345,7 +345,7 @@ endif(NOT Boost_FOUND)
 ################################################################################
 # GNU Radio - http://gnuradio.org/redmine/projects/gnuradio/wiki
 ################################################################################
-set(GR_REQUIRED_COMPONENTS RUNTIME ANALOG BLOCKS DIGITAL FFT FILTER PMT FEC TRELLIS UHD)
+set(GR_REQUIRED_COMPONENTS RUNTIME ANALOG BLOCKS FFT FILTER UHD)
 find_package(Gnuradio)
 if(PC_GNURADIO_RUNTIME_VERSION)
    if(PC_GNURADIO_RUNTIME_VERSION VERSION_LESS 3.7.3)
@@ -372,25 +372,20 @@ if(NOT GNURADIO_RUNTIME_FOUND)
 endif(NOT GNURADIO_RUNTIME_FOUND)
 
 if(NOT GNURADIO_BLOCKS_FOUND)
-    message(FATAL_ERROR "*** gnuradio-blocks 3.7 or later is required to build gnss-sdr")
+    message(FATAL_ERROR "*** gnuradio-blocks 3.7.3 or later is required to build gnss-sdr")
 endif()
 if(NOT GNURADIO_FILTER_FOUND)
-    message(FATAL_ERROR "*** gnuradio-filter 3.7 or later is required to build gnss-sdr")
+    message(FATAL_ERROR "*** gnuradio-filter 3.7.3 or later is required to build gnss-sdr")
 endif()
 if(NOT GNURADIO_FFT_FOUND)
-    message(FATAL_ERROR "*** gnuradio-fft 3.7 or later is required to build gnss-sdr")
+    message(FATAL_ERROR "*** gnuradio-fft 3.7.3 or later is required to build gnss-sdr")
 endif()
 if(NOT GNURADIO_ANALOG_FOUND)
-    message(FATAL_ERROR "*** gnuradio-analog 3.7 or later is required to build gnss-sdr")
-endif()
-if(NOT GNURADIO_FEC_FOUND)
-    message(FATAL_ERROR "*** gnuradio-fec 3.7 or later is required to build gnss-sdr")
-endif()
-if(NOT GNURADIO_TRELLIS_FOUND)
-    message(FATAL_ERROR "*** gnuradio-trellis 3.7 or later is required to build gnss-sdr")
+    message(FATAL_ERROR "*** gnuradio-analog 3.7.3 or later is required to build gnss-sdr")
 endif()
 
 
+
 ################################################################################
 # VOLK - Vector-Optimized Library of Kernels
 ################################################################################
@@ -428,6 +423,7 @@ if(OS_IS_MACOSX)
     endif(CMAKE_GENERATOR STREQUAL Xcode)
 endif(OS_IS_MACOSX)
 if(NOT VOLK_GNSSSDR_FOUND)
+    message(STATUS " volk_gnsssdr will be built along with gnss-sdr when doing 'make'")
     set(VOLK_GNSSSDR_CMAKE_ARGS -DCMAKE_C_COMPILER=${CMAKE_C_COMPILER}
                                 -DCMAKE_CXX_COMPILER=${CMAKE_CXX_COMPILER}
                                 -DCMAKE_INSTALL_PREFIX=${CMAKE_CURRENT_BINARY_DIR}/volk_gnsssdr_module/install
diff --git a/src/algorithms/telemetry_decoder/gnuradio_blocks/galileo_e1b_telemetry_decoder_cc.cc b/src/algorithms/telemetry_decoder/gnuradio_blocks/galileo_e1b_telemetry_decoder_cc.cc
index bea64c69a..fbd583cf3 100644
--- a/src/algorithms/telemetry_decoder/gnuradio_blocks/galileo_e1b_telemetry_decoder_cc.cc
+++ b/src/algorithms/telemetry_decoder/gnuradio_blocks/galileo_e1b_telemetry_decoder_cc.cc
@@ -38,7 +38,6 @@
 #include <gnuradio/io_signature.h>
 #include <glog/logging.h>
 #include "control_message_factory.h"
-#include "galileo_navigation_message.h"
 #include "gnss_synchro.h"
 #include "convolutional.h"
 
diff --git a/src/algorithms/telemetry_decoder/gnuradio_blocks/galileo_e1b_telemetry_decoder_cc.h b/src/algorithms/telemetry_decoder/gnuradio_blocks/galileo_e1b_telemetry_decoder_cc.h
index 805ef1205..04d5ae507 100644
--- a/src/algorithms/telemetry_decoder/gnuradio_blocks/galileo_e1b_telemetry_decoder_cc.h
+++ b/src/algorithms/telemetry_decoder/gnuradio_blocks/galileo_e1b_telemetry_decoder_cc.h
@@ -36,9 +36,6 @@
 #include <string>
 #include <gnuradio/block.h>
 #include <gnuradio/msg_queue.h>
-#include <gnuradio/trellis/interleaver.h>
-#include <gnuradio/trellis/permutation.h>
-#include <gnuradio/fec/viterbi.h>
 #include "Galileo_E1.h"
 #include "concurrent_queue.h"
 #include "gnss_satellite.h"
diff --git a/src/algorithms/telemetry_decoder/gnuradio_blocks/galileo_e5a_telemetry_decoder_cc.cc b/src/algorithms/telemetry_decoder/gnuradio_blocks/galileo_e5a_telemetry_decoder_cc.cc
index ed6850c21..c8167c447 100644
--- a/src/algorithms/telemetry_decoder/gnuradio_blocks/galileo_e5a_telemetry_decoder_cc.cc
+++ b/src/algorithms/telemetry_decoder/gnuradio_blocks/galileo_e5a_telemetry_decoder_cc.cc
@@ -41,7 +41,6 @@
 #include <gnuradio/io_signature.h>
 #include <glog/logging.h>
 #include "control_message_factory.h"
-#include "galileo_fnav_message.h"
 #include "gnss_synchro.h"
 #include "convolutional.h"
 
diff --git a/src/algorithms/telemetry_decoder/gnuradio_blocks/galileo_e5a_telemetry_decoder_cc.h b/src/algorithms/telemetry_decoder/gnuradio_blocks/galileo_e5a_telemetry_decoder_cc.h
index 0573fe02d..7f07d3e39 100644
--- a/src/algorithms/telemetry_decoder/gnuradio_blocks/galileo_e5a_telemetry_decoder_cc.h
+++ b/src/algorithms/telemetry_decoder/gnuradio_blocks/galileo_e5a_telemetry_decoder_cc.h
@@ -40,9 +40,6 @@
 #include <string>
 #include <gnuradio/block.h>
 #include <gnuradio/msg_queue.h>
-#include <gnuradio/trellis/interleaver.h>
-#include <gnuradio/trellis/permutation.h>
-//#include <gnuradio/fec/viterbi.h>
 #include "Galileo_E5a.h"
 #include "concurrent_queue.h"
 #include "gnss_satellite.h"
diff --git a/src/algorithms/telemetry_decoder/libs/gps_l1_ca_subframe_fsm.cc b/src/algorithms/telemetry_decoder/libs/gps_l1_ca_subframe_fsm.cc
index 6aa8972ec..b3fb5cf84 100644
--- a/src/algorithms/telemetry_decoder/libs/gps_l1_ca_subframe_fsm.cc
+++ b/src/algorithms/telemetry_decoder/libs/gps_l1_ca_subframe_fsm.cc
@@ -29,8 +29,12 @@
  */
 
 #include "gps_l1_ca_subframe_fsm.h"
-#include <list>
 #include <string>
+#include <boost/statechart/simple_state.hpp>
+#include <boost/statechart/state.hpp>
+#include <boost/statechart/transition.hpp>
+#include <boost/statechart/custom_reaction.hpp>
+#include <boost/mpl/list.hpp>
 
 
 //************ GPS WORD TO SUBFRAME DECODER STATE MACHINE **********
diff --git a/src/algorithms/telemetry_decoder/libs/gps_l1_ca_subframe_fsm.h b/src/algorithms/telemetry_decoder/libs/gps_l1_ca_subframe_fsm.h
index ac2b207ab..1350d9873 100644
--- a/src/algorithms/telemetry_decoder/libs/gps_l1_ca_subframe_fsm.h
+++ b/src/algorithms/telemetry_decoder/libs/gps_l1_ca_subframe_fsm.h
@@ -33,17 +33,7 @@
 #define GNSS_SDR_GPS_L1_CA_SUBFRAME_FSM_H_
 
 #include <boost/statechart/state_machine.hpp>
-#include <boost/statechart/simple_state.hpp>
-#include <boost/statechart/state.hpp>
-#include <boost/statechart/transition.hpp>
-#include <boost/statechart/custom_reaction.hpp>
-#include <boost/mpl/list.hpp>
-#include <queue>
-#include <boost/thread/mutex.hpp>
-#include <boost/thread/thread.hpp>
 #include "concurrent_queue.h"
-#include <iostream>
-#include <cstring>
 #include "GPS_L1_CA.h"
 #include "gps_navigation_message.h"
 #include "gps_ephemeris.h"