summaryrefslogtreecommitdiff
path: root/makefile
diff options
context:
space:
mode:
Diffstat (limited to 'makefile')
-rw-r--r--makefile16
1 files changed, 8 insertions, 8 deletions
diff --git a/makefile b/makefile
index c6706ed..07e10f2 100644
--- a/makefile
+++ b/makefile
@@ -1,4 +1,4 @@
-disk: kernel boot skel init #psch
+disk: kernel boot skel init hello
mkdir -p obj out
/sbin/mkfs.fat -C -f 1 -F 16 -n "PORTLAND OS" -R 65 -s 1 -S 512 obj/shadow.img 8192
echo -n -e '\xeb\x3c' > obj/jmp.bin
@@ -32,16 +32,15 @@ init: knob
gcc ${ugccargs} -c src/user/init/main.c -o obj/init/main.o
ld -T src/user/elf.ld obj/init/main.o obj/knob.o -o obj/init.elf
- cp obj/init.elf out/fs/bin/init.elf
+ objcopy -S obj/init.elf out/fs/bin/init.elf
-psch: knob
- mkdir -p obj/psch out/fs/bin
+hello: knob
+ mkdir -p obj/hello out/fs/bin
- gcc ${ugccargs} -c src/user/psch/main.c -o obj/psch/main.o
- gcc ${ugccargs} -c src/user/psch/data.c -o obj/psch/data.o
+ gcc ${ugccargs} -c src/user/hello/hello.c -o obj/hello/hello.o
- ld -T src/user/elf.ld obj/psch/*.o obj/knob.o -o obj/psch.elf
- cp obj/psch.elf out/fs/bin/psch.elf
+ ld -T src/user/elf.ld obj/hello/hello.o obj/knob.o -o obj/hello.elf
+ objcopy -S obj/hello.elf out/fs/bin/hello.elf
knob:
mkdir -p obj/knob
@@ -52,6 +51,7 @@ knob:
gcc ${ugccargs} -c src/user/knob/heap.c -o obj/knob/heap.o
gcc ${ugccargs} -c src/user/knob/quit.c -o obj/knob/quit.o
gcc ${ugccargs} -c src/user/knob/user.c -o obj/knob/user.o
+ gcc ${ugccargs} -c src/user/knob/task.c -o obj/knob/task.o
nasm ${nasmargs} src/user/knob/entry.asm -o obj/knob/entry.o
ld ${partlink} obj/knob/*.o -o obj/knob.o