From 3e45e4cc5659fa7353f693851f67b4fea679a555 Mon Sep 17 00:00:00 2001 From: andres Date: Tue, 28 Oct 2014 01:00:04 +0100 Subject: [PATCH] Various changes: Updated top CMakeFile.txt Moved volk module to a better path. Trying to add support for GCC. Fixes. --- CMakeLists.txt | 67 +++++++----------- .../libs/volk_gnsssdr_module/CMakeLists.txt | 50 +++++++++++++ .../volk_gnsssdr/CMakeLists.txt | 0 .../volk_gnsssdr/apps/CMakeLists.txt | 0 .../apps/volk_gnsssdr-config-info.cc | 0 .../volk_gnsssdr/apps/volk_gnsssdr_profile.cc | 0 .../cmake/CMakeParseArgumentsCopy.cmake | 0 .../volk_gnsssdr/cmake/FindORC.cmake | 0 .../volk_gnsssdr/cmake/GrPython.cmake | 0 .../volk_gnsssdr/cmake/VolkBoost.cmake | 0 .../volk_gnsssdr/cmake/VolkConfig.cmake | 0 .../volk_gnsssdr/cmake/msvc/config.h | 0 .../volk_gnsssdr/cmake/msvc/inttypes.h | 0 .../volk_gnsssdr/cmake/msvc/stdbool.h | 0 .../volk_gnsssdr/cmake/msvc/stdint.h | 0 .../volk_gnsssdr/gen/archs.xml | 0 .../volk_gnsssdr/gen/machines.xml | 0 .../gen/volk_gnsssdr_arch_defs.py | 0 .../gen/volk_gnsssdr_compile_utils.py | 0 .../gen/volk_gnsssdr_kernel_defs.py | 0 .../gen/volk_gnsssdr_machine_defs.py | 0 .../gen/volk_gnsssdr_tmpl_utils.py | 0 .../include/volk_gnsssdr/constants.h | 0 .../volk_gnsssdr/volk_gnsssdr_common.h | 0 .../volk_gnsssdr/volk_gnsssdr_complex.h | 0 .../volk_gnsssdr/volk_gnsssdr_malloc.h | 0 .../include/volk_gnsssdr/volk_gnsssdr_prefs.h | 0 .../kernels/CommonMacros/CommonMacros.h | 0 .../CommonMacros_16ic_cw_epl_corr_32fc.h | 0 .../CommonMacros_8ic_cw_epl_corr_32fc.h | 0 .../kernels/CommonMacros/README.txt | 0 .../volk_gnsssdr/kernels/README.txt | 0 ...volk_gnsssdr_16ic_x5_cw_epl_corr_32fc_x3.h | 0 ...gnsssdr_16ic_x5_cw_epl_corr_TEST_32fc_x3.h | 0 ...olk_gnsssdr_16ic_x7_cw_vepl_corr_32fc_x5.h | 0 .../volk_gnsssdr_32fc_convert_16ic.h | 0 .../volk_gnsssdr_32fc_convert_8ic.h | 0 .../volk_gnsssdr_32fc_s32f_convert_8ic.h | 0 ...ssdr_32fc_s32f_x4_update_local_code_32fc.h | 0 ...volk_gnsssdr_32fc_x5_cw_epl_corr_32fc_x3.h | 0 ...olk_gnsssdr_32fc_x7_cw_vepl_corr_32fc_x5.h | 0 .../volk_gnsssdr_64f_accumulator_64f.h | 0 .../volk_gnsssdr_8i_accumulator_s8i.h | 0 .../volk_gnsssdr_8i_index_max_16u.h | 0 .../volk_gnsssdr/volk_gnsssdr_8i_max_s8i.h | 0 .../volk_gnsssdr/volk_gnsssdr_8i_x2_add_8i.h | 0 .../volk_gnsssdr_8ic_conjugate_8ic.h | 0 .../volk_gnsssdr_8ic_magnitude_squared_8i.h | 0 .../volk_gnsssdr_8ic_s8ic_multiply_8ic.h | 0 .../volk_gnsssdr_8ic_x2_dot_prod_8ic.h | 0 .../volk_gnsssdr_8ic_x2_multiply_8ic.h | 0 .../volk_gnsssdr_8ic_x5_cw_epl_corr_32fc_x3.h | 0 .../volk_gnsssdr_8ic_x5_cw_epl_corr_8ic_x3.h | 0 ...volk_gnsssdr_8ic_x7_cw_vepl_corr_32fc_x5.h | 0 ...gnsssdr_8ic_x7_cw_vepl_corr_TEST_32fc_x5.h | 0 ...gnsssdr_8ic_x7_cw_vepl_corr_safe_32fc_x5.h | 0 ...sssdr_8ic_x7_cw_vepl_corr_unsafe_32fc_x5.h | 0 .../volk_gnsssdr_8u_x2_multiply_8u.h | 0 ...nsssdr_s32f_x2_update_local_carrier_32fc.h | 0 .../volk_gnsssdr/lib/CMakeLists.txt | 0 .../volk_gnsssdr/lib/constants.c.in | 0 .../volk_gnsssdr/lib/gcc_x86_cpuid.h | 0 .../lib/qa_16s_add_quad_aligned16.cc | 0 .../lib/qa_16s_add_quad_aligned16.h | 0 .../lib/qa_16s_branch_4_state_8_aligned16.cc | 0 .../lib/qa_16s_branch_4_state_8_aligned16.h | 0 ...qa_16s_permute_and_scalar_add_aligned16.cc | 0 .../qa_16s_permute_and_scalar_add_aligned16.h | 0 .../lib/qa_16s_quad_max_star_aligned16.cc | 0 .../lib/qa_16s_quad_max_star_aligned16.h | 0 .../lib/qa_32f_fm_detect_aligned16.cc | 0 .../lib/qa_32f_fm_detect_aligned16.h | 0 .../lib/qa_32f_index_max_aligned16.cc | 0 .../lib/qa_32f_index_max_aligned16.h | 0 .../lib/qa_32fc_index_max_aligned16.cc | 0 .../lib/qa_32fc_index_max_aligned16.h | 0 ...fc_power_spectral_density_32f_aligned16.cc | 0 ...2fc_power_spectral_density_32f_aligned16.h | 0 .../volk_gnsssdr/lib/qa_utils.cc | 0 .../volk_gnsssdr/lib/qa_utils.h | 0 .../volk_gnsssdr/lib/testqa.cc | 0 .../volk_gnsssdr/lib/volk_gnsssdr_malloc.c | 0 .../volk_gnsssdr/lib/volk_gnsssdr_prefs.c | 0 .../lib/volk_gnsssdr_rank_archs.c | 0 .../lib/volk_gnsssdr_rank_archs.h | 0 ..._16sc_magnitude_32f_aligned16_orc_impl.orc | 0 .../orc/volk_gnsssdr_32f_x2_add_32f.orc | 0 .../volk_gnsssdr_32fc_s32fc_multiply_32fc.orc | 0 .../volk_gnsssdr_32fc_x2_multiply_32fc.orc | 0 .../orc/volk_gnsssdr_8i_accumulator_s8i.orc | 0 .../orc/volk_gnsssdr_8i_x2_add_8i.orc | 0 .../orc/volk_gnsssdr_8ic_conjugate_8ic.orc | 0 .../volk_gnsssdr_8ic_magnitude_squared_8i.orc | 0 .../volk_gnsssdr_8ic_s8ic_multiply_8ic.orc | 0 .../orc/volk_gnsssdr_8ic_x2_dot_prod_8ic.orc | 0 .../orc/volk_gnsssdr_8ic_x2_multiply_8ic.orc | 0 ...volk_gnsssdr_8ic_x5_cw_epl_corr_8ic_x3.orc | 0 .../orc/volk_gnsssdr_8u_x2_multiply_8u.orc | 0 .../2014-10-17_Patch.patch | 0 .../2014-10-17_Patch_with_protokernels.patch | 0 .../README.txt | 0 .../volk_gnsssdr_modtool/CMakeLists.txt | 0 .../python/volk_gnsssdr_modtool/README | 0 .../python/volk_gnsssdr_modtool/__init__.py | 0 .../python/volk_gnsssdr_modtool/__init__.pyc | Bin .../python/volk_gnsssdr_modtool/cfg.py | 0 .../python/volk_gnsssdr_modtool/cfg.pyc | Bin .../volk_gnsssdr_modtool/volk_gnsssdr_modtool | 0 .../volk_gnsssdr_modtool_generate.py | 0 .../volk_gnsssdr_modtool_generate.pyc | Bin .../volk_gnsssdr/tmpl/volk_gnsssdr.tmpl.c | 0 .../volk_gnsssdr/tmpl/volk_gnsssdr.tmpl.h | 0 .../tmpl/volk_gnsssdr_config_fixed.tmpl.h | 0 .../volk_gnsssdr/tmpl/volk_gnsssdr_cpu.tmpl.c | 0 .../volk_gnsssdr/tmpl/volk_gnsssdr_cpu.tmpl.h | 0 .../tmpl/volk_gnsssdr_machine_xxx.tmpl.c | 0 .../tmpl/volk_gnsssdr_machines.tmpl.c | 0 .../tmpl/volk_gnsssdr_machines.tmpl.h | 0 .../tmpl/volk_gnsssdr_typedefs.tmpl.h | 0 .../volk_gnsssdr/volk_gnsssdr.pc.in | 0 .../volk_gnsssdr/volk_modtool.cfg | 0 121 files changed, 76 insertions(+), 41 deletions(-) create mode 100644 src/algorithms/libs/volk_gnsssdr_module/CMakeLists.txt rename src/algorithms/libs/{ => volk_gnsssdr_module}/volk_gnsssdr/CMakeLists.txt (100%) rename src/algorithms/libs/{ => volk_gnsssdr_module}/volk_gnsssdr/apps/CMakeLists.txt (100%) rename src/algorithms/libs/{ => volk_gnsssdr_module}/volk_gnsssdr/apps/volk_gnsssdr-config-info.cc (100%) rename src/algorithms/libs/{ => volk_gnsssdr_module}/volk_gnsssdr/apps/volk_gnsssdr_profile.cc (100%) rename src/algorithms/libs/{ => volk_gnsssdr_module}/volk_gnsssdr/cmake/CMakeParseArgumentsCopy.cmake (100%) rename src/algorithms/libs/{ => volk_gnsssdr_module}/volk_gnsssdr/cmake/FindORC.cmake (100%) rename src/algorithms/libs/{ => volk_gnsssdr_module}/volk_gnsssdr/cmake/GrPython.cmake (100%) rename src/algorithms/libs/{ => volk_gnsssdr_module}/volk_gnsssdr/cmake/VolkBoost.cmake (100%) rename src/algorithms/libs/{ => volk_gnsssdr_module}/volk_gnsssdr/cmake/VolkConfig.cmake (100%) rename src/algorithms/libs/{ => volk_gnsssdr_module}/volk_gnsssdr/cmake/msvc/config.h (100%) rename src/algorithms/libs/{ => volk_gnsssdr_module}/volk_gnsssdr/cmake/msvc/inttypes.h (100%) rename src/algorithms/libs/{ => volk_gnsssdr_module}/volk_gnsssdr/cmake/msvc/stdbool.h (100%) rename src/algorithms/libs/{ => volk_gnsssdr_module}/volk_gnsssdr/cmake/msvc/stdint.h (100%) rename src/algorithms/libs/{ => volk_gnsssdr_module}/volk_gnsssdr/gen/archs.xml (100%) rename src/algorithms/libs/{ => volk_gnsssdr_module}/volk_gnsssdr/gen/machines.xml (100%) rename src/algorithms/libs/{ => volk_gnsssdr_module}/volk_gnsssdr/gen/volk_gnsssdr_arch_defs.py (100%) rename src/algorithms/libs/{ => volk_gnsssdr_module}/volk_gnsssdr/gen/volk_gnsssdr_compile_utils.py (100%) rename src/algorithms/libs/{ => volk_gnsssdr_module}/volk_gnsssdr/gen/volk_gnsssdr_kernel_defs.py (100%) rename src/algorithms/libs/{ => volk_gnsssdr_module}/volk_gnsssdr/gen/volk_gnsssdr_machine_defs.py (100%) rename src/algorithms/libs/{ => volk_gnsssdr_module}/volk_gnsssdr/gen/volk_gnsssdr_tmpl_utils.py (100%) rename src/algorithms/libs/{ => volk_gnsssdr_module}/volk_gnsssdr/include/volk_gnsssdr/constants.h (100%) rename src/algorithms/libs/{ => volk_gnsssdr_module}/volk_gnsssdr/include/volk_gnsssdr/volk_gnsssdr_common.h (100%) rename src/algorithms/libs/{ => volk_gnsssdr_module}/volk_gnsssdr/include/volk_gnsssdr/volk_gnsssdr_complex.h (100%) rename src/algorithms/libs/{ => volk_gnsssdr_module}/volk_gnsssdr/include/volk_gnsssdr/volk_gnsssdr_malloc.h (100%) rename src/algorithms/libs/{ => volk_gnsssdr_module}/volk_gnsssdr/include/volk_gnsssdr/volk_gnsssdr_prefs.h (100%) rename src/algorithms/libs/{ => volk_gnsssdr_module}/volk_gnsssdr/kernels/CommonMacros/CommonMacros.h (100%) rename src/algorithms/libs/{ => volk_gnsssdr_module}/volk_gnsssdr/kernels/CommonMacros/CommonMacros_16ic_cw_epl_corr_32fc.h (100%) rename src/algorithms/libs/{ => volk_gnsssdr_module}/volk_gnsssdr/kernels/CommonMacros/CommonMacros_8ic_cw_epl_corr_32fc.h (100%) rename src/algorithms/libs/{ => volk_gnsssdr_module}/volk_gnsssdr/kernels/CommonMacros/README.txt (100%) rename src/algorithms/libs/{ => volk_gnsssdr_module}/volk_gnsssdr/kernels/README.txt (100%) rename src/algorithms/libs/{ => volk_gnsssdr_module}/volk_gnsssdr/kernels/volk_gnsssdr/volk_gnsssdr_16ic_x5_cw_epl_corr_32fc_x3.h (100%) rename src/algorithms/libs/{ => volk_gnsssdr_module}/volk_gnsssdr/kernels/volk_gnsssdr/volk_gnsssdr_16ic_x5_cw_epl_corr_TEST_32fc_x3.h (100%) rename src/algorithms/libs/{ => volk_gnsssdr_module}/volk_gnsssdr/kernels/volk_gnsssdr/volk_gnsssdr_16ic_x7_cw_vepl_corr_32fc_x5.h (100%) rename src/algorithms/libs/{ => volk_gnsssdr_module}/volk_gnsssdr/kernels/volk_gnsssdr/volk_gnsssdr_32fc_convert_16ic.h (100%) rename src/algorithms/libs/{ => volk_gnsssdr_module}/volk_gnsssdr/kernels/volk_gnsssdr/volk_gnsssdr_32fc_convert_8ic.h (100%) rename src/algorithms/libs/{ => volk_gnsssdr_module}/volk_gnsssdr/kernels/volk_gnsssdr/volk_gnsssdr_32fc_s32f_convert_8ic.h (100%) rename src/algorithms/libs/{ => volk_gnsssdr_module}/volk_gnsssdr/kernels/volk_gnsssdr/volk_gnsssdr_32fc_s32f_x4_update_local_code_32fc.h (100%) rename src/algorithms/libs/{ => volk_gnsssdr_module}/volk_gnsssdr/kernels/volk_gnsssdr/volk_gnsssdr_32fc_x5_cw_epl_corr_32fc_x3.h (100%) rename src/algorithms/libs/{ => volk_gnsssdr_module}/volk_gnsssdr/kernels/volk_gnsssdr/volk_gnsssdr_32fc_x7_cw_vepl_corr_32fc_x5.h (100%) rename src/algorithms/libs/{ => volk_gnsssdr_module}/volk_gnsssdr/kernels/volk_gnsssdr/volk_gnsssdr_64f_accumulator_64f.h (100%) rename src/algorithms/libs/{ => volk_gnsssdr_module}/volk_gnsssdr/kernels/volk_gnsssdr/volk_gnsssdr_8i_accumulator_s8i.h (100%) rename src/algorithms/libs/{ => volk_gnsssdr_module}/volk_gnsssdr/kernels/volk_gnsssdr/volk_gnsssdr_8i_index_max_16u.h (100%) rename src/algorithms/libs/{ => volk_gnsssdr_module}/volk_gnsssdr/kernels/volk_gnsssdr/volk_gnsssdr_8i_max_s8i.h (100%) rename src/algorithms/libs/{ => volk_gnsssdr_module}/volk_gnsssdr/kernels/volk_gnsssdr/volk_gnsssdr_8i_x2_add_8i.h (100%) rename src/algorithms/libs/{ => volk_gnsssdr_module}/volk_gnsssdr/kernels/volk_gnsssdr/volk_gnsssdr_8ic_conjugate_8ic.h (100%) rename src/algorithms/libs/{ => volk_gnsssdr_module}/volk_gnsssdr/kernels/volk_gnsssdr/volk_gnsssdr_8ic_magnitude_squared_8i.h (100%) rename src/algorithms/libs/{ => volk_gnsssdr_module}/volk_gnsssdr/kernels/volk_gnsssdr/volk_gnsssdr_8ic_s8ic_multiply_8ic.h (100%) rename src/algorithms/libs/{ => volk_gnsssdr_module}/volk_gnsssdr/kernels/volk_gnsssdr/volk_gnsssdr_8ic_x2_dot_prod_8ic.h (100%) rename src/algorithms/libs/{ => volk_gnsssdr_module}/volk_gnsssdr/kernels/volk_gnsssdr/volk_gnsssdr_8ic_x2_multiply_8ic.h (100%) rename src/algorithms/libs/{ => volk_gnsssdr_module}/volk_gnsssdr/kernels/volk_gnsssdr/volk_gnsssdr_8ic_x5_cw_epl_corr_32fc_x3.h (100%) rename src/algorithms/libs/{ => volk_gnsssdr_module}/volk_gnsssdr/kernels/volk_gnsssdr/volk_gnsssdr_8ic_x5_cw_epl_corr_8ic_x3.h (100%) rename src/algorithms/libs/{ => volk_gnsssdr_module}/volk_gnsssdr/kernels/volk_gnsssdr/volk_gnsssdr_8ic_x7_cw_vepl_corr_32fc_x5.h (100%) rename src/algorithms/libs/{ => volk_gnsssdr_module}/volk_gnsssdr/kernels/volk_gnsssdr/volk_gnsssdr_8ic_x7_cw_vepl_corr_TEST_32fc_x5.h (100%) rename src/algorithms/libs/{ => volk_gnsssdr_module}/volk_gnsssdr/kernels/volk_gnsssdr/volk_gnsssdr_8ic_x7_cw_vepl_corr_safe_32fc_x5.h (100%) rename src/algorithms/libs/{ => volk_gnsssdr_module}/volk_gnsssdr/kernels/volk_gnsssdr/volk_gnsssdr_8ic_x7_cw_vepl_corr_unsafe_32fc_x5.h (100%) rename src/algorithms/libs/{ => volk_gnsssdr_module}/volk_gnsssdr/kernels/volk_gnsssdr/volk_gnsssdr_8u_x2_multiply_8u.h (100%) rename src/algorithms/libs/{ => volk_gnsssdr_module}/volk_gnsssdr/kernels/volk_gnsssdr/volk_gnsssdr_s32f_x2_update_local_carrier_32fc.h (100%) rename src/algorithms/libs/{ => volk_gnsssdr_module}/volk_gnsssdr/lib/CMakeLists.txt (100%) rename src/algorithms/libs/{ => volk_gnsssdr_module}/volk_gnsssdr/lib/constants.c.in (100%) rename src/algorithms/libs/{ => volk_gnsssdr_module}/volk_gnsssdr/lib/gcc_x86_cpuid.h (100%) rename src/algorithms/libs/{ => volk_gnsssdr_module}/volk_gnsssdr/lib/qa_16s_add_quad_aligned16.cc (100%) rename src/algorithms/libs/{ => volk_gnsssdr_module}/volk_gnsssdr/lib/qa_16s_add_quad_aligned16.h (100%) rename src/algorithms/libs/{ => volk_gnsssdr_module}/volk_gnsssdr/lib/qa_16s_branch_4_state_8_aligned16.cc (100%) rename src/algorithms/libs/{ => volk_gnsssdr_module}/volk_gnsssdr/lib/qa_16s_branch_4_state_8_aligned16.h (100%) rename src/algorithms/libs/{ => volk_gnsssdr_module}/volk_gnsssdr/lib/qa_16s_permute_and_scalar_add_aligned16.cc (100%) rename src/algorithms/libs/{ => volk_gnsssdr_module}/volk_gnsssdr/lib/qa_16s_permute_and_scalar_add_aligned16.h (100%) rename src/algorithms/libs/{ => volk_gnsssdr_module}/volk_gnsssdr/lib/qa_16s_quad_max_star_aligned16.cc (100%) rename src/algorithms/libs/{ => volk_gnsssdr_module}/volk_gnsssdr/lib/qa_16s_quad_max_star_aligned16.h (100%) rename src/algorithms/libs/{ => volk_gnsssdr_module}/volk_gnsssdr/lib/qa_32f_fm_detect_aligned16.cc (100%) rename src/algorithms/libs/{ => volk_gnsssdr_module}/volk_gnsssdr/lib/qa_32f_fm_detect_aligned16.h (100%) rename src/algorithms/libs/{ => volk_gnsssdr_module}/volk_gnsssdr/lib/qa_32f_index_max_aligned16.cc (100%) rename src/algorithms/libs/{ => volk_gnsssdr_module}/volk_gnsssdr/lib/qa_32f_index_max_aligned16.h (100%) rename src/algorithms/libs/{ => volk_gnsssdr_module}/volk_gnsssdr/lib/qa_32fc_index_max_aligned16.cc (100%) rename src/algorithms/libs/{ => volk_gnsssdr_module}/volk_gnsssdr/lib/qa_32fc_index_max_aligned16.h (100%) rename src/algorithms/libs/{ => volk_gnsssdr_module}/volk_gnsssdr/lib/qa_32fc_power_spectral_density_32f_aligned16.cc (100%) rename src/algorithms/libs/{ => volk_gnsssdr_module}/volk_gnsssdr/lib/qa_32fc_power_spectral_density_32f_aligned16.h (100%) rename src/algorithms/libs/{ => volk_gnsssdr_module}/volk_gnsssdr/lib/qa_utils.cc (100%) rename src/algorithms/libs/{ => volk_gnsssdr_module}/volk_gnsssdr/lib/qa_utils.h (100%) rename src/algorithms/libs/{ => volk_gnsssdr_module}/volk_gnsssdr/lib/testqa.cc (100%) rename src/algorithms/libs/{ => volk_gnsssdr_module}/volk_gnsssdr/lib/volk_gnsssdr_malloc.c (100%) rename src/algorithms/libs/{ => volk_gnsssdr_module}/volk_gnsssdr/lib/volk_gnsssdr_prefs.c (100%) rename src/algorithms/libs/{ => volk_gnsssdr_module}/volk_gnsssdr/lib/volk_gnsssdr_rank_archs.c (100%) rename src/algorithms/libs/{ => volk_gnsssdr_module}/volk_gnsssdr/lib/volk_gnsssdr_rank_archs.h (100%) rename src/algorithms/libs/{ => volk_gnsssdr_module}/volk_gnsssdr/orc/volk_gnsssdr_16sc_magnitude_32f_aligned16_orc_impl.orc (100%) rename src/algorithms/libs/{ => volk_gnsssdr_module}/volk_gnsssdr/orc/volk_gnsssdr_32f_x2_add_32f.orc (100%) rename src/algorithms/libs/{ => volk_gnsssdr_module}/volk_gnsssdr/orc/volk_gnsssdr_32fc_s32fc_multiply_32fc.orc (100%) rename src/algorithms/libs/{ => volk_gnsssdr_module}/volk_gnsssdr/orc/volk_gnsssdr_32fc_x2_multiply_32fc.orc (100%) rename src/algorithms/libs/{ => volk_gnsssdr_module}/volk_gnsssdr/orc/volk_gnsssdr_8i_accumulator_s8i.orc (100%) rename src/algorithms/libs/{ => volk_gnsssdr_module}/volk_gnsssdr/orc/volk_gnsssdr_8i_x2_add_8i.orc (100%) rename src/algorithms/libs/{ => volk_gnsssdr_module}/volk_gnsssdr/orc/volk_gnsssdr_8ic_conjugate_8ic.orc (100%) rename src/algorithms/libs/{ => volk_gnsssdr_module}/volk_gnsssdr/orc/volk_gnsssdr_8ic_magnitude_squared_8i.orc (100%) rename src/algorithms/libs/{ => volk_gnsssdr_module}/volk_gnsssdr/orc/volk_gnsssdr_8ic_s8ic_multiply_8ic.orc (100%) rename src/algorithms/libs/{ => volk_gnsssdr_module}/volk_gnsssdr/orc/volk_gnsssdr_8ic_x2_dot_prod_8ic.orc (100%) rename src/algorithms/libs/{ => volk_gnsssdr_module}/volk_gnsssdr/orc/volk_gnsssdr_8ic_x2_multiply_8ic.orc (100%) rename src/algorithms/libs/{ => volk_gnsssdr_module}/volk_gnsssdr/orc/volk_gnsssdr_8ic_x5_cw_epl_corr_8ic_x3.orc (100%) rename src/algorithms/libs/{ => volk_gnsssdr_module}/volk_gnsssdr/orc/volk_gnsssdr_8u_x2_multiply_8u.orc (100%) rename src/algorithms/libs/{ => volk_gnsssdr_module}/volk_gnsssdr/patches for generating volk_gnsssdr/2014-10-17_Patch.patch (100%) rename src/algorithms/libs/{ => volk_gnsssdr_module}/volk_gnsssdr/patches for generating volk_gnsssdr/2014-10-17_Patch_with_protokernels.patch (100%) rename src/algorithms/libs/{ => volk_gnsssdr_module}/volk_gnsssdr/patches for generating volk_gnsssdr/README.txt (100%) rename src/algorithms/libs/{ => volk_gnsssdr_module}/volk_gnsssdr/python/volk_gnsssdr_modtool/CMakeLists.txt (100%) rename src/algorithms/libs/{ => volk_gnsssdr_module}/volk_gnsssdr/python/volk_gnsssdr_modtool/README (100%) rename src/algorithms/libs/{ => volk_gnsssdr_module}/volk_gnsssdr/python/volk_gnsssdr_modtool/__init__.py (100%) rename src/algorithms/libs/{ => volk_gnsssdr_module}/volk_gnsssdr/python/volk_gnsssdr_modtool/__init__.pyc (100%) rename src/algorithms/libs/{ => volk_gnsssdr_module}/volk_gnsssdr/python/volk_gnsssdr_modtool/cfg.py (100%) rename src/algorithms/libs/{ => volk_gnsssdr_module}/volk_gnsssdr/python/volk_gnsssdr_modtool/cfg.pyc (100%) rename src/algorithms/libs/{ => volk_gnsssdr_module}/volk_gnsssdr/python/volk_gnsssdr_modtool/volk_gnsssdr_modtool (100%) rename src/algorithms/libs/{ => volk_gnsssdr_module}/volk_gnsssdr/python/volk_gnsssdr_modtool/volk_gnsssdr_modtool_generate.py (100%) rename src/algorithms/libs/{ => volk_gnsssdr_module}/volk_gnsssdr/python/volk_gnsssdr_modtool/volk_gnsssdr_modtool_generate.pyc (100%) rename src/algorithms/libs/{ => volk_gnsssdr_module}/volk_gnsssdr/tmpl/volk_gnsssdr.tmpl.c (100%) rename src/algorithms/libs/{ => volk_gnsssdr_module}/volk_gnsssdr/tmpl/volk_gnsssdr.tmpl.h (100%) rename src/algorithms/libs/{ => volk_gnsssdr_module}/volk_gnsssdr/tmpl/volk_gnsssdr_config_fixed.tmpl.h (100%) rename src/algorithms/libs/{ => volk_gnsssdr_module}/volk_gnsssdr/tmpl/volk_gnsssdr_cpu.tmpl.c (100%) rename src/algorithms/libs/{ => volk_gnsssdr_module}/volk_gnsssdr/tmpl/volk_gnsssdr_cpu.tmpl.h (100%) rename src/algorithms/libs/{ => volk_gnsssdr_module}/volk_gnsssdr/tmpl/volk_gnsssdr_machine_xxx.tmpl.c (100%) rename src/algorithms/libs/{ => volk_gnsssdr_module}/volk_gnsssdr/tmpl/volk_gnsssdr_machines.tmpl.c (100%) rename src/algorithms/libs/{ => volk_gnsssdr_module}/volk_gnsssdr/tmpl/volk_gnsssdr_machines.tmpl.h (100%) rename src/algorithms/libs/{ => volk_gnsssdr_module}/volk_gnsssdr/tmpl/volk_gnsssdr_typedefs.tmpl.h (100%) rename src/algorithms/libs/{ => volk_gnsssdr_module}/volk_gnsssdr/volk_gnsssdr.pc.in (100%) rename src/algorithms/libs/{ => volk_gnsssdr_module}/volk_gnsssdr/volk_modtool.cfg (100%) diff --git a/CMakeLists.txt b/CMakeLists.txt index a23f9a02c..3a3d044de 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -41,7 +41,6 @@ option(ENABLE_RTLSDR "Enable the use of RTL dongles as signal source (experiment option(ENABLE_OPENCL "Enable building of processing blocks implemented with OpenCL (experimental)" OFF) option(ENABLE_GPERFTOOLS "Enable linking to Gperftools libraries (tcmalloc and profiler)" OFF) option(ENABLE_GENERIC_ARCH "Builds a portable binary" OFF) -option(ENABLE_VOLK_GNSSSDR "Enable building of volk_gnsssdr module: some volk protokernels coded by gnss-sdr" OFF) ############################### @@ -143,6 +142,7 @@ if(${CMAKE_SYSTEM_NAME} MATCHES "Linux") ) if(${LINUX_DISTRIBUTION} MATCHES "Debian") set(LINUX_DISTRIBUTION "Debian") + file(READ /etc/debian_version LINUX_VER) endif(${LINUX_DISTRIBUTION} MATCHES "Debian") endif(EXISTS "/etc/os-release") endif(NOT LINUX_DISTRIBUTION) @@ -171,6 +171,12 @@ if(${CMAKE_SYSTEM_NAME} MATCHES "Darwin") set(OS_IS_MACOSX TRUE) exec_program(uname ARGS -v OUTPUT_VARIABLE DARWIN_VERSION) string(REGEX MATCH "[0-9]+" DARWIN_VERSION ${DARWIN_VERSION}) + if(${DARWIN_VERSION} MATCHES "14") + set(MACOSX_YOSEMITE TRUE) + set(CMAKE_XCODE_ATTRIBUTE_CLANG_CXX_LANGUAGE_STANDARD "c++11") + set(CMAKE_XCODE_ATTRIBUTE_CLANG_CXX_LIBRARY "libc++") + message(STATUS "Configuring GNSS-SDR v${VERSION} to be built on Mac OS X 10.10 Yosemite") + endif(${DARWIN_VERSION} MATCHES "14") if(${DARWIN_VERSION} MATCHES "13") set(MACOSX_MAVERICKS TRUE) set(CMAKE_XCODE_ATTRIBUTE_CLANG_CXX_LANGUAGE_STANDARD "c++11") @@ -205,6 +211,7 @@ set(CMAKE_BUILD_TYPE ${CMAKE_BUILD_TYPE} CACHE STRING "") # Append -O2 optimization flag for Debug builds set(CMAKE_CXX_FLAGS_DEBUG "${CMAKE_CXX_FLAGS_DEBUG} -O2") + ################################################################################ # Checkout cmake version ################################################################################ @@ -213,6 +220,7 @@ if(CMAKE_VERSION VERSION_LESS 2.8.8) message(FATAL_ERROR "Fatal error: CMake >= 2.8.8 required.") endif(CMAKE_VERSION VERSION_LESS 2.8.8) + ################################################################################ # Checkout compiler version ################################################################################ @@ -342,39 +350,10 @@ if(NOT GNURADIO_TRELLIS_FOUND) endif() -############################################################################### -# Volk_gnsssdr module -#In order to use volk_gnsssr module it is necessary to add: -# 1) include_directories(..${VOLK_GNSSSDR_INCLUDE_DIRS}..) -# 2) target_link_libraries(..${VOLK_GNSSSDR_LIBRARIES}..) -############################################################################### - -if(ENABLE_VOLK_GNSSSDR) - message(STATUS "The volk_gnsssdr module with custom protokernels coded by gnss-sdr will be compiled.") - message(STATUS "You can disable it with 'cmake -DENABLE_VOLK_GNSSSDR=OFF ../'" ) -else(ENABLE_VOLK_GNSSSDR) - message(STATUS "The volk_gnsssdr module with custom protokernels coded by gnss-sdr is not enabled. Some configurations that use custom protokernels will not work." ) - message(STATUS "Enable it with 'cmake -D ENABLE_VOLK_GNSSSDR=ON ../'." ) -endif(ENABLE_VOLK_GNSSSDR) - -if(ENABLE_VOLK_GNSSSDR) - set(VOLK_GNSSSDR_BASE_PATH ${CMAKE_CURRENT_SOURCE_DIR}/src/algorithms/libs/volk_gnsssdr) - add_subdirectory(${VOLK_GNSSSDR_BASE_PATH}) - - set(VOLK_GNSSSDR_INCLUDE_DIRS - ${VOLK_GNSSSDR_BASE_PATH}/include - ${CMAKE_CURRENT_BINARY_DIR}/src/algorithms/libs/volk_gnsssdr/include - ) - - set(VOLK_GNSSSDR_LIBRARIES - #Path to libs of volk_gnsssdr target: ${VOLK_GNSSSDR_BASE_PATH}/lib/Debug/libvolk_gnsssdr.dylib - volk_gnsssdr - ) - - message(" * INCLUDES: ${VOLK_GNSSSDR_INCLUDE_DIRS} ") - message(" * LIBS: ${VOLK_GNSSSDR_LIBRARIES} ") - message("-- END OF: Setup volk_gnsssdr as a subproject.") -endif(ENABLE_VOLK_GNSSSDR) +################################################################################ +# volk_gnsssdr module +################################################################################ +add_subdirectory(src/algorithms/libs/volk_gnsssdr_module) ################################################################################ @@ -610,25 +589,31 @@ if(OS_IS_LINUX) /usr/lib/gcc/x86_64-redhat-linux/4.7.2 # Fedora 18 /usr/lib/gcc/i686-redhat-linux/4.7.2 /usr/lib/gcc/x86_64-redhat-linux/4.8.1 # Fedora 19 + /usr/lib/gcc/x86_64-redhat-linux/4.8.3 # Fedora 20 + /usr/lib/gcc/x86_64-redhat-linux/4.9.1 # Fedora 21 /usr/lib/gcc/i686-redhat-linux/4.8.1 + /usr/lib/gcc/i686-redhat-linux/4.8.3 + /usr/lib/gcc/i686-redhat-linux/4.9.1 /usr/lib/gcc/x86_64-redhat-linux/4.4.4 # CentOS 6 /usr/lib/gcc/i686-redhat-linux/4.4.4 /usr/lib/gcc/x86_64-redhat-linux/4.8.2 /usr/lib/gcc/i686-redhat-linux/4.8.2 /usr/lib/gcc/i586-suse-linux/4.8 # OpenSUSE 13.1 + /usr/lib/gcc/i586-suse-linux/4.9 /usr/lib/gcc/x86_64-suse-linux/4.8 + /usr/lib/gcc/x86_64-suse-linux/4.9 /usr/lib/gcc/i486-linux-gnu # Debian 7 /usr/lib/gcc/i486-linux-gnu/4.4 /usr/lib/gcc/i486-linux-gnu/4.6 /usr/lib/gcc/i486-linux-gnu/4.7 /usr/lib/gcc/i486-linux-gnu/4.8 /usr/lib/gcc/i486-linux-gnu/4.9 - /usr/lib/gcc/arm-linux-gnueabihf/4.4 # Debian armhf - /usr/lib/gcc/arm-linux-gnueabihf/4.5 - /usr/lib/gcc/arm-linux-gnueabihf/4.6 - /usr/lib/gcc/arm-linux-gnueabihf/4.7 - /usr/lib/gcc/arm-linux-gnueabihf/4.8 - /usr/lib/gcc/arm-linux-gnueabihf/4.9 + /usr/lib/gcc/arm-linux-gnueabihf/4.4 # Debian armhf + /usr/lib/gcc/arm-linux-gnueabihf/4.5 + /usr/lib/gcc/arm-linux-gnueabihf/4.6 + /usr/lib/gcc/arm-linux-gnueabihf/4.7 + /usr/lib/gcc/arm-linux-gnueabihf/4.8 + /usr/lib/gcc/arm-linux-gnueabihf/4.9 ) if(NOT GFORTRAN) message(" The gfortran library has not been found.") @@ -1000,4 +985,4 @@ add_custom_target(uninstall ######################################################################## # Add subdirectories (in order of deps) ######################################################################## -add_subdirectory(src) +add_subdirectory(src) \ No newline at end of file diff --git a/src/algorithms/libs/volk_gnsssdr_module/CMakeLists.txt b/src/algorithms/libs/volk_gnsssdr_module/CMakeLists.txt new file mode 100644 index 000000000..86bb4550e --- /dev/null +++ b/src/algorithms/libs/volk_gnsssdr_module/CMakeLists.txt @@ -0,0 +1,50 @@ +# Copyright (C) 2012-2014 (see AUTHORS file for a list of contributors) +# +# This file is part of GNSS-SDR. +# +# GNSS-SDR 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 of the License, or +# (at your option) any later version. +# +# GNSS-SDR 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 GNSS-SDR. If not, see . +# + +############################################################################### +# Volk_gnsssdr module +#In order to use volk_gnsssr module it is necessary to add: +# 1) include_directories(..${VOLK_GNSSSDR_INCLUDE_DIRS}..) +# 2) target_link_libraries(..${VOLK_GNSSSDR_LIBRARIES}..) +############################################################################### + +message(STATUS " START OF: Setup volk_gnsssdr as a subproject.") + +set(VOLK_GNSSSDR_BASE_PATH ${CMAKE_CURRENT_SOURCE_DIR}/volk_gnsssdr) + +set(CMAKE_INSTALL_PREFIX ${CMAKE_CURRENT_BINARY_DIR}/volk_gnsssdr/lib) +list(APPEND CMAKE_C_FLAGS "-std=c11") + +add_subdirectory(${VOLK_GNSSSDR_BASE_PATH}) + +set(VOLK_GNSSSDR_INCLUDE_DIRS + ${VOLK_GNSSSDR_BASE_PATH}/include + ${CMAKE_CURRENT_BINARY_DIR}/volk_gnsssdr/include + CACHE INTERNAL "" +) + +set(VOLK_GNSSSDR_LIBRARIES + #Path to libs of volk_gnsssdr target: ${VOLK_GNSSSDR_BASE_PATH}/lib/Debug/libvolk_gnsssdr.dylib + volk_gnsssdr + CACHE INTERNAL "" +) + +message(STATUS " * INCLUDES: ${VOLK_GNSSSDR_INCLUDE_DIRS} ") +message(STATUS " * LIBS: ${VOLK_GNSSSDR_LIBRARIES} ") +message(STATUS " END OF: Setup volk_gnsssdr as a subproject.") + diff --git a/src/algorithms/libs/volk_gnsssdr/CMakeLists.txt b/src/algorithms/libs/volk_gnsssdr_module/volk_gnsssdr/CMakeLists.txt similarity index 100% rename from src/algorithms/libs/volk_gnsssdr/CMakeLists.txt rename to src/algorithms/libs/volk_gnsssdr_module/volk_gnsssdr/CMakeLists.txt diff --git a/src/algorithms/libs/volk_gnsssdr/apps/CMakeLists.txt b/src/algorithms/libs/volk_gnsssdr_module/volk_gnsssdr/apps/CMakeLists.txt similarity index 100% rename from src/algorithms/libs/volk_gnsssdr/apps/CMakeLists.txt rename to src/algorithms/libs/volk_gnsssdr_module/volk_gnsssdr/apps/CMakeLists.txt diff --git a/src/algorithms/libs/volk_gnsssdr/apps/volk_gnsssdr-config-info.cc b/src/algorithms/libs/volk_gnsssdr_module/volk_gnsssdr/apps/volk_gnsssdr-config-info.cc similarity index 100% rename from src/algorithms/libs/volk_gnsssdr/apps/volk_gnsssdr-config-info.cc rename to src/algorithms/libs/volk_gnsssdr_module/volk_gnsssdr/apps/volk_gnsssdr-config-info.cc diff --git a/src/algorithms/libs/volk_gnsssdr/apps/volk_gnsssdr_profile.cc b/src/algorithms/libs/volk_gnsssdr_module/volk_gnsssdr/apps/volk_gnsssdr_profile.cc similarity index 100% rename from src/algorithms/libs/volk_gnsssdr/apps/volk_gnsssdr_profile.cc rename to src/algorithms/libs/volk_gnsssdr_module/volk_gnsssdr/apps/volk_gnsssdr_profile.cc diff --git a/src/algorithms/libs/volk_gnsssdr/cmake/CMakeParseArgumentsCopy.cmake b/src/algorithms/libs/volk_gnsssdr_module/volk_gnsssdr/cmake/CMakeParseArgumentsCopy.cmake similarity index 100% rename from src/algorithms/libs/volk_gnsssdr/cmake/CMakeParseArgumentsCopy.cmake rename to src/algorithms/libs/volk_gnsssdr_module/volk_gnsssdr/cmake/CMakeParseArgumentsCopy.cmake diff --git a/src/algorithms/libs/volk_gnsssdr/cmake/FindORC.cmake b/src/algorithms/libs/volk_gnsssdr_module/volk_gnsssdr/cmake/FindORC.cmake similarity index 100% rename from src/algorithms/libs/volk_gnsssdr/cmake/FindORC.cmake rename to src/algorithms/libs/volk_gnsssdr_module/volk_gnsssdr/cmake/FindORC.cmake diff --git a/src/algorithms/libs/volk_gnsssdr/cmake/GrPython.cmake b/src/algorithms/libs/volk_gnsssdr_module/volk_gnsssdr/cmake/GrPython.cmake similarity index 100% rename from src/algorithms/libs/volk_gnsssdr/cmake/GrPython.cmake rename to src/algorithms/libs/volk_gnsssdr_module/volk_gnsssdr/cmake/GrPython.cmake diff --git a/src/algorithms/libs/volk_gnsssdr/cmake/VolkBoost.cmake b/src/algorithms/libs/volk_gnsssdr_module/volk_gnsssdr/cmake/VolkBoost.cmake similarity index 100% rename from src/algorithms/libs/volk_gnsssdr/cmake/VolkBoost.cmake rename to src/algorithms/libs/volk_gnsssdr_module/volk_gnsssdr/cmake/VolkBoost.cmake diff --git a/src/algorithms/libs/volk_gnsssdr/cmake/VolkConfig.cmake b/src/algorithms/libs/volk_gnsssdr_module/volk_gnsssdr/cmake/VolkConfig.cmake similarity index 100% rename from src/algorithms/libs/volk_gnsssdr/cmake/VolkConfig.cmake rename to src/algorithms/libs/volk_gnsssdr_module/volk_gnsssdr/cmake/VolkConfig.cmake diff --git a/src/algorithms/libs/volk_gnsssdr/cmake/msvc/config.h b/src/algorithms/libs/volk_gnsssdr_module/volk_gnsssdr/cmake/msvc/config.h similarity index 100% rename from src/algorithms/libs/volk_gnsssdr/cmake/msvc/config.h rename to src/algorithms/libs/volk_gnsssdr_module/volk_gnsssdr/cmake/msvc/config.h diff --git a/src/algorithms/libs/volk_gnsssdr/cmake/msvc/inttypes.h b/src/algorithms/libs/volk_gnsssdr_module/volk_gnsssdr/cmake/msvc/inttypes.h similarity index 100% rename from src/algorithms/libs/volk_gnsssdr/cmake/msvc/inttypes.h rename to src/algorithms/libs/volk_gnsssdr_module/volk_gnsssdr/cmake/msvc/inttypes.h diff --git a/src/algorithms/libs/volk_gnsssdr/cmake/msvc/stdbool.h b/src/algorithms/libs/volk_gnsssdr_module/volk_gnsssdr/cmake/msvc/stdbool.h similarity index 100% rename from src/algorithms/libs/volk_gnsssdr/cmake/msvc/stdbool.h rename to src/algorithms/libs/volk_gnsssdr_module/volk_gnsssdr/cmake/msvc/stdbool.h diff --git a/src/algorithms/libs/volk_gnsssdr/cmake/msvc/stdint.h b/src/algorithms/libs/volk_gnsssdr_module/volk_gnsssdr/cmake/msvc/stdint.h similarity index 100% rename from src/algorithms/libs/volk_gnsssdr/cmake/msvc/stdint.h rename to src/algorithms/libs/volk_gnsssdr_module/volk_gnsssdr/cmake/msvc/stdint.h diff --git a/src/algorithms/libs/volk_gnsssdr/gen/archs.xml b/src/algorithms/libs/volk_gnsssdr_module/volk_gnsssdr/gen/archs.xml similarity index 100% rename from src/algorithms/libs/volk_gnsssdr/gen/archs.xml rename to src/algorithms/libs/volk_gnsssdr_module/volk_gnsssdr/gen/archs.xml diff --git a/src/algorithms/libs/volk_gnsssdr/gen/machines.xml b/src/algorithms/libs/volk_gnsssdr_module/volk_gnsssdr/gen/machines.xml similarity index 100% rename from src/algorithms/libs/volk_gnsssdr/gen/machines.xml rename to src/algorithms/libs/volk_gnsssdr_module/volk_gnsssdr/gen/machines.xml diff --git a/src/algorithms/libs/volk_gnsssdr/gen/volk_gnsssdr_arch_defs.py b/src/algorithms/libs/volk_gnsssdr_module/volk_gnsssdr/gen/volk_gnsssdr_arch_defs.py similarity index 100% rename from src/algorithms/libs/volk_gnsssdr/gen/volk_gnsssdr_arch_defs.py rename to src/algorithms/libs/volk_gnsssdr_module/volk_gnsssdr/gen/volk_gnsssdr_arch_defs.py diff --git a/src/algorithms/libs/volk_gnsssdr/gen/volk_gnsssdr_compile_utils.py b/src/algorithms/libs/volk_gnsssdr_module/volk_gnsssdr/gen/volk_gnsssdr_compile_utils.py similarity index 100% rename from src/algorithms/libs/volk_gnsssdr/gen/volk_gnsssdr_compile_utils.py rename to src/algorithms/libs/volk_gnsssdr_module/volk_gnsssdr/gen/volk_gnsssdr_compile_utils.py diff --git a/src/algorithms/libs/volk_gnsssdr/gen/volk_gnsssdr_kernel_defs.py b/src/algorithms/libs/volk_gnsssdr_module/volk_gnsssdr/gen/volk_gnsssdr_kernel_defs.py similarity index 100% rename from src/algorithms/libs/volk_gnsssdr/gen/volk_gnsssdr_kernel_defs.py rename to src/algorithms/libs/volk_gnsssdr_module/volk_gnsssdr/gen/volk_gnsssdr_kernel_defs.py diff --git a/src/algorithms/libs/volk_gnsssdr/gen/volk_gnsssdr_machine_defs.py b/src/algorithms/libs/volk_gnsssdr_module/volk_gnsssdr/gen/volk_gnsssdr_machine_defs.py similarity index 100% rename from src/algorithms/libs/volk_gnsssdr/gen/volk_gnsssdr_machine_defs.py rename to src/algorithms/libs/volk_gnsssdr_module/volk_gnsssdr/gen/volk_gnsssdr_machine_defs.py diff --git a/src/algorithms/libs/volk_gnsssdr/gen/volk_gnsssdr_tmpl_utils.py b/src/algorithms/libs/volk_gnsssdr_module/volk_gnsssdr/gen/volk_gnsssdr_tmpl_utils.py similarity index 100% rename from src/algorithms/libs/volk_gnsssdr/gen/volk_gnsssdr_tmpl_utils.py rename to src/algorithms/libs/volk_gnsssdr_module/volk_gnsssdr/gen/volk_gnsssdr_tmpl_utils.py diff --git a/src/algorithms/libs/volk_gnsssdr/include/volk_gnsssdr/constants.h b/src/algorithms/libs/volk_gnsssdr_module/volk_gnsssdr/include/volk_gnsssdr/constants.h similarity index 100% rename from src/algorithms/libs/volk_gnsssdr/include/volk_gnsssdr/constants.h rename to src/algorithms/libs/volk_gnsssdr_module/volk_gnsssdr/include/volk_gnsssdr/constants.h diff --git a/src/algorithms/libs/volk_gnsssdr/include/volk_gnsssdr/volk_gnsssdr_common.h b/src/algorithms/libs/volk_gnsssdr_module/volk_gnsssdr/include/volk_gnsssdr/volk_gnsssdr_common.h similarity index 100% rename from src/algorithms/libs/volk_gnsssdr/include/volk_gnsssdr/volk_gnsssdr_common.h rename to src/algorithms/libs/volk_gnsssdr_module/volk_gnsssdr/include/volk_gnsssdr/volk_gnsssdr_common.h diff --git a/src/algorithms/libs/volk_gnsssdr/include/volk_gnsssdr/volk_gnsssdr_complex.h b/src/algorithms/libs/volk_gnsssdr_module/volk_gnsssdr/include/volk_gnsssdr/volk_gnsssdr_complex.h similarity index 100% rename from src/algorithms/libs/volk_gnsssdr/include/volk_gnsssdr/volk_gnsssdr_complex.h rename to src/algorithms/libs/volk_gnsssdr_module/volk_gnsssdr/include/volk_gnsssdr/volk_gnsssdr_complex.h diff --git a/src/algorithms/libs/volk_gnsssdr/include/volk_gnsssdr/volk_gnsssdr_malloc.h b/src/algorithms/libs/volk_gnsssdr_module/volk_gnsssdr/include/volk_gnsssdr/volk_gnsssdr_malloc.h similarity index 100% rename from src/algorithms/libs/volk_gnsssdr/include/volk_gnsssdr/volk_gnsssdr_malloc.h rename to src/algorithms/libs/volk_gnsssdr_module/volk_gnsssdr/include/volk_gnsssdr/volk_gnsssdr_malloc.h diff --git a/src/algorithms/libs/volk_gnsssdr/include/volk_gnsssdr/volk_gnsssdr_prefs.h b/src/algorithms/libs/volk_gnsssdr_module/volk_gnsssdr/include/volk_gnsssdr/volk_gnsssdr_prefs.h similarity index 100% rename from src/algorithms/libs/volk_gnsssdr/include/volk_gnsssdr/volk_gnsssdr_prefs.h rename to src/algorithms/libs/volk_gnsssdr_module/volk_gnsssdr/include/volk_gnsssdr/volk_gnsssdr_prefs.h diff --git a/src/algorithms/libs/volk_gnsssdr/kernels/CommonMacros/CommonMacros.h b/src/algorithms/libs/volk_gnsssdr_module/volk_gnsssdr/kernels/CommonMacros/CommonMacros.h similarity index 100% rename from src/algorithms/libs/volk_gnsssdr/kernels/CommonMacros/CommonMacros.h rename to src/algorithms/libs/volk_gnsssdr_module/volk_gnsssdr/kernels/CommonMacros/CommonMacros.h diff --git a/src/algorithms/libs/volk_gnsssdr/kernels/CommonMacros/CommonMacros_16ic_cw_epl_corr_32fc.h b/src/algorithms/libs/volk_gnsssdr_module/volk_gnsssdr/kernels/CommonMacros/CommonMacros_16ic_cw_epl_corr_32fc.h similarity index 100% rename from src/algorithms/libs/volk_gnsssdr/kernels/CommonMacros/CommonMacros_16ic_cw_epl_corr_32fc.h rename to src/algorithms/libs/volk_gnsssdr_module/volk_gnsssdr/kernels/CommonMacros/CommonMacros_16ic_cw_epl_corr_32fc.h diff --git a/src/algorithms/libs/volk_gnsssdr/kernels/CommonMacros/CommonMacros_8ic_cw_epl_corr_32fc.h b/src/algorithms/libs/volk_gnsssdr_module/volk_gnsssdr/kernels/CommonMacros/CommonMacros_8ic_cw_epl_corr_32fc.h similarity index 100% rename from src/algorithms/libs/volk_gnsssdr/kernels/CommonMacros/CommonMacros_8ic_cw_epl_corr_32fc.h rename to src/algorithms/libs/volk_gnsssdr_module/volk_gnsssdr/kernels/CommonMacros/CommonMacros_8ic_cw_epl_corr_32fc.h diff --git a/src/algorithms/libs/volk_gnsssdr/kernels/CommonMacros/README.txt b/src/algorithms/libs/volk_gnsssdr_module/volk_gnsssdr/kernels/CommonMacros/README.txt similarity index 100% rename from src/algorithms/libs/volk_gnsssdr/kernels/CommonMacros/README.txt rename to src/algorithms/libs/volk_gnsssdr_module/volk_gnsssdr/kernels/CommonMacros/README.txt diff --git a/src/algorithms/libs/volk_gnsssdr/kernels/README.txt b/src/algorithms/libs/volk_gnsssdr_module/volk_gnsssdr/kernels/README.txt similarity index 100% rename from src/algorithms/libs/volk_gnsssdr/kernels/README.txt rename to src/algorithms/libs/volk_gnsssdr_module/volk_gnsssdr/kernels/README.txt diff --git a/src/algorithms/libs/volk_gnsssdr/kernels/volk_gnsssdr/volk_gnsssdr_16ic_x5_cw_epl_corr_32fc_x3.h b/src/algorithms/libs/volk_gnsssdr_module/volk_gnsssdr/kernels/volk_gnsssdr/volk_gnsssdr_16ic_x5_cw_epl_corr_32fc_x3.h similarity index 100% rename from src/algorithms/libs/volk_gnsssdr/kernels/volk_gnsssdr/volk_gnsssdr_16ic_x5_cw_epl_corr_32fc_x3.h rename to src/algorithms/libs/volk_gnsssdr_module/volk_gnsssdr/kernels/volk_gnsssdr/volk_gnsssdr_16ic_x5_cw_epl_corr_32fc_x3.h diff --git a/src/algorithms/libs/volk_gnsssdr/kernels/volk_gnsssdr/volk_gnsssdr_16ic_x5_cw_epl_corr_TEST_32fc_x3.h b/src/algorithms/libs/volk_gnsssdr_module/volk_gnsssdr/kernels/volk_gnsssdr/volk_gnsssdr_16ic_x5_cw_epl_corr_TEST_32fc_x3.h similarity index 100% rename from src/algorithms/libs/volk_gnsssdr/kernels/volk_gnsssdr/volk_gnsssdr_16ic_x5_cw_epl_corr_TEST_32fc_x3.h rename to src/algorithms/libs/volk_gnsssdr_module/volk_gnsssdr/kernels/volk_gnsssdr/volk_gnsssdr_16ic_x5_cw_epl_corr_TEST_32fc_x3.h diff --git a/src/algorithms/libs/volk_gnsssdr/kernels/volk_gnsssdr/volk_gnsssdr_16ic_x7_cw_vepl_corr_32fc_x5.h b/src/algorithms/libs/volk_gnsssdr_module/volk_gnsssdr/kernels/volk_gnsssdr/volk_gnsssdr_16ic_x7_cw_vepl_corr_32fc_x5.h similarity index 100% rename from src/algorithms/libs/volk_gnsssdr/kernels/volk_gnsssdr/volk_gnsssdr_16ic_x7_cw_vepl_corr_32fc_x5.h rename to src/algorithms/libs/volk_gnsssdr_module/volk_gnsssdr/kernels/volk_gnsssdr/volk_gnsssdr_16ic_x7_cw_vepl_corr_32fc_x5.h diff --git a/src/algorithms/libs/volk_gnsssdr/kernels/volk_gnsssdr/volk_gnsssdr_32fc_convert_16ic.h b/src/algorithms/libs/volk_gnsssdr_module/volk_gnsssdr/kernels/volk_gnsssdr/volk_gnsssdr_32fc_convert_16ic.h similarity index 100% rename from src/algorithms/libs/volk_gnsssdr/kernels/volk_gnsssdr/volk_gnsssdr_32fc_convert_16ic.h rename to src/algorithms/libs/volk_gnsssdr_module/volk_gnsssdr/kernels/volk_gnsssdr/volk_gnsssdr_32fc_convert_16ic.h diff --git a/src/algorithms/libs/volk_gnsssdr/kernels/volk_gnsssdr/volk_gnsssdr_32fc_convert_8ic.h b/src/algorithms/libs/volk_gnsssdr_module/volk_gnsssdr/kernels/volk_gnsssdr/volk_gnsssdr_32fc_convert_8ic.h similarity index 100% rename from src/algorithms/libs/volk_gnsssdr/kernels/volk_gnsssdr/volk_gnsssdr_32fc_convert_8ic.h rename to src/algorithms/libs/volk_gnsssdr_module/volk_gnsssdr/kernels/volk_gnsssdr/volk_gnsssdr_32fc_convert_8ic.h diff --git a/src/algorithms/libs/volk_gnsssdr/kernels/volk_gnsssdr/volk_gnsssdr_32fc_s32f_convert_8ic.h b/src/algorithms/libs/volk_gnsssdr_module/volk_gnsssdr/kernels/volk_gnsssdr/volk_gnsssdr_32fc_s32f_convert_8ic.h similarity index 100% rename from src/algorithms/libs/volk_gnsssdr/kernels/volk_gnsssdr/volk_gnsssdr_32fc_s32f_convert_8ic.h rename to src/algorithms/libs/volk_gnsssdr_module/volk_gnsssdr/kernels/volk_gnsssdr/volk_gnsssdr_32fc_s32f_convert_8ic.h diff --git a/src/algorithms/libs/volk_gnsssdr/kernels/volk_gnsssdr/volk_gnsssdr_32fc_s32f_x4_update_local_code_32fc.h b/src/algorithms/libs/volk_gnsssdr_module/volk_gnsssdr/kernels/volk_gnsssdr/volk_gnsssdr_32fc_s32f_x4_update_local_code_32fc.h similarity index 100% rename from src/algorithms/libs/volk_gnsssdr/kernels/volk_gnsssdr/volk_gnsssdr_32fc_s32f_x4_update_local_code_32fc.h rename to src/algorithms/libs/volk_gnsssdr_module/volk_gnsssdr/kernels/volk_gnsssdr/volk_gnsssdr_32fc_s32f_x4_update_local_code_32fc.h diff --git a/src/algorithms/libs/volk_gnsssdr/kernels/volk_gnsssdr/volk_gnsssdr_32fc_x5_cw_epl_corr_32fc_x3.h b/src/algorithms/libs/volk_gnsssdr_module/volk_gnsssdr/kernels/volk_gnsssdr/volk_gnsssdr_32fc_x5_cw_epl_corr_32fc_x3.h similarity index 100% rename from src/algorithms/libs/volk_gnsssdr/kernels/volk_gnsssdr/volk_gnsssdr_32fc_x5_cw_epl_corr_32fc_x3.h rename to src/algorithms/libs/volk_gnsssdr_module/volk_gnsssdr/kernels/volk_gnsssdr/volk_gnsssdr_32fc_x5_cw_epl_corr_32fc_x3.h diff --git a/src/algorithms/libs/volk_gnsssdr/kernels/volk_gnsssdr/volk_gnsssdr_32fc_x7_cw_vepl_corr_32fc_x5.h b/src/algorithms/libs/volk_gnsssdr_module/volk_gnsssdr/kernels/volk_gnsssdr/volk_gnsssdr_32fc_x7_cw_vepl_corr_32fc_x5.h similarity index 100% rename from src/algorithms/libs/volk_gnsssdr/kernels/volk_gnsssdr/volk_gnsssdr_32fc_x7_cw_vepl_corr_32fc_x5.h rename to src/algorithms/libs/volk_gnsssdr_module/volk_gnsssdr/kernels/volk_gnsssdr/volk_gnsssdr_32fc_x7_cw_vepl_corr_32fc_x5.h diff --git a/src/algorithms/libs/volk_gnsssdr/kernels/volk_gnsssdr/volk_gnsssdr_64f_accumulator_64f.h b/src/algorithms/libs/volk_gnsssdr_module/volk_gnsssdr/kernels/volk_gnsssdr/volk_gnsssdr_64f_accumulator_64f.h similarity index 100% rename from src/algorithms/libs/volk_gnsssdr/kernels/volk_gnsssdr/volk_gnsssdr_64f_accumulator_64f.h rename to src/algorithms/libs/volk_gnsssdr_module/volk_gnsssdr/kernels/volk_gnsssdr/volk_gnsssdr_64f_accumulator_64f.h diff --git a/src/algorithms/libs/volk_gnsssdr/kernels/volk_gnsssdr/volk_gnsssdr_8i_accumulator_s8i.h b/src/algorithms/libs/volk_gnsssdr_module/volk_gnsssdr/kernels/volk_gnsssdr/volk_gnsssdr_8i_accumulator_s8i.h similarity index 100% rename from src/algorithms/libs/volk_gnsssdr/kernels/volk_gnsssdr/volk_gnsssdr_8i_accumulator_s8i.h rename to src/algorithms/libs/volk_gnsssdr_module/volk_gnsssdr/kernels/volk_gnsssdr/volk_gnsssdr_8i_accumulator_s8i.h diff --git a/src/algorithms/libs/volk_gnsssdr/kernels/volk_gnsssdr/volk_gnsssdr_8i_index_max_16u.h b/src/algorithms/libs/volk_gnsssdr_module/volk_gnsssdr/kernels/volk_gnsssdr/volk_gnsssdr_8i_index_max_16u.h similarity index 100% rename from src/algorithms/libs/volk_gnsssdr/kernels/volk_gnsssdr/volk_gnsssdr_8i_index_max_16u.h rename to src/algorithms/libs/volk_gnsssdr_module/volk_gnsssdr/kernels/volk_gnsssdr/volk_gnsssdr_8i_index_max_16u.h diff --git a/src/algorithms/libs/volk_gnsssdr/kernels/volk_gnsssdr/volk_gnsssdr_8i_max_s8i.h b/src/algorithms/libs/volk_gnsssdr_module/volk_gnsssdr/kernels/volk_gnsssdr/volk_gnsssdr_8i_max_s8i.h similarity index 100% rename from src/algorithms/libs/volk_gnsssdr/kernels/volk_gnsssdr/volk_gnsssdr_8i_max_s8i.h rename to src/algorithms/libs/volk_gnsssdr_module/volk_gnsssdr/kernels/volk_gnsssdr/volk_gnsssdr_8i_max_s8i.h diff --git a/src/algorithms/libs/volk_gnsssdr/kernels/volk_gnsssdr/volk_gnsssdr_8i_x2_add_8i.h b/src/algorithms/libs/volk_gnsssdr_module/volk_gnsssdr/kernels/volk_gnsssdr/volk_gnsssdr_8i_x2_add_8i.h similarity index 100% rename from src/algorithms/libs/volk_gnsssdr/kernels/volk_gnsssdr/volk_gnsssdr_8i_x2_add_8i.h rename to src/algorithms/libs/volk_gnsssdr_module/volk_gnsssdr/kernels/volk_gnsssdr/volk_gnsssdr_8i_x2_add_8i.h diff --git a/src/algorithms/libs/volk_gnsssdr/kernels/volk_gnsssdr/volk_gnsssdr_8ic_conjugate_8ic.h b/src/algorithms/libs/volk_gnsssdr_module/volk_gnsssdr/kernels/volk_gnsssdr/volk_gnsssdr_8ic_conjugate_8ic.h similarity index 100% rename from src/algorithms/libs/volk_gnsssdr/kernels/volk_gnsssdr/volk_gnsssdr_8ic_conjugate_8ic.h rename to src/algorithms/libs/volk_gnsssdr_module/volk_gnsssdr/kernels/volk_gnsssdr/volk_gnsssdr_8ic_conjugate_8ic.h diff --git a/src/algorithms/libs/volk_gnsssdr/kernels/volk_gnsssdr/volk_gnsssdr_8ic_magnitude_squared_8i.h b/src/algorithms/libs/volk_gnsssdr_module/volk_gnsssdr/kernels/volk_gnsssdr/volk_gnsssdr_8ic_magnitude_squared_8i.h similarity index 100% rename from src/algorithms/libs/volk_gnsssdr/kernels/volk_gnsssdr/volk_gnsssdr_8ic_magnitude_squared_8i.h rename to src/algorithms/libs/volk_gnsssdr_module/volk_gnsssdr/kernels/volk_gnsssdr/volk_gnsssdr_8ic_magnitude_squared_8i.h diff --git a/src/algorithms/libs/volk_gnsssdr/kernels/volk_gnsssdr/volk_gnsssdr_8ic_s8ic_multiply_8ic.h b/src/algorithms/libs/volk_gnsssdr_module/volk_gnsssdr/kernels/volk_gnsssdr/volk_gnsssdr_8ic_s8ic_multiply_8ic.h similarity index 100% rename from src/algorithms/libs/volk_gnsssdr/kernels/volk_gnsssdr/volk_gnsssdr_8ic_s8ic_multiply_8ic.h rename to src/algorithms/libs/volk_gnsssdr_module/volk_gnsssdr/kernels/volk_gnsssdr/volk_gnsssdr_8ic_s8ic_multiply_8ic.h diff --git a/src/algorithms/libs/volk_gnsssdr/kernels/volk_gnsssdr/volk_gnsssdr_8ic_x2_dot_prod_8ic.h b/src/algorithms/libs/volk_gnsssdr_module/volk_gnsssdr/kernels/volk_gnsssdr/volk_gnsssdr_8ic_x2_dot_prod_8ic.h similarity index 100% rename from src/algorithms/libs/volk_gnsssdr/kernels/volk_gnsssdr/volk_gnsssdr_8ic_x2_dot_prod_8ic.h rename to src/algorithms/libs/volk_gnsssdr_module/volk_gnsssdr/kernels/volk_gnsssdr/volk_gnsssdr_8ic_x2_dot_prod_8ic.h diff --git a/src/algorithms/libs/volk_gnsssdr/kernels/volk_gnsssdr/volk_gnsssdr_8ic_x2_multiply_8ic.h b/src/algorithms/libs/volk_gnsssdr_module/volk_gnsssdr/kernels/volk_gnsssdr/volk_gnsssdr_8ic_x2_multiply_8ic.h similarity index 100% rename from src/algorithms/libs/volk_gnsssdr/kernels/volk_gnsssdr/volk_gnsssdr_8ic_x2_multiply_8ic.h rename to src/algorithms/libs/volk_gnsssdr_module/volk_gnsssdr/kernels/volk_gnsssdr/volk_gnsssdr_8ic_x2_multiply_8ic.h diff --git a/src/algorithms/libs/volk_gnsssdr/kernels/volk_gnsssdr/volk_gnsssdr_8ic_x5_cw_epl_corr_32fc_x3.h b/src/algorithms/libs/volk_gnsssdr_module/volk_gnsssdr/kernels/volk_gnsssdr/volk_gnsssdr_8ic_x5_cw_epl_corr_32fc_x3.h similarity index 100% rename from src/algorithms/libs/volk_gnsssdr/kernels/volk_gnsssdr/volk_gnsssdr_8ic_x5_cw_epl_corr_32fc_x3.h rename to src/algorithms/libs/volk_gnsssdr_module/volk_gnsssdr/kernels/volk_gnsssdr/volk_gnsssdr_8ic_x5_cw_epl_corr_32fc_x3.h diff --git a/src/algorithms/libs/volk_gnsssdr/kernels/volk_gnsssdr/volk_gnsssdr_8ic_x5_cw_epl_corr_8ic_x3.h b/src/algorithms/libs/volk_gnsssdr_module/volk_gnsssdr/kernels/volk_gnsssdr/volk_gnsssdr_8ic_x5_cw_epl_corr_8ic_x3.h similarity index 100% rename from src/algorithms/libs/volk_gnsssdr/kernels/volk_gnsssdr/volk_gnsssdr_8ic_x5_cw_epl_corr_8ic_x3.h rename to src/algorithms/libs/volk_gnsssdr_module/volk_gnsssdr/kernels/volk_gnsssdr/volk_gnsssdr_8ic_x5_cw_epl_corr_8ic_x3.h diff --git a/src/algorithms/libs/volk_gnsssdr/kernels/volk_gnsssdr/volk_gnsssdr_8ic_x7_cw_vepl_corr_32fc_x5.h b/src/algorithms/libs/volk_gnsssdr_module/volk_gnsssdr/kernels/volk_gnsssdr/volk_gnsssdr_8ic_x7_cw_vepl_corr_32fc_x5.h similarity index 100% rename from src/algorithms/libs/volk_gnsssdr/kernels/volk_gnsssdr/volk_gnsssdr_8ic_x7_cw_vepl_corr_32fc_x5.h rename to src/algorithms/libs/volk_gnsssdr_module/volk_gnsssdr/kernels/volk_gnsssdr/volk_gnsssdr_8ic_x7_cw_vepl_corr_32fc_x5.h diff --git a/src/algorithms/libs/volk_gnsssdr/kernels/volk_gnsssdr/volk_gnsssdr_8ic_x7_cw_vepl_corr_TEST_32fc_x5.h b/src/algorithms/libs/volk_gnsssdr_module/volk_gnsssdr/kernels/volk_gnsssdr/volk_gnsssdr_8ic_x7_cw_vepl_corr_TEST_32fc_x5.h similarity index 100% rename from src/algorithms/libs/volk_gnsssdr/kernels/volk_gnsssdr/volk_gnsssdr_8ic_x7_cw_vepl_corr_TEST_32fc_x5.h rename to src/algorithms/libs/volk_gnsssdr_module/volk_gnsssdr/kernels/volk_gnsssdr/volk_gnsssdr_8ic_x7_cw_vepl_corr_TEST_32fc_x5.h diff --git a/src/algorithms/libs/volk_gnsssdr/kernels/volk_gnsssdr/volk_gnsssdr_8ic_x7_cw_vepl_corr_safe_32fc_x5.h b/src/algorithms/libs/volk_gnsssdr_module/volk_gnsssdr/kernels/volk_gnsssdr/volk_gnsssdr_8ic_x7_cw_vepl_corr_safe_32fc_x5.h similarity index 100% rename from src/algorithms/libs/volk_gnsssdr/kernels/volk_gnsssdr/volk_gnsssdr_8ic_x7_cw_vepl_corr_safe_32fc_x5.h rename to src/algorithms/libs/volk_gnsssdr_module/volk_gnsssdr/kernels/volk_gnsssdr/volk_gnsssdr_8ic_x7_cw_vepl_corr_safe_32fc_x5.h diff --git a/src/algorithms/libs/volk_gnsssdr/kernels/volk_gnsssdr/volk_gnsssdr_8ic_x7_cw_vepl_corr_unsafe_32fc_x5.h b/src/algorithms/libs/volk_gnsssdr_module/volk_gnsssdr/kernels/volk_gnsssdr/volk_gnsssdr_8ic_x7_cw_vepl_corr_unsafe_32fc_x5.h similarity index 100% rename from src/algorithms/libs/volk_gnsssdr/kernels/volk_gnsssdr/volk_gnsssdr_8ic_x7_cw_vepl_corr_unsafe_32fc_x5.h rename to src/algorithms/libs/volk_gnsssdr_module/volk_gnsssdr/kernels/volk_gnsssdr/volk_gnsssdr_8ic_x7_cw_vepl_corr_unsafe_32fc_x5.h diff --git a/src/algorithms/libs/volk_gnsssdr/kernels/volk_gnsssdr/volk_gnsssdr_8u_x2_multiply_8u.h b/src/algorithms/libs/volk_gnsssdr_module/volk_gnsssdr/kernels/volk_gnsssdr/volk_gnsssdr_8u_x2_multiply_8u.h similarity index 100% rename from src/algorithms/libs/volk_gnsssdr/kernels/volk_gnsssdr/volk_gnsssdr_8u_x2_multiply_8u.h rename to src/algorithms/libs/volk_gnsssdr_module/volk_gnsssdr/kernels/volk_gnsssdr/volk_gnsssdr_8u_x2_multiply_8u.h diff --git a/src/algorithms/libs/volk_gnsssdr/kernels/volk_gnsssdr/volk_gnsssdr_s32f_x2_update_local_carrier_32fc.h b/src/algorithms/libs/volk_gnsssdr_module/volk_gnsssdr/kernels/volk_gnsssdr/volk_gnsssdr_s32f_x2_update_local_carrier_32fc.h similarity index 100% rename from src/algorithms/libs/volk_gnsssdr/kernels/volk_gnsssdr/volk_gnsssdr_s32f_x2_update_local_carrier_32fc.h rename to src/algorithms/libs/volk_gnsssdr_module/volk_gnsssdr/kernels/volk_gnsssdr/volk_gnsssdr_s32f_x2_update_local_carrier_32fc.h diff --git a/src/algorithms/libs/volk_gnsssdr/lib/CMakeLists.txt b/src/algorithms/libs/volk_gnsssdr_module/volk_gnsssdr/lib/CMakeLists.txt similarity index 100% rename from src/algorithms/libs/volk_gnsssdr/lib/CMakeLists.txt rename to src/algorithms/libs/volk_gnsssdr_module/volk_gnsssdr/lib/CMakeLists.txt diff --git a/src/algorithms/libs/volk_gnsssdr/lib/constants.c.in b/src/algorithms/libs/volk_gnsssdr_module/volk_gnsssdr/lib/constants.c.in similarity index 100% rename from src/algorithms/libs/volk_gnsssdr/lib/constants.c.in rename to src/algorithms/libs/volk_gnsssdr_module/volk_gnsssdr/lib/constants.c.in diff --git a/src/algorithms/libs/volk_gnsssdr/lib/gcc_x86_cpuid.h b/src/algorithms/libs/volk_gnsssdr_module/volk_gnsssdr/lib/gcc_x86_cpuid.h similarity index 100% rename from src/algorithms/libs/volk_gnsssdr/lib/gcc_x86_cpuid.h rename to src/algorithms/libs/volk_gnsssdr_module/volk_gnsssdr/lib/gcc_x86_cpuid.h diff --git a/src/algorithms/libs/volk_gnsssdr/lib/qa_16s_add_quad_aligned16.cc b/src/algorithms/libs/volk_gnsssdr_module/volk_gnsssdr/lib/qa_16s_add_quad_aligned16.cc similarity index 100% rename from src/algorithms/libs/volk_gnsssdr/lib/qa_16s_add_quad_aligned16.cc rename to src/algorithms/libs/volk_gnsssdr_module/volk_gnsssdr/lib/qa_16s_add_quad_aligned16.cc diff --git a/src/algorithms/libs/volk_gnsssdr/lib/qa_16s_add_quad_aligned16.h b/src/algorithms/libs/volk_gnsssdr_module/volk_gnsssdr/lib/qa_16s_add_quad_aligned16.h similarity index 100% rename from src/algorithms/libs/volk_gnsssdr/lib/qa_16s_add_quad_aligned16.h rename to src/algorithms/libs/volk_gnsssdr_module/volk_gnsssdr/lib/qa_16s_add_quad_aligned16.h diff --git a/src/algorithms/libs/volk_gnsssdr/lib/qa_16s_branch_4_state_8_aligned16.cc b/src/algorithms/libs/volk_gnsssdr_module/volk_gnsssdr/lib/qa_16s_branch_4_state_8_aligned16.cc similarity index 100% rename from src/algorithms/libs/volk_gnsssdr/lib/qa_16s_branch_4_state_8_aligned16.cc rename to src/algorithms/libs/volk_gnsssdr_module/volk_gnsssdr/lib/qa_16s_branch_4_state_8_aligned16.cc diff --git a/src/algorithms/libs/volk_gnsssdr/lib/qa_16s_branch_4_state_8_aligned16.h b/src/algorithms/libs/volk_gnsssdr_module/volk_gnsssdr/lib/qa_16s_branch_4_state_8_aligned16.h similarity index 100% rename from src/algorithms/libs/volk_gnsssdr/lib/qa_16s_branch_4_state_8_aligned16.h rename to src/algorithms/libs/volk_gnsssdr_module/volk_gnsssdr/lib/qa_16s_branch_4_state_8_aligned16.h diff --git a/src/algorithms/libs/volk_gnsssdr/lib/qa_16s_permute_and_scalar_add_aligned16.cc b/src/algorithms/libs/volk_gnsssdr_module/volk_gnsssdr/lib/qa_16s_permute_and_scalar_add_aligned16.cc similarity index 100% rename from src/algorithms/libs/volk_gnsssdr/lib/qa_16s_permute_and_scalar_add_aligned16.cc rename to src/algorithms/libs/volk_gnsssdr_module/volk_gnsssdr/lib/qa_16s_permute_and_scalar_add_aligned16.cc diff --git a/src/algorithms/libs/volk_gnsssdr/lib/qa_16s_permute_and_scalar_add_aligned16.h b/src/algorithms/libs/volk_gnsssdr_module/volk_gnsssdr/lib/qa_16s_permute_and_scalar_add_aligned16.h similarity index 100% rename from src/algorithms/libs/volk_gnsssdr/lib/qa_16s_permute_and_scalar_add_aligned16.h rename to src/algorithms/libs/volk_gnsssdr_module/volk_gnsssdr/lib/qa_16s_permute_and_scalar_add_aligned16.h diff --git a/src/algorithms/libs/volk_gnsssdr/lib/qa_16s_quad_max_star_aligned16.cc b/src/algorithms/libs/volk_gnsssdr_module/volk_gnsssdr/lib/qa_16s_quad_max_star_aligned16.cc similarity index 100% rename from src/algorithms/libs/volk_gnsssdr/lib/qa_16s_quad_max_star_aligned16.cc rename to src/algorithms/libs/volk_gnsssdr_module/volk_gnsssdr/lib/qa_16s_quad_max_star_aligned16.cc diff --git a/src/algorithms/libs/volk_gnsssdr/lib/qa_16s_quad_max_star_aligned16.h b/src/algorithms/libs/volk_gnsssdr_module/volk_gnsssdr/lib/qa_16s_quad_max_star_aligned16.h similarity index 100% rename from src/algorithms/libs/volk_gnsssdr/lib/qa_16s_quad_max_star_aligned16.h rename to src/algorithms/libs/volk_gnsssdr_module/volk_gnsssdr/lib/qa_16s_quad_max_star_aligned16.h diff --git a/src/algorithms/libs/volk_gnsssdr/lib/qa_32f_fm_detect_aligned16.cc b/src/algorithms/libs/volk_gnsssdr_module/volk_gnsssdr/lib/qa_32f_fm_detect_aligned16.cc similarity index 100% rename from src/algorithms/libs/volk_gnsssdr/lib/qa_32f_fm_detect_aligned16.cc rename to src/algorithms/libs/volk_gnsssdr_module/volk_gnsssdr/lib/qa_32f_fm_detect_aligned16.cc diff --git a/src/algorithms/libs/volk_gnsssdr/lib/qa_32f_fm_detect_aligned16.h b/src/algorithms/libs/volk_gnsssdr_module/volk_gnsssdr/lib/qa_32f_fm_detect_aligned16.h similarity index 100% rename from src/algorithms/libs/volk_gnsssdr/lib/qa_32f_fm_detect_aligned16.h rename to src/algorithms/libs/volk_gnsssdr_module/volk_gnsssdr/lib/qa_32f_fm_detect_aligned16.h diff --git a/src/algorithms/libs/volk_gnsssdr/lib/qa_32f_index_max_aligned16.cc b/src/algorithms/libs/volk_gnsssdr_module/volk_gnsssdr/lib/qa_32f_index_max_aligned16.cc similarity index 100% rename from src/algorithms/libs/volk_gnsssdr/lib/qa_32f_index_max_aligned16.cc rename to src/algorithms/libs/volk_gnsssdr_module/volk_gnsssdr/lib/qa_32f_index_max_aligned16.cc diff --git a/src/algorithms/libs/volk_gnsssdr/lib/qa_32f_index_max_aligned16.h b/src/algorithms/libs/volk_gnsssdr_module/volk_gnsssdr/lib/qa_32f_index_max_aligned16.h similarity index 100% rename from src/algorithms/libs/volk_gnsssdr/lib/qa_32f_index_max_aligned16.h rename to src/algorithms/libs/volk_gnsssdr_module/volk_gnsssdr/lib/qa_32f_index_max_aligned16.h diff --git a/src/algorithms/libs/volk_gnsssdr/lib/qa_32fc_index_max_aligned16.cc b/src/algorithms/libs/volk_gnsssdr_module/volk_gnsssdr/lib/qa_32fc_index_max_aligned16.cc similarity index 100% rename from src/algorithms/libs/volk_gnsssdr/lib/qa_32fc_index_max_aligned16.cc rename to src/algorithms/libs/volk_gnsssdr_module/volk_gnsssdr/lib/qa_32fc_index_max_aligned16.cc diff --git a/src/algorithms/libs/volk_gnsssdr/lib/qa_32fc_index_max_aligned16.h b/src/algorithms/libs/volk_gnsssdr_module/volk_gnsssdr/lib/qa_32fc_index_max_aligned16.h similarity index 100% rename from src/algorithms/libs/volk_gnsssdr/lib/qa_32fc_index_max_aligned16.h rename to src/algorithms/libs/volk_gnsssdr_module/volk_gnsssdr/lib/qa_32fc_index_max_aligned16.h diff --git a/src/algorithms/libs/volk_gnsssdr/lib/qa_32fc_power_spectral_density_32f_aligned16.cc b/src/algorithms/libs/volk_gnsssdr_module/volk_gnsssdr/lib/qa_32fc_power_spectral_density_32f_aligned16.cc similarity index 100% rename from src/algorithms/libs/volk_gnsssdr/lib/qa_32fc_power_spectral_density_32f_aligned16.cc rename to src/algorithms/libs/volk_gnsssdr_module/volk_gnsssdr/lib/qa_32fc_power_spectral_density_32f_aligned16.cc diff --git a/src/algorithms/libs/volk_gnsssdr/lib/qa_32fc_power_spectral_density_32f_aligned16.h b/src/algorithms/libs/volk_gnsssdr_module/volk_gnsssdr/lib/qa_32fc_power_spectral_density_32f_aligned16.h similarity index 100% rename from src/algorithms/libs/volk_gnsssdr/lib/qa_32fc_power_spectral_density_32f_aligned16.h rename to src/algorithms/libs/volk_gnsssdr_module/volk_gnsssdr/lib/qa_32fc_power_spectral_density_32f_aligned16.h diff --git a/src/algorithms/libs/volk_gnsssdr/lib/qa_utils.cc b/src/algorithms/libs/volk_gnsssdr_module/volk_gnsssdr/lib/qa_utils.cc similarity index 100% rename from src/algorithms/libs/volk_gnsssdr/lib/qa_utils.cc rename to src/algorithms/libs/volk_gnsssdr_module/volk_gnsssdr/lib/qa_utils.cc diff --git a/src/algorithms/libs/volk_gnsssdr/lib/qa_utils.h b/src/algorithms/libs/volk_gnsssdr_module/volk_gnsssdr/lib/qa_utils.h similarity index 100% rename from src/algorithms/libs/volk_gnsssdr/lib/qa_utils.h rename to src/algorithms/libs/volk_gnsssdr_module/volk_gnsssdr/lib/qa_utils.h diff --git a/src/algorithms/libs/volk_gnsssdr/lib/testqa.cc b/src/algorithms/libs/volk_gnsssdr_module/volk_gnsssdr/lib/testqa.cc similarity index 100% rename from src/algorithms/libs/volk_gnsssdr/lib/testqa.cc rename to src/algorithms/libs/volk_gnsssdr_module/volk_gnsssdr/lib/testqa.cc diff --git a/src/algorithms/libs/volk_gnsssdr/lib/volk_gnsssdr_malloc.c b/src/algorithms/libs/volk_gnsssdr_module/volk_gnsssdr/lib/volk_gnsssdr_malloc.c similarity index 100% rename from src/algorithms/libs/volk_gnsssdr/lib/volk_gnsssdr_malloc.c rename to src/algorithms/libs/volk_gnsssdr_module/volk_gnsssdr/lib/volk_gnsssdr_malloc.c diff --git a/src/algorithms/libs/volk_gnsssdr/lib/volk_gnsssdr_prefs.c b/src/algorithms/libs/volk_gnsssdr_module/volk_gnsssdr/lib/volk_gnsssdr_prefs.c similarity index 100% rename from src/algorithms/libs/volk_gnsssdr/lib/volk_gnsssdr_prefs.c rename to src/algorithms/libs/volk_gnsssdr_module/volk_gnsssdr/lib/volk_gnsssdr_prefs.c diff --git a/src/algorithms/libs/volk_gnsssdr/lib/volk_gnsssdr_rank_archs.c b/src/algorithms/libs/volk_gnsssdr_module/volk_gnsssdr/lib/volk_gnsssdr_rank_archs.c similarity index 100% rename from src/algorithms/libs/volk_gnsssdr/lib/volk_gnsssdr_rank_archs.c rename to src/algorithms/libs/volk_gnsssdr_module/volk_gnsssdr/lib/volk_gnsssdr_rank_archs.c diff --git a/src/algorithms/libs/volk_gnsssdr/lib/volk_gnsssdr_rank_archs.h b/src/algorithms/libs/volk_gnsssdr_module/volk_gnsssdr/lib/volk_gnsssdr_rank_archs.h similarity index 100% rename from src/algorithms/libs/volk_gnsssdr/lib/volk_gnsssdr_rank_archs.h rename to src/algorithms/libs/volk_gnsssdr_module/volk_gnsssdr/lib/volk_gnsssdr_rank_archs.h diff --git a/src/algorithms/libs/volk_gnsssdr/orc/volk_gnsssdr_16sc_magnitude_32f_aligned16_orc_impl.orc b/src/algorithms/libs/volk_gnsssdr_module/volk_gnsssdr/orc/volk_gnsssdr_16sc_magnitude_32f_aligned16_orc_impl.orc similarity index 100% rename from src/algorithms/libs/volk_gnsssdr/orc/volk_gnsssdr_16sc_magnitude_32f_aligned16_orc_impl.orc rename to src/algorithms/libs/volk_gnsssdr_module/volk_gnsssdr/orc/volk_gnsssdr_16sc_magnitude_32f_aligned16_orc_impl.orc diff --git a/src/algorithms/libs/volk_gnsssdr/orc/volk_gnsssdr_32f_x2_add_32f.orc b/src/algorithms/libs/volk_gnsssdr_module/volk_gnsssdr/orc/volk_gnsssdr_32f_x2_add_32f.orc similarity index 100% rename from src/algorithms/libs/volk_gnsssdr/orc/volk_gnsssdr_32f_x2_add_32f.orc rename to src/algorithms/libs/volk_gnsssdr_module/volk_gnsssdr/orc/volk_gnsssdr_32f_x2_add_32f.orc diff --git a/src/algorithms/libs/volk_gnsssdr/orc/volk_gnsssdr_32fc_s32fc_multiply_32fc.orc b/src/algorithms/libs/volk_gnsssdr_module/volk_gnsssdr/orc/volk_gnsssdr_32fc_s32fc_multiply_32fc.orc similarity index 100% rename from src/algorithms/libs/volk_gnsssdr/orc/volk_gnsssdr_32fc_s32fc_multiply_32fc.orc rename to src/algorithms/libs/volk_gnsssdr_module/volk_gnsssdr/orc/volk_gnsssdr_32fc_s32fc_multiply_32fc.orc diff --git a/src/algorithms/libs/volk_gnsssdr/orc/volk_gnsssdr_32fc_x2_multiply_32fc.orc b/src/algorithms/libs/volk_gnsssdr_module/volk_gnsssdr/orc/volk_gnsssdr_32fc_x2_multiply_32fc.orc similarity index 100% rename from src/algorithms/libs/volk_gnsssdr/orc/volk_gnsssdr_32fc_x2_multiply_32fc.orc rename to src/algorithms/libs/volk_gnsssdr_module/volk_gnsssdr/orc/volk_gnsssdr_32fc_x2_multiply_32fc.orc diff --git a/src/algorithms/libs/volk_gnsssdr/orc/volk_gnsssdr_8i_accumulator_s8i.orc b/src/algorithms/libs/volk_gnsssdr_module/volk_gnsssdr/orc/volk_gnsssdr_8i_accumulator_s8i.orc similarity index 100% rename from src/algorithms/libs/volk_gnsssdr/orc/volk_gnsssdr_8i_accumulator_s8i.orc rename to src/algorithms/libs/volk_gnsssdr_module/volk_gnsssdr/orc/volk_gnsssdr_8i_accumulator_s8i.orc diff --git a/src/algorithms/libs/volk_gnsssdr/orc/volk_gnsssdr_8i_x2_add_8i.orc b/src/algorithms/libs/volk_gnsssdr_module/volk_gnsssdr/orc/volk_gnsssdr_8i_x2_add_8i.orc similarity index 100% rename from src/algorithms/libs/volk_gnsssdr/orc/volk_gnsssdr_8i_x2_add_8i.orc rename to src/algorithms/libs/volk_gnsssdr_module/volk_gnsssdr/orc/volk_gnsssdr_8i_x2_add_8i.orc diff --git a/src/algorithms/libs/volk_gnsssdr/orc/volk_gnsssdr_8ic_conjugate_8ic.orc b/src/algorithms/libs/volk_gnsssdr_module/volk_gnsssdr/orc/volk_gnsssdr_8ic_conjugate_8ic.orc similarity index 100% rename from src/algorithms/libs/volk_gnsssdr/orc/volk_gnsssdr_8ic_conjugate_8ic.orc rename to src/algorithms/libs/volk_gnsssdr_module/volk_gnsssdr/orc/volk_gnsssdr_8ic_conjugate_8ic.orc diff --git a/src/algorithms/libs/volk_gnsssdr/orc/volk_gnsssdr_8ic_magnitude_squared_8i.orc b/src/algorithms/libs/volk_gnsssdr_module/volk_gnsssdr/orc/volk_gnsssdr_8ic_magnitude_squared_8i.orc similarity index 100% rename from src/algorithms/libs/volk_gnsssdr/orc/volk_gnsssdr_8ic_magnitude_squared_8i.orc rename to src/algorithms/libs/volk_gnsssdr_module/volk_gnsssdr/orc/volk_gnsssdr_8ic_magnitude_squared_8i.orc diff --git a/src/algorithms/libs/volk_gnsssdr/orc/volk_gnsssdr_8ic_s8ic_multiply_8ic.orc b/src/algorithms/libs/volk_gnsssdr_module/volk_gnsssdr/orc/volk_gnsssdr_8ic_s8ic_multiply_8ic.orc similarity index 100% rename from src/algorithms/libs/volk_gnsssdr/orc/volk_gnsssdr_8ic_s8ic_multiply_8ic.orc rename to src/algorithms/libs/volk_gnsssdr_module/volk_gnsssdr/orc/volk_gnsssdr_8ic_s8ic_multiply_8ic.orc diff --git a/src/algorithms/libs/volk_gnsssdr/orc/volk_gnsssdr_8ic_x2_dot_prod_8ic.orc b/src/algorithms/libs/volk_gnsssdr_module/volk_gnsssdr/orc/volk_gnsssdr_8ic_x2_dot_prod_8ic.orc similarity index 100% rename from src/algorithms/libs/volk_gnsssdr/orc/volk_gnsssdr_8ic_x2_dot_prod_8ic.orc rename to src/algorithms/libs/volk_gnsssdr_module/volk_gnsssdr/orc/volk_gnsssdr_8ic_x2_dot_prod_8ic.orc diff --git a/src/algorithms/libs/volk_gnsssdr/orc/volk_gnsssdr_8ic_x2_multiply_8ic.orc b/src/algorithms/libs/volk_gnsssdr_module/volk_gnsssdr/orc/volk_gnsssdr_8ic_x2_multiply_8ic.orc similarity index 100% rename from src/algorithms/libs/volk_gnsssdr/orc/volk_gnsssdr_8ic_x2_multiply_8ic.orc rename to src/algorithms/libs/volk_gnsssdr_module/volk_gnsssdr/orc/volk_gnsssdr_8ic_x2_multiply_8ic.orc diff --git a/src/algorithms/libs/volk_gnsssdr/orc/volk_gnsssdr_8ic_x5_cw_epl_corr_8ic_x3.orc b/src/algorithms/libs/volk_gnsssdr_module/volk_gnsssdr/orc/volk_gnsssdr_8ic_x5_cw_epl_corr_8ic_x3.orc similarity index 100% rename from src/algorithms/libs/volk_gnsssdr/orc/volk_gnsssdr_8ic_x5_cw_epl_corr_8ic_x3.orc rename to src/algorithms/libs/volk_gnsssdr_module/volk_gnsssdr/orc/volk_gnsssdr_8ic_x5_cw_epl_corr_8ic_x3.orc diff --git a/src/algorithms/libs/volk_gnsssdr/orc/volk_gnsssdr_8u_x2_multiply_8u.orc b/src/algorithms/libs/volk_gnsssdr_module/volk_gnsssdr/orc/volk_gnsssdr_8u_x2_multiply_8u.orc similarity index 100% rename from src/algorithms/libs/volk_gnsssdr/orc/volk_gnsssdr_8u_x2_multiply_8u.orc rename to src/algorithms/libs/volk_gnsssdr_module/volk_gnsssdr/orc/volk_gnsssdr_8u_x2_multiply_8u.orc diff --git a/src/algorithms/libs/volk_gnsssdr/patches for generating volk_gnsssdr/2014-10-17_Patch.patch b/src/algorithms/libs/volk_gnsssdr_module/volk_gnsssdr/patches for generating volk_gnsssdr/2014-10-17_Patch.patch similarity index 100% rename from src/algorithms/libs/volk_gnsssdr/patches for generating volk_gnsssdr/2014-10-17_Patch.patch rename to src/algorithms/libs/volk_gnsssdr_module/volk_gnsssdr/patches for generating volk_gnsssdr/2014-10-17_Patch.patch diff --git a/src/algorithms/libs/volk_gnsssdr/patches for generating volk_gnsssdr/2014-10-17_Patch_with_protokernels.patch b/src/algorithms/libs/volk_gnsssdr_module/volk_gnsssdr/patches for generating volk_gnsssdr/2014-10-17_Patch_with_protokernels.patch similarity index 100% rename from src/algorithms/libs/volk_gnsssdr/patches for generating volk_gnsssdr/2014-10-17_Patch_with_protokernels.patch rename to src/algorithms/libs/volk_gnsssdr_module/volk_gnsssdr/patches for generating volk_gnsssdr/2014-10-17_Patch_with_protokernels.patch diff --git a/src/algorithms/libs/volk_gnsssdr/patches for generating volk_gnsssdr/README.txt b/src/algorithms/libs/volk_gnsssdr_module/volk_gnsssdr/patches for generating volk_gnsssdr/README.txt similarity index 100% rename from src/algorithms/libs/volk_gnsssdr/patches for generating volk_gnsssdr/README.txt rename to src/algorithms/libs/volk_gnsssdr_module/volk_gnsssdr/patches for generating volk_gnsssdr/README.txt diff --git a/src/algorithms/libs/volk_gnsssdr/python/volk_gnsssdr_modtool/CMakeLists.txt b/src/algorithms/libs/volk_gnsssdr_module/volk_gnsssdr/python/volk_gnsssdr_modtool/CMakeLists.txt similarity index 100% rename from src/algorithms/libs/volk_gnsssdr/python/volk_gnsssdr_modtool/CMakeLists.txt rename to src/algorithms/libs/volk_gnsssdr_module/volk_gnsssdr/python/volk_gnsssdr_modtool/CMakeLists.txt diff --git a/src/algorithms/libs/volk_gnsssdr/python/volk_gnsssdr_modtool/README b/src/algorithms/libs/volk_gnsssdr_module/volk_gnsssdr/python/volk_gnsssdr_modtool/README similarity index 100% rename from src/algorithms/libs/volk_gnsssdr/python/volk_gnsssdr_modtool/README rename to src/algorithms/libs/volk_gnsssdr_module/volk_gnsssdr/python/volk_gnsssdr_modtool/README diff --git a/src/algorithms/libs/volk_gnsssdr/python/volk_gnsssdr_modtool/__init__.py b/src/algorithms/libs/volk_gnsssdr_module/volk_gnsssdr/python/volk_gnsssdr_modtool/__init__.py similarity index 100% rename from src/algorithms/libs/volk_gnsssdr/python/volk_gnsssdr_modtool/__init__.py rename to src/algorithms/libs/volk_gnsssdr_module/volk_gnsssdr/python/volk_gnsssdr_modtool/__init__.py diff --git a/src/algorithms/libs/volk_gnsssdr/python/volk_gnsssdr_modtool/__init__.pyc b/src/algorithms/libs/volk_gnsssdr_module/volk_gnsssdr/python/volk_gnsssdr_modtool/__init__.pyc similarity index 100% rename from src/algorithms/libs/volk_gnsssdr/python/volk_gnsssdr_modtool/__init__.pyc rename to src/algorithms/libs/volk_gnsssdr_module/volk_gnsssdr/python/volk_gnsssdr_modtool/__init__.pyc diff --git a/src/algorithms/libs/volk_gnsssdr/python/volk_gnsssdr_modtool/cfg.py b/src/algorithms/libs/volk_gnsssdr_module/volk_gnsssdr/python/volk_gnsssdr_modtool/cfg.py similarity index 100% rename from src/algorithms/libs/volk_gnsssdr/python/volk_gnsssdr_modtool/cfg.py rename to src/algorithms/libs/volk_gnsssdr_module/volk_gnsssdr/python/volk_gnsssdr_modtool/cfg.py diff --git a/src/algorithms/libs/volk_gnsssdr/python/volk_gnsssdr_modtool/cfg.pyc b/src/algorithms/libs/volk_gnsssdr_module/volk_gnsssdr/python/volk_gnsssdr_modtool/cfg.pyc similarity index 100% rename from src/algorithms/libs/volk_gnsssdr/python/volk_gnsssdr_modtool/cfg.pyc rename to src/algorithms/libs/volk_gnsssdr_module/volk_gnsssdr/python/volk_gnsssdr_modtool/cfg.pyc diff --git a/src/algorithms/libs/volk_gnsssdr/python/volk_gnsssdr_modtool/volk_gnsssdr_modtool b/src/algorithms/libs/volk_gnsssdr_module/volk_gnsssdr/python/volk_gnsssdr_modtool/volk_gnsssdr_modtool similarity index 100% rename from src/algorithms/libs/volk_gnsssdr/python/volk_gnsssdr_modtool/volk_gnsssdr_modtool rename to src/algorithms/libs/volk_gnsssdr_module/volk_gnsssdr/python/volk_gnsssdr_modtool/volk_gnsssdr_modtool diff --git a/src/algorithms/libs/volk_gnsssdr/python/volk_gnsssdr_modtool/volk_gnsssdr_modtool_generate.py b/src/algorithms/libs/volk_gnsssdr_module/volk_gnsssdr/python/volk_gnsssdr_modtool/volk_gnsssdr_modtool_generate.py similarity index 100% rename from src/algorithms/libs/volk_gnsssdr/python/volk_gnsssdr_modtool/volk_gnsssdr_modtool_generate.py rename to src/algorithms/libs/volk_gnsssdr_module/volk_gnsssdr/python/volk_gnsssdr_modtool/volk_gnsssdr_modtool_generate.py diff --git a/src/algorithms/libs/volk_gnsssdr/python/volk_gnsssdr_modtool/volk_gnsssdr_modtool_generate.pyc b/src/algorithms/libs/volk_gnsssdr_module/volk_gnsssdr/python/volk_gnsssdr_modtool/volk_gnsssdr_modtool_generate.pyc similarity index 100% rename from src/algorithms/libs/volk_gnsssdr/python/volk_gnsssdr_modtool/volk_gnsssdr_modtool_generate.pyc rename to src/algorithms/libs/volk_gnsssdr_module/volk_gnsssdr/python/volk_gnsssdr_modtool/volk_gnsssdr_modtool_generate.pyc diff --git a/src/algorithms/libs/volk_gnsssdr/tmpl/volk_gnsssdr.tmpl.c b/src/algorithms/libs/volk_gnsssdr_module/volk_gnsssdr/tmpl/volk_gnsssdr.tmpl.c similarity index 100% rename from src/algorithms/libs/volk_gnsssdr/tmpl/volk_gnsssdr.tmpl.c rename to src/algorithms/libs/volk_gnsssdr_module/volk_gnsssdr/tmpl/volk_gnsssdr.tmpl.c diff --git a/src/algorithms/libs/volk_gnsssdr/tmpl/volk_gnsssdr.tmpl.h b/src/algorithms/libs/volk_gnsssdr_module/volk_gnsssdr/tmpl/volk_gnsssdr.tmpl.h similarity index 100% rename from src/algorithms/libs/volk_gnsssdr/tmpl/volk_gnsssdr.tmpl.h rename to src/algorithms/libs/volk_gnsssdr_module/volk_gnsssdr/tmpl/volk_gnsssdr.tmpl.h diff --git a/src/algorithms/libs/volk_gnsssdr/tmpl/volk_gnsssdr_config_fixed.tmpl.h b/src/algorithms/libs/volk_gnsssdr_module/volk_gnsssdr/tmpl/volk_gnsssdr_config_fixed.tmpl.h similarity index 100% rename from src/algorithms/libs/volk_gnsssdr/tmpl/volk_gnsssdr_config_fixed.tmpl.h rename to src/algorithms/libs/volk_gnsssdr_module/volk_gnsssdr/tmpl/volk_gnsssdr_config_fixed.tmpl.h diff --git a/src/algorithms/libs/volk_gnsssdr/tmpl/volk_gnsssdr_cpu.tmpl.c b/src/algorithms/libs/volk_gnsssdr_module/volk_gnsssdr/tmpl/volk_gnsssdr_cpu.tmpl.c similarity index 100% rename from src/algorithms/libs/volk_gnsssdr/tmpl/volk_gnsssdr_cpu.tmpl.c rename to src/algorithms/libs/volk_gnsssdr_module/volk_gnsssdr/tmpl/volk_gnsssdr_cpu.tmpl.c diff --git a/src/algorithms/libs/volk_gnsssdr/tmpl/volk_gnsssdr_cpu.tmpl.h b/src/algorithms/libs/volk_gnsssdr_module/volk_gnsssdr/tmpl/volk_gnsssdr_cpu.tmpl.h similarity index 100% rename from src/algorithms/libs/volk_gnsssdr/tmpl/volk_gnsssdr_cpu.tmpl.h rename to src/algorithms/libs/volk_gnsssdr_module/volk_gnsssdr/tmpl/volk_gnsssdr_cpu.tmpl.h diff --git a/src/algorithms/libs/volk_gnsssdr/tmpl/volk_gnsssdr_machine_xxx.tmpl.c b/src/algorithms/libs/volk_gnsssdr_module/volk_gnsssdr/tmpl/volk_gnsssdr_machine_xxx.tmpl.c similarity index 100% rename from src/algorithms/libs/volk_gnsssdr/tmpl/volk_gnsssdr_machine_xxx.tmpl.c rename to src/algorithms/libs/volk_gnsssdr_module/volk_gnsssdr/tmpl/volk_gnsssdr_machine_xxx.tmpl.c diff --git a/src/algorithms/libs/volk_gnsssdr/tmpl/volk_gnsssdr_machines.tmpl.c b/src/algorithms/libs/volk_gnsssdr_module/volk_gnsssdr/tmpl/volk_gnsssdr_machines.tmpl.c similarity index 100% rename from src/algorithms/libs/volk_gnsssdr/tmpl/volk_gnsssdr_machines.tmpl.c rename to src/algorithms/libs/volk_gnsssdr_module/volk_gnsssdr/tmpl/volk_gnsssdr_machines.tmpl.c diff --git a/src/algorithms/libs/volk_gnsssdr/tmpl/volk_gnsssdr_machines.tmpl.h b/src/algorithms/libs/volk_gnsssdr_module/volk_gnsssdr/tmpl/volk_gnsssdr_machines.tmpl.h similarity index 100% rename from src/algorithms/libs/volk_gnsssdr/tmpl/volk_gnsssdr_machines.tmpl.h rename to src/algorithms/libs/volk_gnsssdr_module/volk_gnsssdr/tmpl/volk_gnsssdr_machines.tmpl.h diff --git a/src/algorithms/libs/volk_gnsssdr/tmpl/volk_gnsssdr_typedefs.tmpl.h b/src/algorithms/libs/volk_gnsssdr_module/volk_gnsssdr/tmpl/volk_gnsssdr_typedefs.tmpl.h similarity index 100% rename from src/algorithms/libs/volk_gnsssdr/tmpl/volk_gnsssdr_typedefs.tmpl.h rename to src/algorithms/libs/volk_gnsssdr_module/volk_gnsssdr/tmpl/volk_gnsssdr_typedefs.tmpl.h diff --git a/src/algorithms/libs/volk_gnsssdr/volk_gnsssdr.pc.in b/src/algorithms/libs/volk_gnsssdr_module/volk_gnsssdr/volk_gnsssdr.pc.in similarity index 100% rename from src/algorithms/libs/volk_gnsssdr/volk_gnsssdr.pc.in rename to src/algorithms/libs/volk_gnsssdr_module/volk_gnsssdr/volk_gnsssdr.pc.in diff --git a/src/algorithms/libs/volk_gnsssdr/volk_modtool.cfg b/src/algorithms/libs/volk_gnsssdr_module/volk_gnsssdr/volk_modtool.cfg similarity index 100% rename from src/algorithms/libs/volk_gnsssdr/volk_modtool.cfg rename to src/algorithms/libs/volk_gnsssdr_module/volk_gnsssdr/volk_modtool.cfg