diff options
| author | Ian Moffett <ian@osmora.org> | 2025-04-18 21:57:44 -0400 |
|---|---|---|
| committer | Ian Moffett <ian@osmora.org> | 2025-04-18 21:57:44 -0400 |
| commit | 9906547712a88cf4dc012a6f6bd6e2ad04c5e3f3 (patch) | |
| tree | 41b40ec97f5082793b08a495f6a935bc3c1ed25f /Makefile.in | |
| parent | 0b5adaff02190dad76d845381a41b998696d9e97 (diff) | |
| parent | 92d4f9dae64ab5325feca1f39e5955415e8275b9 (diff) | |
Merge branch 'expt' into aarch64
Signed-off-by: Ian Moffett <ian@osmora.org>
Diffstat (limited to 'Makefile.in')
| -rw-r--r-- | Makefile.in | 13 |
1 files changed, 11 insertions, 2 deletions
diff --git a/Makefile.in b/Makefile.in index 95a419f..bcea289 100644 --- a/Makefile.in +++ b/Makefile.in @@ -61,10 +61,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 @@ -74,6 +75,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 \ @@ -84,6 +91,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/ @@ -113,9 +121,10 @@ iso: mkdir -p iso_root/EFI/BOOT/ cp stand/limine/$(BOOT_FW) iso_root/EFI/BOOT/ mv ramfs.cpio iso_root/boot/ - cp builddeps/limine.cfg stand/limine/limine-bios.sys \ + cp builddeps/limine.conf stand/limine/limine-bios.sys \ stand/limine/limine-bios-cd.bin stand/limine/limine-uefi-cd.bin iso_root/ cp base/boot/* iso_root/boot/ + cp builddeps/tree.jpg iso_root/boot/ xorriso -as mkisofs -b limine-bios-cd.bin -no-emul-boot -boot-load-size 4\ -boot-info-table --efi-boot limine-uefi-cd.bin -efi-boot-part \ --efi-boot-image --protective-msdos-label iso_root -o Hyra.iso > /dev/null |