Improve target design

src/algorithms/acquisition/adapters/CMakeLists.txt

@@ -96,7 +96,6 @@ target_link_libraries(acq_adapters
         gnss_sp_libs
         gnss_sdr_flags
         acq_gr_blocks
-        rx_core_lib
         gnss_system_parameters
     PRIVATE
         Boost::boost
@@ -106,6 +105,11 @@ target_link_libraries(acq_adapters
         acquisition_lib
 )
 
+target_include_directories(acq_adapters
+    PUBLIC
+        ${CMAKE_SOURCE_DIR}/src/core/interfaces
+)
+
 set_property(TARGET acq_adapters
     APPEND PROPERTY INTERFACE_INCLUDE_DIRECTORIES
         $<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}>

src/algorithms/acquisition/gnuradio_blocks/CMakeLists.txt

@@ -81,15 +81,19 @@ target_link_libraries(acq_gr_blocks
         Matio::matio
         Volkgnsssdr::volkgnsssdr
         gnss_sp_libs
-        gnss_rx
+)
+
+target_include_directories(acq_gr_blocks
+    PUBLIC
+        ${CMAKE_SOURCE_DIR}/src/algorithms/libs
+    PRIVATE
+        ${CMAKE_SOURCE_DIR}/src/core/receiver
 )
 
 if(OPENCL_FOUND)
     target_include_directories(acq_gr_blocks PUBLIC ${OPENCL_INCLUDE_DIRS})
 endif()
 
-target_include_directories(acq_gr_blocks PUBLIC ${CMAKE_SOURCE_DIR}/src/algorithms/libs)
-
 set_property(TARGET acq_gr_blocks
     APPEND PROPERTY INTERFACE_INCLUDE_DIRECTORIES
         $<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}>

src/algorithms/acquisition/libs/CMakeLists.txt

@@ -43,7 +43,6 @@ target_link_libraries(acquisition_lib
         Glog::glog
         gnss_sp_libs
         gnss_system_parameters
-        gnss_rx
 )
 
 set_property(TARGET acquisition_lib