Move C stdlib to lib/libk

18 files changed, 11 insertions, 11 deletions

diff --git a/lib/Makefile b/lib/Makefile
index cace677..4415777 100644
--- a/lib/Makefile
+++ b/lib/Makefile
@@ -1,10 +1,10 @@
 include ../Makefile.config
 
 libk.SRCS = \
-	endian/little.c \
-	stdio/printf.c stdio/fprintf.c stdio/vfprintf.cpp \
-	stdlib/memcpy.c stdlib/memset.c stdlib/linked_list_allocator.c \
-	string/itoa.c
+	libk/endian/little.c \
+	libk/stdio/printf.c libk/stdio/fprintf.c libk/stdio/vfprintf.cpp \
+	libk/stdlib/memcpy.c libk/stdlib/memset.c libk/stdlib/linked_list_allocator.c \
+	libk/string/itoa.c
 
 TESTS += tst/endian_little tst/mem tst/string tst/linked_list_allocator
 
diff --git a/lib/endian.h b/lib/libk/endian.h
index 70bc5f7..70bc5f7 100644
--- a/lib/endian.h
+++ b/lib/libk/endian.h
diff --git a/lib/endian/little.c b/lib/libk/endian/little.c
index 042bb55..042bb55 100644
--- a/lib/endian/little.c
+++ b/lib/libk/endian/little.c
diff --git a/lib/stdio.h b/lib/libk/stdio.h
index 5ef68f1..5ef68f1 100644
--- a/lib/stdio.h
+++ b/lib/libk/stdio.h
diff --git a/lib/stdio/fprintf.c b/lib/libk/stdio/fprintf.c
index 9a96dc6..9a96dc6 100644
--- a/lib/stdio/fprintf.c
+++ b/lib/libk/stdio/fprintf.c
diff --git a/lib/stdio/printf.c b/lib/libk/stdio/printf.c
index 4efc1ac..4efc1ac 100644
--- a/lib/stdio/printf.c
+++ b/lib/libk/stdio/printf.c
diff --git a/lib/stdio/vfprintf.cpp b/lib/libk/stdio/vfprintf.cpp
index aa9256d..aa9256d 100644
--- a/lib/stdio/vfprintf.cpp
+++ b/lib/libk/stdio/vfprintf.cpp
diff --git a/lib/stdlib.h b/lib/libk/stdlib.h
index 84d9b2d..84d9b2d 100644
--- a/lib/stdlib.h
+++ b/lib/libk/stdlib.h
diff --git a/lib/stdlib/linked_list_allocator.c b/lib/libk/stdlib/linked_list_allocator.c
index 66c63d1..66c63d1 100644
--- a/lib/stdlib/linked_list_allocator.c
+++ b/lib/libk/stdlib/linked_list_allocator.c
diff --git a/lib/stdlib/memcpy.c b/lib/libk/stdlib/memcpy.c
index 90470d5..90470d5 100644
--- a/lib/stdlib/memcpy.c
+++ b/lib/libk/stdlib/memcpy.c
diff --git a/lib/stdlib/memset.c b/lib/libk/stdlib/memset.c
index a16bd05..a16bd05 100644
--- a/lib/stdlib/memset.c
+++ b/lib/libk/stdlib/memset.c
diff --git a/lib/string.h b/lib/libk/string.h
index c8196c8..c8196c8 100644
--- a/lib/string.h
+++ b/lib/libk/string.h
diff --git a/lib/string/itoa.c b/lib/libk/string/itoa.c
index 2db9768..2db9768 100644
--- a/lib/string/itoa.c
+++ b/lib/libk/string/itoa.c
diff --git a/lib/tst/endian_little.cc b/lib/tst/endian_little.cc
index f28e0e6..9c8c73b 100644
--- a/lib/tst/endian_little.cc
+++ b/lib/tst/endian_little.cc
@@ -2,7 +2,7 @@
 #include <gtest/gtest.h>
 
 namespace libk {
-#include "../endian/little.c"
+#include "../libk/endian/little.c"
 } // namespace libk
 
 TEST(endian_little, htole16)
diff --git a/lib/tst/linked_list_allocator.cc b/lib/tst/linked_list_allocator.cc
index 280a6d5..a2575d5 100644
--- a/lib/tst/linked_list_allocator.cc
+++ b/lib/tst/linked_list_allocator.cc
@@ -3,7 +3,7 @@
 #include <iostream>
 
 namespace libk {
-#include "../stdlib/linked_list_allocator.c"
+#include "../libk/stdlib/linked_list_allocator.c"
 
 std::ostream &
 operator<<(std::ostream &os, const Chunk &b)
diff --git a/lib/tst/mem.cc b/lib/tst/mem.cc
index 7586a97..1ad266c 100644
--- a/lib/tst/mem.cc
+++ b/lib/tst/mem.cc
@@ -3,8 +3,8 @@
 #define restrict __restrict__
 
 namespace libk {
-#include "../stdlib/memcpy.c"
-#include "../stdlib/memset.c"
+#include "../libk/stdlib/memcpy.c"
+#include "../libk/stdlib/memset.c"
 } // namespace libk
 
 TEST(mem, memset)
diff --git a/lib/tst/string.cc b/lib/tst/string.cc
index 8dec190..f22c123 100644
--- a/lib/tst/string.cc
+++ b/lib/tst/string.cc
@@ -1,7 +1,7 @@
 #include <gtest/gtest.h>
 
 namespace libk {
-#include "../string/itoa.c"
+#include "../libk/string/itoa.c"
 }
 
 char buffer[64];
diff --git a/rules.mk b/rules.mk
index a3a2b52..893cea8 100644
--- a/rules.mk
+++ b/rules.mk
@@ -46,9 +46,9 @@ debug:
 targets: ${TARGETS}
 
 # extra flags
-CFLAGS   += -I../lib \
+CFLAGS   += -I../lib/libk \
 	    -Werror=implicit-function-declaration
-CXXFLAGS += -I../lib -Drestrict=__restrict__
+CXXFLAGS += -I../lib/libk -Drestrict=__restrict__
 
 # Depndency rules
 %.d: %.S