summaryrefslogtreecommitdiff
path: root/makefile
diff options
context:
space:
mode:
authorBenji Dial <benji6283@gmail.com>2020-09-13 17:12:29 -0400
committerBenji Dial <benji6283@gmail.com>2020-09-13 17:12:29 -0400
commit5481848e27fdd4fc859def9841a0283665531a46 (patch)
tree990a8df008214d85141a3bd10bd96898e64b0c37 /makefile
parent1e4a254674f668839e5de273916024c16814b045 (diff)
downloadportland-os-5481848e27fdd4fc859def9841a0283665531a46.tar.gz
fixed some paging bugs, added fault handlers and new programs
Diffstat (limited to 'makefile')
-rw-r--r--makefile16
1 files changed, 13 insertions, 3 deletions
diff --git a/makefile b/makefile
index aec355f..31f6503 100644
--- a/makefile
+++ b/makefile
@@ -24,11 +24,12 @@ debug: out/disk.img
clean:
rm -r obj out || true
-out/fs/bin/%.elf: obj/%.elf
+out/fs/bin/%: obj/%.elf
mkdir -p $(shell dirname $@)
objcopy -S $< $@
-out/fs: out/fs/bin/init.elf out/fs/bin/meminfo.elf out/fs/bin/highway.elf
+out/fs: out/fs/bin/init out/fs/bin/meminfo out/fs/bin/highway \
+ out/fs/bin/hello out/fs/bin/dumptext out/fs/bin/dumphex
mkdir -p out/fs
cp -r fs-skel/* out/fs/
@@ -74,4 +75,13 @@ obj/meminfo.elf: obj/meminfo/meminfo.o obj/knob.so
ld -T src/user/elf.ld obj/meminfo/* obj/knob.so -o obj/meminfo.elf
obj/highway.elf: obj/highway/highway.o obj/knob.so
- ld -T src/user/elf.ld obj/highway/* obj/knob.so -o obj/highway.elf \ No newline at end of file
+ ld -T src/user/elf.ld obj/highway/* obj/knob.so -o obj/highway.elf
+
+obj/hello.elf: obj/hello/hello.ao
+ ld -T src/user/elf.ld obj/hello/* -o obj/hello.elf
+
+obj/dumptext.elf: obj/dumptext/dumptext.o
+ ld -T src/user/elf.ld obj/dumptext/* obj/knob.so -o obj/dumptext.elf
+
+obj/dumphex.elf: obj/dumphex/dumphex.o
+ ld -T src/user/elf.ld obj/dumphex/* obj/knob.so -o obj/dumphex.elf \ No newline at end of file