37 files changed, 7 insertions, 7 deletions
diff --git a/c/args.c b/usr/args.c
index c6f4db3..c6f4db3 100644
--- a/c/args.c
+++ b/usr/args.c
diff --git a/c/blk.c b/usr/blk.c
index 36839c0..36839c0 100644
--- a/c/blk.c
+++ b/usr/blk.c
diff --git a/c/build.sh b/usr/build.sh
index 8034d87..93815d2 100755
--- a/c/build.sh
+++ b/usr/build.sh
@@ -1,15 +1,15 @@
 #!/bin/sh
 # Build a gbos C program into a self-contained 16 KiB ROM-bank image.
 # SDCC native toolchain; crt0 linked FIRST so _start is the $4000 entry.
-# usage: c/build.sh <prog.c> <out.bin>
+# usage: usr/build.sh <prog.c> <out.bin>     (run from the repo root)
 set -e
-SRC="$1"; OUT="$2"; B=build/c
+SRC="$1"; OUT="$2"; B=build/usr/obj
 LIBDIR=/usr/share/sdcc/lib/sm83
-mkdir -p "$B"
-sdasgb -o "$B/crt0.rel" c/crt0.s
-sdasgb -o "$B/libc.rel" c/libc.s
-sdcc -msm83 -c -Ic c/libc.c -o "$B/libc_c.rel"
-sdcc -msm83 -c -Ic "$SRC" -o "$B/prog.rel"
+mkdir -p "$B" "$(dirname "$OUT")"
+sdasgb -o "$B/crt0.rel" usr/crt0.s
+sdasgb -o "$B/libc.rel" usr/libc.s
+sdcc -msm83 -c -Iusr usr/libc.c -o "$B/libc_c.rel"
+sdcc -msm83 -c -Iusr "$SRC" -o "$B/prog.rel"
 # link: crt0 first (=> _start at 0x4000), then libc, program, and sm83 lib
 sdldgb -n -m -w -j -i "$B/prog.ihx" \
        -b _CODE=0x4000 -b _DATA=0xa000 \
diff --git a/c/cat.c b/usr/cat.c
index 790cb88..790cb88 100644
--- a/c/cat.c
+++ b/usr/cat.c
diff --git a/c/chat.c b/usr/chat.c
index 987b336..987b336 100644
--- a/c/chat.c
+++ b/usr/chat.c
diff --git a/c/chello.c b/usr/chello.c
index f570b61..f570b61 100644
--- a/c/chello.c
+++ b/usr/chello.c
diff --git a/c/count.c b/usr/count.c
index 37cdcce..37cdcce 100644
--- a/c/count.c
+++ b/usr/count.c
diff --git a/c/crt0.s b/usr/crt0.s
index 0d8371f..0d8371f 100644
--- a/c/crt0.s
+++ b/usr/crt0.s
diff --git a/c/dhcp.c b/usr/dhcp.c
index e4186f4..e4186f4 100644
--- a/c/dhcp.c
+++ b/usr/dhcp.c
diff --git a/c/echo.c b/usr/echo.c
index f8d5125..f8d5125 100644
--- a/c/echo.c
+++ b/usr/echo.c
diff --git a/c/false.c b/usr/false.c
index a124951..a124951 100644
--- a/c/false.c
+++ b/usr/false.c
diff --git a/c/gbos.h b/usr/gbos.h
index 2350665..2350665 100644
--- a/c/gbos.h
+++ b/usr/gbos.h
diff --git a/c/head.c b/usr/head.c
index 3298e54..3298e54 100644
--- a/c/head.c
+++ b/usr/head.c
diff --git a/c/irc.c b/usr/irc.c
index 250738a..250738a 100644
--- a/c/irc.c
+++ b/usr/irc.c
diff --git a/c/kill.c b/usr/kill.c
index e524627..e524627 100644
--- a/c/kill.c
+++ b/usr/kill.c
diff --git a/c/libc.c b/usr/libc.c
index a48a64c..a48a64c 100644
--- a/c/libc.c
+++ b/usr/libc.c
diff --git a/c/libc.s b/usr/libc.s
index 5b176d9..5b176d9 100644
--- a/c/libc.s
+++ b/usr/libc.s
diff --git a/c/ls.c b/usr/ls.c
index 0e2e01f..0e2e01f 100644
--- a/c/ls.c
+++ b/usr/ls.c
diff --git a/c/mkdir.c b/usr/mkdir.c
index c907518..c907518 100644
--- a/c/mkdir.c
+++ b/usr/mkdir.c
diff --git a/c/necho.c b/usr/necho.c
index 99551d4..99551d4 100644
--- a/c/necho.c
+++ b/usr/necho.c
diff --git a/c/netd.c b/usr/netd.c
index b07abd2..b07abd2 100644
--- a/c/netd.c
+++ b/usr/netd.c
diff --git a/c/netlib.h b/usr/netlib.h
index ec98eac..ec98eac 100644
--- a/c/netlib.h
+++ b/usr/netlib.h
diff --git a/c/nslookup.c b/usr/nslookup.c
index 6a531b8..6a531b8 100644
--- a/c/nslookup.c
+++ b/usr/nslookup.c
diff --git a/c/pid.c b/usr/pid.c
index 9e4e792..9e4e792 100644
--- a/c/pid.c
+++ b/usr/pid.c
diff --git a/c/ping.c b/usr/ping.c
index 8671318..8671318 100644
--- a/c/ping.c
+++ b/usr/ping.c
diff --git a/c/ps.c b/usr/ps.c
index 7bfc0de..7bfc0de 100644
--- a/c/ps.c
+++ b/usr/ps.c
diff --git a/c/ptest.c b/usr/ptest.c
index 88b7d30..88b7d30 100644
--- a/c/ptest.c
+++ b/usr/ptest.c
diff --git a/c/resolve.h b/usr/resolve.h
index 9aaccc1..9aaccc1 100644
--- a/c/resolve.h
+++ b/usr/resolve.h
diff --git a/c/rm.c b/usr/rm.c
index 25f3004..25f3004 100644
--- a/c/rm.c
+++ b/usr/rm.c
diff --git a/c/save.c b/usr/save.c
index 1755fea..1755fea 100644
--- a/c/save.c
+++ b/usr/save.c
diff --git a/c/sh.c b/usr/sh.c
index 3178894..3178894 100644
--- a/c/sh.c
+++ b/usr/sh.c
diff --git a/c/sock.h b/usr/sock.h
index 876e85c..876e85c 100644
--- a/c/sock.h
+++ b/usr/sock.h
diff --git a/c/spin.c b/usr/spin.c
index 2a3d4e8..2a3d4e8 100644
--- a/c/spin.c
+++ b/usr/spin.c
diff --git a/c/true.c b/usr/true.c
index 4cf437e..4cf437e 100644
--- a/c/true.c
+++ b/usr/true.c
diff --git a/c/uname.c b/usr/uname.c
index 511501d..511501d 100644
--- a/c/uname.c
+++ b/usr/uname.c
diff --git a/c/wc.c b/usr/wc.c
index 4fa48ee..4fa48ee 100644
--- a/c/wc.c
+++ b/usr/wc.c
diff --git a/c/wget.c b/usr/wget.c
index aafbae0..aafbae0 100644
--- a/c/wget.c
+++ b/usr/wget.c