fdsdump: split source codes to common and lister components

Author: Lukas955

src/tools/fdsdump/src/CMakeLists.txt

@@ -1,19 +1,15 @@
+include_directories("${CMAKE_CURRENT_SOURCE_DIR}")
+
+# Subdirectories with components
+add_subdirectory(common)
+add_subdirectory(lister)
+
 add_executable(fdsdump
-    common.cpp
     main.cpp
-    printer.cpp
-    jsonPrinter.cpp
-    jsonRawPrinter.cpp
-    tablePrinter.cpp
-    flowProvider.cpp
-    filelist.cpp
-    field.cpp
-    fieldView.cpp
     options.cpp
-    ipaddr.cpp
-    storageRecord.cpp
-    storageSorter.cpp
-    storageSorted.cpp)
+    $<TARGET_OBJECTS:common_obj>
+	$<TARGET_OBJECTS:lister_obj>
+)
 
 target_include_directories(fdsdump
     PUBLIC
@@ -27,4 +23,3 @@ target_link_libraries(fdsdump
 install(
     TARGETS fdsdump
     DESTINATION bin)
-

src/tools/fdsdump/src/common/CMakeLists.txt

@@ -0,0 +1,11 @@
+# Create a common "object" library
+set(COMMON_SRC
+    common.cpp
+    field.cpp
+    fieldView.cpp
+    filelist.cpp
+    flowProvider.cpp
+    ipaddr.cpp
+)
+
+add_library(common_obj OBJECT ${COMMON_SRC})

src/tools/fdsdump/src/common.cpp src/tools/fdsdump/src/common/common.cppsrc/tools/fdsdump/src/common.cpp renamed to src/tools/fdsdump/src/common/common.cpp

@@ -5,7 +5,7 @@
 #include <string>
 #include <vector>
 
-#include "libfds.h"
+#include <libfds.h>
 
 using unique_file = std::unique_ptr<fds_file_t, decltype(&fds_file_close)>;
 using unique_iemgr = std::unique_ptr<fds_iemgr_t, decltype(&fds_iemgr_destroy)>;