summaryrefslogtreecommitdiff
path: root/kernel/Makefile
diff options
context:
space:
mode:
authormanzerbredes <loic.guegan_secondary@yahoo.fr>2015-07-19 11:52:01 +0400
committermanzerbredes <loic.guegan_secondary@yahoo.fr>2015-07-19 11:52:01 +0400
commitbf801b82fdda3f8f91d95aa6e2e946c7ee7ea3e1 (patch)
tree66b3300318e73de9bee24bc8e4d3d0a2baf1c04b /kernel/Makefile
parentaf0fdb77e3246aef1dff583e9b91be92901941d1 (diff)
Adapt Makefile, modify some comments
Diffstat (limited to 'kernel/Makefile')
-rw-r--r--kernel/Makefile11
1 files changed, 9 insertions, 2 deletions
diff --git a/kernel/Makefile b/kernel/Makefile
index 0550f6d..02c92c2 100644
--- a/kernel/Makefile
+++ b/kernel/Makefile
@@ -1,5 +1,12 @@
-kernel.bin:
- touch kernel.bin
+
+kernel.bin:entry.o main.o
+ ld -m elf_i386 --entry=_start -Ttext=0x1000 -o $@ $^
+
+entry.o:entry.asm
+ nasm -f elf $^
+main.o:main.c
+ gcc -m32 -c $^ -o $@
clean:
+ rm ./*.o
rm kernel.bin