Remove specific directory for LTE SIM management tools

Move into openair3/NAS/TOOLS/CMakeLists.txt, and simplify the
CMakeLists.txt.

Co-authored-by: Robert Schmidt <robert.schmidt@openairinterface.org>

openair3/NAS/CMakeLists.txt

@@ -1,3 +1,4 @@
 add_subdirectory(COMMON)
 add_subdirectory(NR_UE)
 add_subdirectory(UE)
+add_subdirectory(TOOLS)

openair3/NAS/TOOLS/CMakeLists.txt

@@ -0,0 +1,36 @@
+add_library(conf2uedata_lib OBJECT
+    conf_emm.c
+    conf_user_data.c
+    conf_usim.c
+    conf_network.c
+    conf_user_plmn.c
+    conf_parser.c
+    fs.c
+    display.c
+    ../UE/API/USIM/usim_api.c
+    ../UE/API/USIM/aka_functions.c
+    ../COMMON/UTIL/OctetString.c
+    ${OPENAIR_DIR}/common/utils/mem/memory.c
+    ${OPENAIR_DIR}/common/utils/utils.c
+)
+
+add_executable(conf2uedata conf2uedata.c)
+target_link_libraries(conf2uedata PRIVATE conf2uedata_lib)
+set_target_properties(conf2uedata PROPERTIES RUNTIME_OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR})
+target_link_libraries(conf2uedata PRIVATE LOG minimal_lib ${libconfig_LIBRARIES})
+
+add_executable(usim usim.c)
+target_link_libraries(usim PRIVATE conf2uedata_lib)
+set_target_properties(usim PROPERTIES RUNTIME_OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR})
+target_link_libraries(usim PRIVATE LOG minimal_lib ${libconfig_LIBRARIES})
+
+add_executable(nvram nvram.c)
+target_link_libraries(nvram PRIVATE conf2uedata_lib)
+set_target_properties(nvram PROPERTIES RUNTIME_OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR})
+target_link_libraries(nvram PRIVATE LOG minimal_lib ${libconfig_LIBRARIES})
+
+if (${T_TRACER})
+  add_dependencies(conf2uedata generate_T)
+  add_dependencies(usim generate_T)
+  add_dependencies(nvram generate_T)
+endif (${T_TRACER})

openair3/NAS/TOOLS/conf2uedata.c

@@ -3,6 +3,7 @@
 #include <string.h> // memset, strncpy
 #include <getopt.h>
 
+#include "log.h"
 #include "conf2uedata.h"
 #include "display.h"
 #include "conf_parser.h"
@@ -42,6 +43,7 @@ int main(int argc, char**argv) {
 		exit(1);
 	}
 
+    logInit();
     if ( parse_config_file(output_dir, conf_file, OUTPUT_ALL) == false ) {
         exit(1);
     }

openair3/NAS/TOOLS/nvram.c

@@ -42,6 +42,7 @@ Description Implements the utility used to generate data stored in the
 #include <stdbool.h>
 #include <getopt.h>
 
+#include "log.h"
 #include "conf_parser.h"
 #include "display.h"
 
@@ -104,6 +105,7 @@ int main (int argc, char * const argv[])
     _display_usage(argv[0]);
     exit(EXIT_SUCCESS);
   }
+  logInit();
 
   /* compute default data directory if no output_dir is given */
   if ( output_dir == NULL ) {

openair3/NAS/TOOLS/usim.c

@@ -42,6 +42,7 @@ Description Implements the utility used to generate data stored in the
 #include <stdbool.h>
 #include <getopt.h>
 
+#include "log.h"
 #include "conf_parser.h"
 #include "display.h"
 
@@ -105,6 +106,7 @@ int main (int argc, char * const argv[])
     exit(EXIT_SUCCESS);
   }
 
+  logInit();
   /* compute default data directory if no output_dir is given */
   if ( output_dir == NULL ) {
     output_dir = getenv(OUTPUT_DIR_ENV);