From d6dea45f524e68984b619586c38e273ca1ff0779 Mon Sep 17 00:00:00 2001
From: Max Wash <mbswash@gmail.com>
Date: Tue, 12 Nov 2024 19:55:47 +0000
Subject: [PATCH] meta: rename library modules

---
 CMakeLists.txt                                            | 6 +++---
 asm/CMakeLists.txt                                        | 4 ++++
 {libasm => asm}/misc.c                                    | 0
 lang/CMakeLists.txt                                       | 4 ++++
 libasm/include/ivy/asm.h => lang/include/ivy/lang/ast.h   | 0
 libc/include/ivy/compile.h => lang/include/ivy/lang/lex.h | 0
 {libc => lang}/misc.c                                     | 0
 libasm/CMakeLists.txt                                     | 8 --------
 libc/CMakeLists.txt                                       | 8 --------
 librt/CMakeLists.txt                                      | 8 --------
 librt/include/ivy/rt.h                                    | 0
 rt/CMakeLists.txt                                         | 4 ++++
 {librt => rt}/misc.c                                      | 0
 13 files changed, 15 insertions(+), 27 deletions(-)
 create mode 100644 asm/CMakeLists.txt
 rename {libasm => asm}/misc.c (100%)
 create mode 100644 lang/CMakeLists.txt
 rename libasm/include/ivy/asm.h => lang/include/ivy/lang/ast.h (100%)
 rename libc/include/ivy/compile.h => lang/include/ivy/lang/lex.h (100%)
 rename {libc => lang}/misc.c (100%)
 delete mode 100644 libasm/CMakeLists.txt
 delete mode 100644 libc/CMakeLists.txt
 delete mode 100644 librt/CMakeLists.txt
 delete mode 100644 librt/include/ivy/rt.h
 create mode 100644 rt/CMakeLists.txt
 rename {librt => rt}/misc.c (100%)

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 7d5edbd..8d8ef20 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -6,7 +6,7 @@ set(CMAKE_MODULE_PATH ${CMAKE_MODULE_PATH} ${CMAKE_CURRENT_SOURCE_DIR}/cmake)
 set(Bluelib_STATIC TRUE)
 find_package(Bluelib REQUIRED)
 
+add_subdirectory(lang)
+add_subdirectory(asm)
+add_subdirectory(rt)
 add_subdirectory(ivy)
-add_subdirectory(libc)
-add_subdirectory(libasm)
-add_subdirectory(librt)
diff --git a/asm/CMakeLists.txt b/asm/CMakeLists.txt
new file mode 100644
index 0000000..a12758d
--- /dev/null
+++ b/asm/CMakeLists.txt
@@ -0,0 +1,4 @@
+file(GLOB_RECURSE asm_sources *.c *.h include/ivy/asm/*.h)
+
+add_library(ivy-asm SHARED ${asm_sources})
+target_include_directories(ivy-asm PUBLIC ${CMAKE_CURRENT_SOURCE_DIR}/include/)
diff --git a/libasm/misc.c b/asm/misc.c
similarity index 100%
rename from libasm/misc.c
rename to asm/misc.c
diff --git a/lang/CMakeLists.txt b/lang/CMakeLists.txt
new file mode 100644
index 0000000..47cec5c
--- /dev/null
+++ b/lang/CMakeLists.txt
@@ -0,0 +1,4 @@
+file(GLOB_RECURSE lang_sources *.c *.h include/ivy/lang/*.h)
+
+add_library(ivy-lang SHARED ${lang_sources})
+target_include_directories(ivy-lang PUBLIC ${CMAKE_CURRENT_SOURCE_DIR}/include/)
diff --git a/libasm/include/ivy/asm.h b/lang/include/ivy/lang/ast.h
similarity index 100%
rename from libasm/include/ivy/asm.h
rename to lang/include/ivy/lang/ast.h
diff --git a/libc/include/ivy/compile.h b/lang/include/ivy/lang/lex.h
similarity index 100%
rename from libc/include/ivy/compile.h
rename to lang/include/ivy/lang/lex.h
diff --git a/libc/misc.c b/lang/misc.c
similarity index 100%
rename from libc/misc.c
rename to lang/misc.c
diff --git a/libasm/CMakeLists.txt b/libasm/CMakeLists.txt
deleted file mode 100644
index 93ac3b8..0000000
--- a/libasm/CMakeLists.txt
+++ /dev/null
@@ -1,8 +0,0 @@
-file(GLOB_RECURSE libasm_sources *.c *.h include/ivy/*.h)
-
-add_library(ivy-asm SHARED ${libasm_sources})
-target_link_libraries(
-	ivy-asm
-	Bluelib::Core
-	Bluelib::Object
-	Bluelib::Cmd)
diff --git a/libc/CMakeLists.txt b/libc/CMakeLists.txt
deleted file mode 100644
index 6d87f14..0000000
--- a/libc/CMakeLists.txt
+++ /dev/null
@@ -1,8 +0,0 @@
-file(GLOB_RECURSE libc_sources *.c *.h include/ivy/*.h)
-
-add_library(ivy-c SHARED ${libc_sources})
-target_link_libraries(
-	ivy-c
-	Bluelib::Core
-	Bluelib::Object
-	Bluelib::Cmd)
diff --git a/librt/CMakeLists.txt b/librt/CMakeLists.txt
deleted file mode 100644
index 4cabd7b..0000000
--- a/librt/CMakeLists.txt
+++ /dev/null
@@ -1,8 +0,0 @@
-file(GLOB_RECURSE librt_sources *.c *.h include/ivy/*.h)
-
-add_library(ivy-rt SHARED ${librt_sources})
-target_link_libraries(
-	ivy-rt
-	Bluelib::Core
-	Bluelib::Object
-	Bluelib::Cmd)
diff --git a/librt/include/ivy/rt.h b/librt/include/ivy/rt.h
deleted file mode 100644
index e69de29..0000000
diff --git a/rt/CMakeLists.txt b/rt/CMakeLists.txt
new file mode 100644
index 0000000..f665450
--- /dev/null
+++ b/rt/CMakeLists.txt
@@ -0,0 +1,4 @@
+file(GLOB_RECURSE rt_sources *.c *.h include/ivy/rt/*.h)
+
+add_library(ivy-rt SHARED ${rt_sources})
+target_include_directories(ivy-rt PUBLIC ${CMAKE_CURRENT_SOURCE_DIR}/include/)
diff --git a/librt/misc.c b/rt/misc.c
similarity index 100%
rename from librt/misc.c
rename to rt/misc.c