From 221e547db5fee4d08583abee472be7d21f55e2b7 Mon Sep 17 00:00:00 2001
From: Masahiko AMANO <hiko-19@ya.ru>
Date: Sat, 14 Jan 2023 17:13:52 +0300
Subject: [PATCH] refactor(core): make core_func.h local

---
 CMakeLists.txt                         | 20 +++++++++++---------
 {include => tanabata/core}/core_func.h |  2 +-
 tanabata/core/sappyou.c                |  2 +-
 tanabata/core/sasahyou.c               |  2 +-
 tanabata/core/shoppyou.c               |  2 +-
 tanabata/lib/database.c                |  2 +-
 tanabata/lib/kazari.c                  |  2 +-
 tanabata/lib/sasa.c                    |  2 +-
 tanabata/lib/tanzaku.c                 |  2 +-
 9 files changed, 19 insertions(+), 17 deletions(-)
 rename {include => tanabata/core}/core_func.h (98%)

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 03d1da6..a7d3ec1 100644
--- a/CMakeLists.txt
+++ b/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})
diff --git a/include/core_func.h b/tanabata/core/core_func.h
similarity index 98%
rename from include/core_func.h
rename to tanabata/core/core_func.h
index 4f17f45..7b6ca17 100644
--- a/include/core_func.h
+++ b/tanabata/core/core_func.h
@@ -12,7 +12,7 @@ extern "C" {
 #include <stdint.h>
 #endif
 
-#include "core.h"
+#include "../../include/core.h"
 
 // ==================== SASAHYOU SECTION ==================== //
 
diff --git a/tanabata/core/sappyou.c b/tanabata/core/sappyou.c
index 7f7b3ac..4f449bb 100644
--- a/tanabata/core/sappyou.c
+++ b/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};
 
diff --git a/tanabata/core/sasahyou.c b/tanabata/core/sasahyou.c
index ad01f97..4fca375 100644
--- a/tanabata/core/sasahyou.c
+++ b/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};
 
diff --git a/tanabata/core/shoppyou.c b/tanabata/core/shoppyou.c
index 15ae989..10bc062 100644
--- a/tanabata/core/shoppyou.c
+++ b/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};
 
diff --git a/tanabata/lib/database.c b/tanabata/lib/database.c
index 24a6470..2a21d05 100644
--- a/tanabata/lib/database.c
+++ b/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) {
diff --git a/tanabata/lib/kazari.c b/tanabata/lib/kazari.c
index ceb02b7..e508b72 100644
--- a/tanabata/lib/kazari.c
+++ b/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) {
diff --git a/tanabata/lib/sasa.c b/tanabata/lib/sasa.c
index 4304001..afe3c8c 100644
--- a/tanabata/lib/sasa.c
+++ b/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) {
diff --git a/tanabata/lib/tanzaku.c b/tanabata/lib/tanzaku.c
index f450394..cdfd5b7 100644
--- a/tanabata/lib/tanzaku.c
+++ b/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) {