summaryrefslogtreecommitdiff
path: root/makefile
diff options
context:
space:
mode:
authorBenji Dial <benji6283@gmail.com>2021-02-17 16:35:02 -0500
committerBenji Dial <benji6283@gmail.com>2021-02-17 16:35:02 -0500
commit3a3602861226e995d95a8898668cd559c3ca1cf6 (patch)
tree0d5bc0494297a12e9ccb76b31cb365c843216735 /makefile
parent49d76d30a55707e2bf95fd9ba03296489fac8d1d (diff)
downloadportland-os-3a3602861226e995d95a8898668cd559c3ca1cf6.tar.gz
quick bitmap font format, borrowing new default font from X
Diffstat (limited to 'makefile')
-rw-r--r--makefile9
1 files changed, 5 insertions, 4 deletions
diff --git a/makefile b/makefile
index 3dbc96e..68690e6 100644
--- a/makefile
+++ b/makefile
@@ -31,9 +31,9 @@ out/fs/bin/%: obj/%.elf
mkdir -p $(shell dirname $@)
objcopy -S $< $@
-out/fs/man/%.man: src/man/%.pre
- mkdir -p $(shell dirname $@)
- python3 tools/man-gen.py $< $@
+#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/bin/terminal out/fs/bin/hello out/fs/bin/mkpopup
@@ -89,7 +89,8 @@ obj/knob.so: obj/knob/file.o obj/knob/format.o obj/knob/rand.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
+obj/libfont.so: obj/libfont/bdf.o obj/libfont/pbf.o obj/libfont/fonts.o \
+ obj/libfont/filist.o
ld ${partlink} $^ -o $@
obj/popups.so: obj/popups/info.o obj/popups/popup.o