1 files changed, 11 insertions, 39 deletions

diff --git a/libtransport/src/core/CMakeLists.txt b/libtransport/src/core/CMakeLists.txt
index 5c8ab9270..4e3ac10ec 100644
--- a/libtransport/src/core/CMakeLists.txt
+++ b/libtransport/src/core/CMakeLists.txt
@@ -21,55 +21,27 @@ list(APPEND HEADER_FILES
   ${CMAKE_CURRENT_SOURCE_DIR}/manifest_format.h
   ${CMAKE_CURRENT_SOURCE_DIR}/pending_interest.h
   ${CMAKE_CURRENT_SOURCE_DIR}/portal.h
-  ${CMAKE_CURRENT_SOURCE_DIR}/connector.h
-  ${CMAKE_CURRENT_SOURCE_DIR}/tcp_socket_connector.h
-  ${CMAKE_CURRENT_SOURCE_DIR}/udp_socket_connector.h
-  ${CMAKE_CURRENT_SOURCE_DIR}/forwarder_interface.h
-  ${CMAKE_CURRENT_SOURCE_DIR}/hicn_forwarder_interface.h
-  ${CMAKE_CURRENT_SOURCE_DIR}/vpp_forwarder_interface.h
-  ${CMAKE_CURRENT_SOURCE_DIR}/memif_connector.h
+  ${CMAKE_CURRENT_SOURCE_DIR}/errors.h
+  ${CMAKE_CURRENT_SOURCE_DIR}/global_configuration.h
+  ${CMAKE_CURRENT_SOURCE_DIR}/local_connector.h
+  ${CMAKE_CURRENT_SOURCE_DIR}/rs.h
 )
 
 list(APPEND SOURCE_FILES
   ${CMAKE_CURRENT_SOURCE_DIR}/content_object.cc
   ${CMAKE_CURRENT_SOURCE_DIR}/interest.cc
+  ${CMAKE_CURRENT_SOURCE_DIR}/errors.cc
   ${CMAKE_CURRENT_SOURCE_DIR}/packet.cc
   ${CMAKE_CURRENT_SOURCE_DIR}/name.cc
   ${CMAKE_CURRENT_SOURCE_DIR}/prefix.cc
-  ${CMAKE_CURRENT_SOURCE_DIR}/tcp_socket_connector.cc
-  ${CMAKE_CURRENT_SOURCE_DIR}/udp_socket_connector.cc
-  ${CMAKE_CURRENT_SOURCE_DIR}/hicn_forwarder_interface.cc
   ${CMAKE_CURRENT_SOURCE_DIR}/manifest_format_fixed.cc
-  ${CMAKE_CURRENT_SOURCE_DIR}/connector.cc
+  ${CMAKE_CURRENT_SOURCE_DIR}/portal.cc
+  ${CMAKE_CURRENT_SOURCE_DIR}/global_configuration.cc
+  ${CMAKE_CURRENT_SOURCE_DIR}/io_module.cc
+  ${CMAKE_CURRENT_SOURCE_DIR}/local_connector.cc
+  ${CMAKE_CURRENT_SOURCE_DIR}/fec.cc
+  ${CMAKE_CURRENT_SOURCE_DIR}/rs.cc
 )
 
-if ("${CMAKE_SYSTEM_NAME}" STREQUAL "Linux")
-  if (BUILD_WITH_VPP OR BUILD_HICNPLUGIN)
-    list(APPEND HEADER_FILES
-      ${CMAKE_CURRENT_SOURCE_DIR}/vpp_forwarder_interface.h
-      ${CMAKE_CURRENT_SOURCE_DIR}/memif_connector.h
-      ${CMAKE_CURRENT_SOURCE_DIR}/hicn_vapi.h
-      ${CMAKE_CURRENT_SOURCE_DIR}/memif_vapi.h
-    )
-
-    list(APPEND SOURCE_FILES
-      ${CMAKE_CURRENT_SOURCE_DIR}/vpp_forwarder_interface.cc
-      ${CMAKE_CURRENT_SOURCE_DIR}/memif_connector.cc
-      ${CMAKE_CURRENT_SOURCE_DIR}/hicn_vapi.c
-      ${CMAKE_CURRENT_SOURCE_DIR}/memif_vapi.c
-    )
-  endif()
-
-  list(APPEND HEADER_FILES
-    ${CMAKE_CURRENT_SOURCE_DIR}/raw_socket_connector.h
-    ${CMAKE_CURRENT_SOURCE_DIR}/raw_socket_interface.h
-  )
-
-  list(APPEND SOURCE_FILES
-    ${CMAKE_CURRENT_SOURCE_DIR}/raw_socket_connector.cc
-    ${CMAKE_CURRENT_SOURCE_DIR}/raw_socket_interface.cc
-  )
-endif()
-
 set(SOURCE_FILES ${SOURCE_FILES} PARENT_SCOPE)
 set(HEADER_FILES ${HEADER_FILES} PARENT_SCOPE)
\ No newline at end of file