:: commit e3b761b6291637c9555d0217b858b478d01b7d27

mintsuki <mintsuki@protonmail.com> — 2021-12-08 18:22

parents: 35100979fc

build: More Makefile improvements

diff --git a/Makefile b/Makefile
index d8514116..99721b0a 100644
--- a/Makefile
+++ b/Makefile
@@ -58,8 +58,7 @@ override STAGE1_FILES := $(shell find -L ./stage1 -type f -name '*.asm')
 
 .PHONY: all
 all: limine-uefi limine-uefi32 limine-bios
-	$(MAKE) limine-install
-	$(MAKE) '$(call SHESCAPE,$(BINDIR))/limine-eltorito-efi.bin'
+	$(MAKE) limine-install limine-eltorito-efi
 
 .PHONY: limine-install
 limine-install:
@@ -96,8 +95,8 @@ $(call MKESCAPE,$(BUILDDIR))/stage1: $(STAGE1_FILES) $(call MKESCAPE,$(BUILDDIR)
 limine-bios: stage23-bios decompressor
 	$(MAKE) '$(call SHESCAPE,$(BUILDDIR))/stage1'
 
-.PHONY: $(call MKESCAPE,$(BINDIR))/limine-eltorito-efi.bin
-$(call MKESCAPE,$(BINDIR))/limine-eltorito-efi.bin:
+.PHONY: limine-eltorito-efi
+limine-eltorito-efi:
 	mkdir -p '$(call SHESCAPE,$(BINDIR))'
 	dd if=/dev/zero of='$(call SHESCAPE,$@)' bs=512 count=2880
 	( mformat -i '$(call SHESCAPE,$@)' -f 1440 :: && \
@@ -369,10 +368,7 @@ full-hybrid-test:
 	$(MAKE) ovmf-x64
 	$(MAKE) ovmf-ia32
 	$(MAKE) test-clean
-	$(MAKE) limine-uefi
-	$(MAKE) limine-uefi32
-	$(MAKE) limine-bios
-	$(MAKE) limine-install
+	$(MAKE) all
 	$(MAKE) -C test
 	rm -rf test_image/
 	mkdir -p test_image/boot
tab: 248 wrap: offon