From 92d4f9dae64ab5325feca1f39e5955415e8275b9 Mon Sep 17 00:00:00 2001
From: Ian Moffett <ian@osmora.org>
Date: Fri, 18 Apr 2025 21:50:44 -0400
Subject: usr.bin: Add basic "shell"

Signed-off-by: Ian Moffett <ian@osmora.org>
---
 Makefile.in | 10 +++++++++-
 1 file changed, 9 insertions(+), 1 deletion(-)

(limited to 'Makefile.in')

diff --git a/Makefile.in b/Makefile.in
index d7f5c8d..bae9728 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -60,10 +60,11 @@ override KERNEL_HEADER_DEPS = $(KERNEL_CFILES:.c=.d)
 # Userland
 ########################
 override SBIN_MAKEDIRS = $(shell find usr.sbin/ -type d -name "*" | awk '!/usr.sbin\/$$/')
+override BIN_MAKEDIRS = $(shell find usr.bin/ -type d -name "*" | awk '!/usr.bin\/$$/')
 override USRDIR = $(shell pwd)/base/usr
 
 .PHONY: all
-all: base libc sbin base/boot/hyra-kernel ramfs iso
+all: base libc sbin bin base/boot/hyra-kernel ramfs iso
 		rm -f sys/include/machine
 		rm -rf iso_root
 
@@ -73,6 +74,12 @@ sbin: $(SBIN_MAKEDIRS)
 		LDSCRIPT=$(shell pwd)/usr.sbin/link.ld USRDIR=$(USRDIR)
 	find $^ -type f -executable -exec mv {} base/usr/sbin/ \;
 
+.PHONY: bin
+bin: $(BIN_MAKEDIRS)
+	$(MAKE) -C $^ -I$(shell pwd)/builddeps \
+		LDSCRIPT=$(shell pwd)/usr.bin/link.ld USRDIR=$(USRDIR)
+	find $^ -type f -executable -exec mv {} base/usr/bin/ \;
+
 .PHONY: libc
 libc:
 	$(MAKE) -C lib/libc/ -I$(shell pwd)/builddeps \
@@ -83,6 +90,7 @@ libc:
 base:
 	mkdir -p base/usr/lib/
 	mkdir -p base/usr/sbin/
+	mkdir -p base/usr/bin/
 	mkdir -p base/boot/
 	mkdir -p base/usr/include/sys/
 	cp -f sys/include/sys/*.h base/usr/include/sys/
-- 
cgit v1.2.3