cleanup

3 files changed, 16 insertions, 15 deletions

diff --git a/kjarna_runtime/Makefile b/kjarna_runtime/Makefile
index be3cd90..caffc79 100644
--- a/kjarna_runtime/Makefile
+++ b/kjarna_runtime/Makefile
@@ -9,14 +9,14 @@ VPATH := ../lib
 TARGET := kjarna.os
 .DEFAULT: $(TARGET)
 
-CPPFLAGS += -I../api -I. 
+CPPFLAGS += -I../api/posix -I../api/libc -I../api -I. 
 
 CFLAGS += -fPIC -fvisibility=hidden -mgeneral-regs-only
 
 LDSCRIPT := kc.ld
 
 CRT_OBJS := start_x86_64.o dynamic_x86_64.o elf64.o
-LIB_OBJS := memcmp.o memcpy.o memmove.o memset.o string.o
+LIB_OBJS := kjarna.o memcmp.o memcpy.o memmove.o memset.o string.o
 APP_OBJS := main.o
 
 OBJS := $(CRT_OBJS) $(LIB_OBJS) $(APP_OBJS) 
diff --git a/kjarna_runtime/kjarna.c b/kjarna_runtime/kjarna.c
new file mode 100644
index 0000000..6b37d1e
--- /dev/null
+++ b/kjarna_runtime/kjarna.c
@@ -0,0 +1,13 @@
+#include <kjarna/interface.h>
+
+struct kjarna_entry_params *entry_params;
+
+extern int main(int argc, char **argv);
+
+int kjarna_entry(struct kjarna_entry_params *params)
+{
+	entry_params = params;
+
+	return main(params->argc, params->argv);
+}
+
diff --git a/kjarna_runtime/main.c b/kjarna_runtime/main.c
index acfcdc1..248958b 100644
--- a/kjarna_runtime/main.c
+++ b/kjarna_runtime/main.c
@@ -1,6 +1,4 @@
-#include <kjarna/interface.h>
-
-extern int write(int, void *, size_t);
+#include <unistd.h>
 
 int main(int argc, char **argv)
 {
@@ -14,13 +12,3 @@ int main(int argc, char **argv)
 	return 0;
 }
 
-struct kjarna_entry_params *entry_params;
-
-int kjarna_entry(struct kjarna_entry_params *params)
-{
-	entry_params = params;
-	entry_params->interface->write(1, "hello, entry world\r\n", -1);
-
-	return main(params->argc, params->argv);
-}
-