From 21e7874d9a9729b3ac7520a0a7ef8f7f5bc7601b Mon Sep 17 00:00:00 2001
From: Aqua-sama <aqua@iserlohn-fortress.net>
Date: Sun, 7 Feb 2021 11:36:04 +0200
Subject: Rewrite makefile

---
 libk/makefile | 15 ++-------------
 libk/stdlib.h |  2 +-
 2 files changed, 3 insertions(+), 14 deletions(-)

(limited to 'libk')

diff --git a/libk/makefile b/libk/makefile
index ea684ba..0f75e5a 100644
--- a/libk/makefile
+++ b/libk/makefile
@@ -1,14 +1,3 @@
+CXX_OBJ += libk/string/string.o libk/string/integerview.o libk/stdlib/console.o
+CXX_TEST_OBJ += libk/types/test.o libk/string/test.o
 
-CXX_OBJ := string/string.o string/integerview.o stdlib/console.o
-CXX_TEST_OBJ := types/test.o string/test.o
-
-libk.a: $(CXX_OBJ)
-	$(AR) rcs $@ $(CXX_OBJ)
-
-test: $(CXX_TEST_OBJ)
-
-$(CXX_OBJ) $(CXX_TEST_OBJ): %.o : %.cc
-	$(CXX) -target $(TARGET) $(CXX_FLAGS) -I$(CURDIR) -c $^ -o $@
-
-clean:
-	rm -f libk.a $(CXX_OBJ) $(CXX_TEST_OBJ)
diff --git a/libk/stdlib.h b/libk/stdlib.h
index e1d3dd2..1b76b67 100644
--- a/libk/stdlib.h
+++ b/libk/stdlib.h
@@ -35,4 +35,4 @@ void printk(const T& a, const Args&... x) {
   printk(x...);
 }
 
-__attribute__((__noreturn__)) void abort();
+extern "C" __attribute__((__noreturn__)) void abort();
-- 
cgit v1.2.1