refactor(core): make core_func.h local

CMakeLists.txt

@@ -8,23 +8,25 @@ set(CMAKE_C_STANDARD 99)
 
 set(CORE_SRC
         include/core.h
-        core/sasahyou.c
-        core/sappyou.c
-        core/shoppyou.c)
+        tanabata/core/core_func.h
+        tanabata/core/sasahyou.c
+        tanabata/core/sappyou.c
+        tanabata/core/shoppyou.c)
 
 set(TANABATA_SRC
         ${CORE_SRC}
         include/tanabata.h
-        lib/database.c
-        lib/sasa.c
-        lib/tanzaku.c
-        lib/kazari.c)
+        tanabata/lib/database.c
+        tanabata/lib/sasa.c
+        tanabata/lib/tanzaku.c
+        tanabata/lib/kazari.c)
 
 set(CLI_SRC
-        cli/cli.c)
+        ${TANABATA_SRC}
+        tfm/cli/tfm-cli.c)
 
 # Tanabata shared lib
 add_library(tanabata SHARED ${TANABATA_SRC})
 
 # Tanabata CLI app
-add_executable(tfm ${TANABATA_SRC} ${CLI_SRC})
+add_executable(tfm ${CLI_SRC})

tanabata/core/core_func.h

@@ -12,7 +12,7 @@ extern "C" {
 #include <stdint.h>
 #endif
 
-#include "core.h"
+#include "../../include/core.h"
 
 // ==================== SASAHYOU SECTION ==================== //
 

tanabata/core/sappyou.c

@@ -2,7 +2,7 @@
 #include <string.h>
 #include <time.h>
 
-#include "../../include/core_func.h"
+#include "core_func.h"
 
 const Tanzaku HOLE_TANZAKU = {HOLE_ID};
 

tanabata/core/sasahyou.c

@@ -3,7 +3,7 @@
 #include <time.h>
 #include <stdio.h>
 
-#include "../../include/core_func.h"
+#include "core_func.h"
 
 const Sasa HOLE_SASA = {HOLE_ID};
 

tanabata/core/shoppyou.c

@@ -2,7 +2,7 @@
 #include <string.h>
 #include <time.h>
 
-#include "../../include/core_func.h"
+#include "core_func.h"
 
 const Kazari HOLE_KAZARI = {HOLE_ID};
 

tanabata/lib/database.c

@@ -3,7 +3,7 @@
 #include <sys/stat.h>
 #include <time.h>
 
-#include "../../include/core_func.h"
+#include "../core/core_func.h"
 #include "../../include/tanabata.h"
 
 int tanabata_init(Tanabata *tanabata) {

tanabata/lib/kazari.c

@@ -1,6 +1,6 @@
 #include <malloc.h>
 
-#include "../../include/core_func.h"
+#include "../core/core_func.h"
 #include "../../include/tanabata.h"
 
 int tanabata_kazari_add(Tanabata *tanabata, uint64_t sasa_id, uint64_t tanzaku_id) {

tanabata/lib/sasa.c

@@ -1,7 +1,7 @@
 #include <stdlib.h>
 #include <string.h>
 
-#include "../../include/core_func.h"
+#include "../core/core_func.h"
 #include "../../include/tanabata.h"
 
 int tanabata_sasa_add(Tanabata *tanabata, const char *path) {

tanabata/lib/tanzaku.c

@@ -1,6 +1,6 @@
 #include <string.h>
 
-#include "../../include/core_func.h"
+#include "../core/core_func.h"
 #include "../../include/tanabata.h"
 
 int tanabata_tanzaku_add(Tanabata *tanabata, const char *name, const char *description) {