build: More Makefile improvements

This commit is contained in:
mintsuki 2021-12-08 19:22:09 +01:00
parent 84c8dce062
commit 415a57be6c

View File

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