From 47513bd32c256c4f35e3a8ced7d9fd7e15903530 Mon Sep 17 00:00:00 2001
From: Benji Dial <benji6283@gmail.com>
Date: Tue, 16 Feb 2021 20:38:53 -0500
Subject: terminal application with ipc, shift+pause state dumper, hello world
 for terminal, meminfo popup program

---
 makefile | 20 ++++++++++++++------
 1 file changed, 14 insertions(+), 6 deletions(-)

(limited to 'makefile')

diff --git a/makefile b/makefile
index 002dce3..5261284 100644
--- a/makefile
+++ b/makefile
@@ -35,7 +35,8 @@ out/fs/man/%.man: src/man/%.pre
 	mkdir -p $(shell dirname $@)
 	python3 tools/man-gen.py $< $@
 
-out/fs: out/fs/bin/init out/fs/bin/highway out/fs/bin/meminfo
+out/fs: out/fs/bin/init     out/fs/bin/highway out/fs/bin/meminfo \
+        out/fs/bin/terminal out/fs/bin/hello
 	touch out/fs
 	cp -r fs-skel/* out/fs/
 
@@ -52,7 +53,7 @@ out/kernel.bin: obj/kernel/drive.ko  obj/kernel/fat.ko    obj/kernel/ide.ko  \
                 obj/kernel/panic.ko  obj/kernel/pci.ko    obj/kernel/elf.ko  \
                 obj/kernel/serial.ko obj/kernel/task.ko   obj/kernel/util.ko \
                 obj/kernel/window.ko obj/kernel/isrs.kao  obj/kernel/kbd.ko  \
-                obj/kernel/pmap.ko   obj/kernel/paging.ko
+                obj/kernel/pmap.ko   obj/kernel/paging.ko obj/kernel/dump.ko
 	mkdir -p out
 	ld -T src/kernel/elf-link.ld $^ -o obj/kernel.elf
 	objcopy -O binary obj/kernel.elf out/kernel.bin
@@ -84,7 +85,7 @@ obj/knob.so: obj/knob/file.o  obj/knob/format.o \
              obj/knob/block.o obj/knob/key.o  obj/knob/panic.o
 	ld ${partlink} $^ -o $@
 
-obj/terminal.so: obj/terminal/readline.o obj/terminal/terminal.o
+obj/libterm.so: obj/libterm/terminal.o obj/libterm/termtask.o obj/libterm/readline.o
 	ld ${partlink} $^ -o $@
 
 obj/libfont.so: obj/libfont/bdf.o obj/libfont/fonts.o obj/libfont/filist.o
@@ -97,10 +98,17 @@ obj/init.elf: obj/init/init.o obj/knob.so obj/c.rto
 	ld -T src/user/runtimes/c/elf.ld $^ -o $@
 
 obj/highway.elf: obj/highway/main.o obj/highway/cmds.o obj/highway/line.o \
-                 obj/highway/vars.o obj/knob.so        obj/terminal.so    \
-                 obj/libfont.so     obj/c.rto
+                 obj/highway/vars.o obj/knob.so        obj/libterm.so     \
+                 obj/c.rto
 	ld -T src/user/runtimes/c/elf.ld $^ -o $@
 
 obj/meminfo.elf: obj/meminfo/meminfo.o obj/popups.so obj/libfont.so \
                  obj/knob.so           obj/c.rto
-	ld -T src/user/runtimes/c/elf.ld $^ -o $@
\ No newline at end of file
+	ld -T src/user/runtimes/c/elf.ld $^ -o $@
+
+obj/terminal.elf: obj/terminal/main.o obj/libfont.so obj/knob.so \
+                  obj/c.rto
+	ld -T src/user/runtimes/c/elf.ld $^ -o $@
+
+obj/hello.elf: obj/hello/hello.ao
+	ld -T src/user/runtimes/asm/elf.ld $^ -o $@
\ No newline at end of file
-- 
cgit v1.2.3