build: Misc improvements to makefiles

GNUmakefile.in

@@ -163,18 +163,24 @@ endif
 limine-cd-efi:
 	$(MAKE) '$(call SHESCAPE,$(BINDIR))/limine-cd-efi.bin'
 
-.PHONY: limine-uefi-x86-64
-limine-uefi-x86-64: $(call MKESCAPE,$(SRCDIR))/limine-efi
-	$(MAKE) common-uefi-x86-64
+$(call MKESCAPE,$(BINDIR))/BOOTX64.EFI: $(call MKESCAPE,$(BUILDDIR))/common-uefi-x86-64/BOOTX64.EFI
 	$(MKDIR_P) '$(call SHESCAPE,$(BINDIR))'
 	cp '$(call SHESCAPE,$(BUILDDIR))/common-uefi-x86-64/BOOTX64.EFI' '$(call SHESCAPE,$(BINDIR))/'
 
-.PHONY: limine-uefi-ia32
-limine-uefi-ia32: $(call MKESCAPE,$(SRCDIR))/limine-efi
-	$(MAKE) common-uefi-ia32
+.PHONY: limine-uefi-x86-64
+limine-uefi-x86-64:
+	$(MAKE) common-uefi-x86-64
+	$(MAKE) '$(call SHESCAPE,$(BINDIR))/BOOTX64.EFI'
+
+$(call MKESCAPE,$(BINDIR))/BOOTIA32.EFI: $(call MKESCAPE,$(BUILDDIR))/common-uefi-ia32/BOOTIA32.EFI
 	$(MKDIR_P) '$(call SHESCAPE,$(BINDIR))'
 	cp '$(call SHESCAPE,$(BUILDDIR))/common-uefi-ia32/BOOTIA32.EFI' '$(call SHESCAPE,$(BINDIR))/'
 
+.PHONY: limine-uefi-ia32
+limine-uefi-ia32:
+	$(MAKE) common-uefi-ia32
+	$(MAKE) '$(call SHESCAPE,$(BINDIR))/BOOTIA32.EFI'
+
 .PHONY: limine-bios-clean
 limine-bios-clean: common-bios-clean decompressor-clean
 

common/GNUmakefile

@@ -127,8 +127,6 @@ override CROSS_LDFLAGS += \
         -ztext
 endif
 
-.PHONY: all
-
 override C_FILES := $(shell find ./ -type f -name '*.c')
 ifeq ($(TARGET),bios)
     override ASMX86_FILES := $(shell find ./ -type f -name '*.asm_x86')
@@ -154,6 +152,8 @@ override OBJ := $(addprefix $(call MKESCAPE,$(BUILDDIR))/, $(C_FILES:.c=.o) $(AS
 endif
 override HEADER_DEPS := $(addprefix $(call MKESCAPE,$(BUILDDIR))/, $(C_FILES:.c=.d))
 
+.PHONY: all
+
 ifeq ($(TARGET),bios)
 all: $(call MKESCAPE,$(BUILDDIR))/limine.sys $(call MKESCAPE,$(BUILDDIR))/stage2.bin.gz
 else ifeq ($(TARGET),uefi-x86-64)