From 6f1b50a4cc6c232ee505a543f006abb1c6cd33cf Mon Sep 17 00:00:00 2001 From: Benji Dial Date: Fri, 19 Feb 2021 23:41:56 -0500 Subject: rtc fixes, time command --- makefile | 13 +++++++++---- 1 file changed, 9 insertions(+), 4 deletions(-) (limited to 'makefile') diff --git a/makefile b/makefile index 17dc0ec..611593a 100644 --- a/makefile +++ b/makefile @@ -37,7 +37,7 @@ out/fs/bin/%: obj/%.elf out/fs: out/fs/bin/init out/fs/bin/highway out/fs/bin/meminfo \ out/fs/bin/terminal out/fs/bin/hello out/fs/bin/mkpopup \ - out/fs/bin/dirlist out/fs/bin/ttt + out/fs/bin/dirlist out/fs/bin/ttt out/fs/bin/time touch out/fs cp -r fs-skel/* out/fs/ @@ -82,9 +82,10 @@ obj/c.rto: obj/runtimes/c/pcrt.ao obj/cpp.rto: #TODO -obj/knob.so: obj/knob/file.o obj/knob/format.o obj/knob/rand.o \ - obj/knob/heap.o obj/knob/ipc.o obj/knob/task.o \ - obj/knob/block.o obj/knob/key.o obj/knob/panic.o +obj/knob.so: obj/knob/file.o obj/knob/format.o obj/knob/rand.o \ + obj/knob/heap.o obj/knob/ipc.o obj/knob/task.o \ + obj/knob/block.o obj/knob/key.o obj/knob/panic.o \ + obj/knob/time.o ld ${partlink} $^ -o $@ obj/libterm.so: obj/libterm/terminal.o obj/libterm/termtask.o obj/libterm/readline.o @@ -126,4 +127,8 @@ obj/dirlist.elf: obj/dirlist/main.o obj/libterm.so obj/knob.so \ obj/ttt.elf : obj/ttt/main.o obj/popups.so obj/libfont.so \ obj/knob.so obj/c.rto + ld -T src/user/runtimes/c/elf.ld $^ -o $@ + +obj/time.elf: obj/time/time.o obj/libterm.so obj/knob.so \ + obj/c.rto ld -T src/user/runtimes/c/elf.ld $^ -o $@ \ No newline at end of file -- cgit v1.2.3