From 8512dfb2f81e57c1b68890bf15214802da260c2c Mon Sep 17 00:00:00 2001
From: Ian Moffett <ian@osmora.org>
Date: Fri, 16 May 2025 09:40:50 -0400
Subject: build: Add Makefile for usr.sbin and usr.bin

Signed-off-by: Ian Moffett <ian@osmora.org>
---
 Makefile.in       | 10 ++++------
 usr.bin/Makefile  |  8 ++++++++
 usr.sbin/Makefile |  8 ++++++++
 3 files changed, 20 insertions(+), 6 deletions(-)
 create mode 100644 usr.bin/Makefile
 create mode 100644 usr.sbin/Makefile

diff --git a/Makefile.in b/Makefile.in
index 457173e..d3bef70 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -77,15 +77,13 @@ all: base libc sbin bin base/boot/hyra-kernel ramfs iso
 
 .PHONY: sbin
 sbin: $(SBIN_MAKEDIRS)
-	$(MAKE) -C $^ -I$(shell pwd)/builddeps \
-		LDSCRIPT=$(shell pwd)/usr.sbin/link.ld USRDIR=$(USRDIR)\
-		ROOT=$(PROJECT_ROOT)
+	make -C usr.sbin/ LDSCRIPT=$(shell pwd)/usr.sbin/link.ld USRDIR=$(USRDIR)\
+			ROOT=$(PROJECT_ROOT)\
 
 .PHONY: bin
 bin: $(BIN_MAKEDIRS)
-	$(MAKE) -C $^ -I$(shell pwd)/builddeps \
-		LDSCRIPT=$(shell pwd)/usr.bin/link.ld USRDIR=$(USRDIR) \
-		ROOT=$(PROJECT_ROOT)
+	make -C usr.bin/ LDSCRIPT=$(shell pwd)/usr.bin/link.ld USRDIR=$(USRDIR)\
+			ROOT=$(PROJECT_ROOT)
 
 .PHONY: libc
 libc:
diff --git a/usr.bin/Makefile b/usr.bin/Makefile
new file mode 100644
index 0000000..1c973ff
--- /dev/null
+++ b/usr.bin/Makefile
@@ -0,0 +1,8 @@
+LDSCRIPT =
+USRDIR =
+ROOT =
+ARGS = -I$(ROOT)/builddeps LDSCRIPT=$(LDSCRIPT) USRDIR=$(USRDIR) ROOT=$(ROOT)
+
+.PHONY: all
+all:
+	make -C osh/ $(ARGS)
diff --git a/usr.sbin/Makefile b/usr.sbin/Makefile
new file mode 100644
index 0000000..b517c2f
--- /dev/null
+++ b/usr.sbin/Makefile
@@ -0,0 +1,8 @@
+LDSCRIPT =
+USRDIR =
+ROOT =
+ARGS = -I$(ROOT)/builddeps LDSCRIPT=$(LDSCRIPT) USRDIR=$(USRDIR) ROOT=$(ROOT)
+
+.PHONY: all
+all:
+	make -C init/ $(ARGS)
-- 
cgit v1.2.3