From 8eda325ede02d3fc606a34f7fa3c4922b05a84e4 Mon Sep 17 00:00:00 2001 From: EmulatedSeasons <89668582+EmulatedSeasons@users.noreply.github.com> Date: Thu, 18 Jul 2024 22:25:44 -0400 Subject: Remerged the std stuff into the kernel --- makefile | 21 ++++++++------------- 1 file changed, 8 insertions(+), 13 deletions(-) (limited to 'makefile') diff --git a/makefile b/makefile index 8717518..4de621c 100644 --- a/makefile +++ b/makefile @@ -18,13 +18,9 @@ QEMU = qemu-system-$(ARCH) all: build-all limine -build-all: kernel/kernel.bin libc/libc.a +build-all: kernel/kernel.bin -libc/libc.a: install-headers - $(info [INFO] Building libc) - $(MAKE) -C ./libc/ all - -kernel/kernel.bin: libc/libc.a install-headers +kernel/kernel.bin: $(info [INFO] Building kernel) $(MAKE) -C ./kernel/ all @@ -40,16 +36,15 @@ limine: build-all qemu: limine $(QEMU) -no-shutdown -no-reboot --serial stdio -s -m 1024 -hda $(OS_NAME).iso -install: install-headers install-libraries +# install: install-headers install-libraries -install-headers: - $(MAKE) -C ./kernel/ install-headers - $(MAKE) -C ./libc/ install-headers +# install-headers: +# $(MAKE) -C ./kernel/ install-headers +# $(MAKE) -C ./libc/ install-headers -install-libraries: - $(MAKE) -C ./libc/ install-lib +# install-libraries: +# $(MAKE) -C ./libc/ install-lib clean: -@$(MAKE) -C ./kernel/ clean - -@$(MAKE) -C ./libc/ clean -@$(RM) $(wildcard *.bin *.a) -- cgit v1.2.3-70-g09d2