:: commit d493608e1278c707649da853960c92d3ac00b7ae
build: Simplify make calls after 87192de295d3813cb75f78b2effff3ed4d40b097
diff --git a/GNUmakefile.in b/GNUmakefile.in
index f27779b1..44f3b6b8 100644
--- a/GNUmakefile.in
+++ b/GNUmakefile.in
@@ -362,7 +362,7 @@ maintainer-clean: distclean
.PHONY: common-uefi-x86-64
common-uefi-x86-64:
- $(MAKE) -C '$(call SHESCAPE,$(SRCDIR))/common' -f '$(call SHESCAPE,$(SRCDIR))/common/common.mk' all \
+ $(MAKE) -C '$(call SHESCAPE,$(SRCDIR))/common' -f common.mk all \
TOOLCHAIN_FILE='$(call SHESCAPE,$(BUILDDIR))/toolchain-files/uefi-x86_64-toolchain.mk' \
TARGET=uefi-x86-64 \
BUILDDIR='$(call SHESCAPE,$(BUILDDIR))/common-uefi-x86-64'
@@ -373,7 +373,7 @@ common-uefi-x86-64-clean:
.PHONY: common-uefi-aarch64
common-uefi-aarch64:
- $(MAKE) -C '$(call SHESCAPE,$(SRCDIR))/common' -f '$(call SHESCAPE,$(SRCDIR))/common/common.mk' all \
+ $(MAKE) -C '$(call SHESCAPE,$(SRCDIR))/common' -f common.mk all \
TOOLCHAIN_FILE='$(call SHESCAPE,$(BUILDDIR))/toolchain-files/uefi-aarch64-toolchain.mk' \
TARGET=uefi-aarch64 \
BUILDDIR='$(call SHESCAPE,$(BUILDDIR))/common-uefi-aarch64'
@@ -384,7 +384,7 @@ common-uefi-aarch64-clean:
.PHONY: common-uefi-riscv64
common-uefi-riscv64:
- $(MAKE) -C '$(call SHESCAPE,$(SRCDIR))/common' -f '$(call SHESCAPE,$(SRCDIR))/common/common.mk' all \
+ $(MAKE) -C '$(call SHESCAPE,$(SRCDIR))/common' -f common.mk all \
TOOLCHAIN_FILE='$(call SHESCAPE,$(BUILDDIR))/toolchain-files/uefi-riscv64-toolchain.mk' \
TARGET=uefi-riscv64 \
BUILDDIR='$(call SHESCAPE,$(BUILDDIR))/common-uefi-riscv64'
@@ -395,7 +395,7 @@ common-uefi-riscv64-clean:
.PHONY: common-uefi-loongarch64
common-uefi-loongarch64:
- $(MAKE) -C '$(call SHESCAPE,$(SRCDIR))/common' -f '$(call SHESCAPE,$(SRCDIR))/common/common.mk' all \
+ $(MAKE) -C '$(call SHESCAPE,$(SRCDIR))/common' -f common.mk all \
TOOLCHAIN_FILE='$(call SHESCAPE,$(BUILDDIR))/toolchain-files/uefi-loongarch64-toolchain.mk' \
TARGET=uefi-loongarch64 \
BUILDDIR='$(call SHESCAPE,$(BUILDDIR))/common-uefi-loongarch64'
@@ -406,7 +406,7 @@ common-uefi-loongarch64-clean:
.PHONY: common-uefi-ia32
common-uefi-ia32:
- $(MAKE) -C '$(call SHESCAPE,$(SRCDIR))/common' -f '$(call SHESCAPE,$(SRCDIR))/common/common.mk' all \
+ $(MAKE) -C '$(call SHESCAPE,$(SRCDIR))/common' -f common.mk all \
TOOLCHAIN_FILE='$(call SHESCAPE,$(BUILDDIR))/toolchain-files/uefi-i686-toolchain.mk' \
TARGET=uefi-ia32 \
BUILDDIR='$(call SHESCAPE,$(BUILDDIR))/common-uefi-ia32'
@@ -417,7 +417,7 @@ common-uefi-ia32-clean:
.PHONY: common-bios
common-bios:
- $(MAKE) -C '$(call SHESCAPE,$(SRCDIR))/common' -f '$(call SHESCAPE,$(SRCDIR))/common/common.mk' all \
+ $(MAKE) -C '$(call SHESCAPE,$(SRCDIR))/common' -f common.mk all \
TOOLCHAIN_FILE='$(call SHESCAPE,$(BUILDDIR))/toolchain-files/bios-i686-toolchain.mk' \
TARGET=bios \
BUILDDIR='$(call SHESCAPE,$(BUILDDIR))/common-bios'
@@ -428,7 +428,7 @@ common-bios-clean:
.PHONY: decompressor
decompressor:
- $(MAKE) -C '$(call SHESCAPE,$(SRCDIR))/decompressor' -f '$(call SHESCAPE,$(SRCDIR))/decompressor/decompressor.mk' all \
+ $(MAKE) -C '$(call SHESCAPE,$(SRCDIR))/decompressor' -f decompressor.mk all \
TOOLCHAIN_FILE='$(call SHESCAPE,$(BUILDDIR))/toolchain-files/bios-i686-toolchain.mk' \
BUILDDIR='$(call SHESCAPE,$(BUILDDIR))/decompressor-build'
diff --git a/common/common.mk b/common/common.mk
index 7bb9b1b9..a8a2f3cf 100644
--- a/common/common.mk
+++ b/common/common.mk
@@ -307,7 +307,7 @@ $(call MKESCAPE,$(BUILDDIR))/linker_stage2only.ld: linker_bios.ld.in
$(CC_FOR_TARGET) -x c -E -P -undef -DLINKER_STAGE2ONLY linker_bios.ld.in -o '$(call SHESCAPE,$(BUILDDIR))/linker_stage2only.ld'
$(call MKESCAPE,$(BUILDDIR))/limine_stage2only.elf: $(OBJ_S2)
- $(MAKE) -f '$(call SHESCAPE,$(SRCDIR))/common.mk' '$(call SHESCAPE,$(BUILDDIR))/linker_stage2only.ld'
+ $(MAKE) -f common.mk '$(call SHESCAPE,$(BUILDDIR))/linker_stage2only.ld'
$(LD_FOR_TARGET) '$(call OBJESCAPE,$^)' $(LDFLAGS_FOR_TARGET) -T'$(call SHESCAPE,$(BUILDDIR))/linker_stage2only.ld' -o '$(call SHESCAPE,$@)' || \
( echo "This error may mean that stage 2 was trying to use stage 3 symbols before loading stage 3" && \
false )
@@ -320,8 +320,8 @@ $(call MKESCAPE,$(BUILDDIR))/empty:
touch '$(call SHESCAPE,$@)'
$(call MKESCAPE,$(BUILDDIR))/limine_nomap.elf: $(OBJ)
- $(MAKE) -f '$(call SHESCAPE,$(SRCDIR))/common.mk' '$(call SHESCAPE,$(BUILDDIR))/empty'
- $(MAKE) -f '$(call SHESCAPE,$(SRCDIR))/common.mk' '$(call SHESCAPE,$(BUILDDIR))/linker_nos2map.ld'
+ $(MAKE) -f common.mk '$(call SHESCAPE,$(BUILDDIR))/empty'
+ $(MAKE) -f common.mk '$(call SHESCAPE,$(BUILDDIR))/linker_nos2map.ld'
$(LD_FOR_TARGET) '$(call OBJESCAPE,$^)' $(LDFLAGS_FOR_TARGET) -T'$(call SHESCAPE,$(BUILDDIR))/linker_nos2map.ld' -o '$(call SHESCAPE,$@)'
$(OBJCOPY_FOR_TARGET) -O binary --only-section=.note.gnu.build-id '$(call SHESCAPE,$@)' '$(call SHESCAPE,$(BUILDDIR))/build-id.s2.bin'
cd '$(call SHESCAPE,$(BUILDDIR))' && \
@@ -338,8 +338,8 @@ $(call MKESCAPE,$(BUILDDIR))/linker_nomap.ld: linker_bios.ld.in
$(CC_FOR_TARGET) -x c -E -P -undef -DLINKER_NOMAP linker_bios.ld.in -o '$(call SHESCAPE,$(BUILDDIR))/linker_nomap.ld'
$(call MKESCAPE,$(BUILDDIR))/limine_nos3map.elf: $(OBJ) $(call MKESCAPE,$(BUILDDIR))/stage2.map.o
- $(MAKE) -f '$(call SHESCAPE,$(SRCDIR))/common.mk' '$(call SHESCAPE,$(BUILDDIR))/empty'
- $(MAKE) -f '$(call SHESCAPE,$(SRCDIR))/common.mk' '$(call SHESCAPE,$(BUILDDIR))/linker_nomap.ld'
+ $(MAKE) -f common.mk '$(call SHESCAPE,$(BUILDDIR))/empty'
+ $(MAKE) -f common.mk '$(call SHESCAPE,$(BUILDDIR))/linker_nomap.ld'
$(LD_FOR_TARGET) '$(call OBJESCAPE,$^)' $(LDFLAGS_FOR_TARGET) -T'$(call SHESCAPE,$(BUILDDIR))/linker_nomap.ld' -o '$(call SHESCAPE,$@)'
$(OBJCOPY_FOR_TARGET) -O binary --only-section=.note.gnu.build-id '$(call SHESCAPE,$@)' '$(call SHESCAPE,$(BUILDDIR))/build-id.s2.bin'
cd '$(call SHESCAPE,$(BUILDDIR))' && \
@@ -356,8 +356,8 @@ $(call MKESCAPE,$(BUILDDIR))/linker.ld: linker_bios.ld.in
$(CC_FOR_TARGET) -x c -E -P -undef linker_bios.ld.in -o '$(call SHESCAPE,$(BUILDDIR))/linker.ld'
$(call MKESCAPE,$(BUILDDIR))/limine.elf: $(OBJ) $(call MKESCAPE,$(BUILDDIR))/stage2.map.o $(call MKESCAPE,$(BUILDDIR))/full.map.o
- $(MAKE) -f '$(call SHESCAPE,$(SRCDIR))/common.mk' '$(call SHESCAPE,$(BUILDDIR))/empty'
- $(MAKE) -f '$(call SHESCAPE,$(SRCDIR))/common.mk' '$(call SHESCAPE,$(BUILDDIR))/linker.ld'
+ $(MAKE) -f common.mk '$(call SHESCAPE,$(BUILDDIR))/empty'
+ $(MAKE) -f common.mk '$(call SHESCAPE,$(BUILDDIR))/linker.ld'
$(LD_FOR_TARGET) '$(call OBJESCAPE,$^)' $(LDFLAGS_FOR_TARGET) -T'$(call SHESCAPE,$(BUILDDIR))/linker.ld' -o '$(call SHESCAPE,$@)'
$(OBJCOPY_FOR_TARGET) -O binary --only-section=.note.gnu.build-id '$(call SHESCAPE,$@)' '$(call SHESCAPE,$(BUILDDIR))/build-id.s2.bin'
cd '$(call SHESCAPE,$(BUILDDIR))' && \
@@ -405,7 +405,7 @@ $(call MKESCAPE,$(BUILDDIR))/linker_nomap.ld: linker_uefi_x86_64.ld.in
$(CC_FOR_TARGET) -x c -E -P -undef -DLINKER_NOMAP linker_uefi_x86_64.ld.in -o '$(call SHESCAPE,$(BUILDDIR))/linker_nomap.ld'
$(call MKESCAPE,$(BUILDDIR))/limine_nomap.elf: $(call MKESCAPE,$(BUILDDIR))/limine-efi/src/crt0-efi-x86_64.S.o $(call MKESCAPE,$(BUILDDIR))/limine-efi/src/reloc_x86_64.c.o $(OBJ)
- $(MAKE) -f '$(call SHESCAPE,$(SRCDIR))/common.mk' '$(call SHESCAPE,$(BUILDDIR))/linker_nomap.ld'
+ $(MAKE) -f common.mk '$(call SHESCAPE,$(BUILDDIR))/linker_nomap.ld'
$(LD_FOR_TARGET) \
-T'$(call SHESCAPE,$(BUILDDIR))/linker_nomap.ld' \
'$(call OBJESCAPE,$^)' $(LDFLAGS_FOR_TARGET) -o '$(call SHESCAPE,$@)'
@@ -415,7 +415,7 @@ $(call MKESCAPE,$(BUILDDIR))/linker.ld: linker_uefi_x86_64.ld.in
$(CC_FOR_TARGET) -x c -E -P -undef linker_uefi_x86_64.ld.in -o '$(call SHESCAPE,$(BUILDDIR))/linker.ld'
$(call MKESCAPE,$(BUILDDIR))/limine.elf: $(call MKESCAPE,$(BUILDDIR))/limine-efi/src/crt0-efi-x86_64.S.o $(call MKESCAPE,$(BUILDDIR))/limine-efi/src/reloc_x86_64.c.o $(OBJ) $(call MKESCAPE,$(BUILDDIR))/full.map.o
- $(MAKE) -f '$(call SHESCAPE,$(SRCDIR))/common.mk' '$(call SHESCAPE,$(BUILDDIR))/linker.ld'
+ $(MAKE) -f common.mk '$(call SHESCAPE,$(BUILDDIR))/linker.ld'
$(LD_FOR_TARGET) \
-T'$(call SHESCAPE,$(BUILDDIR))/linker.ld' \
'$(call OBJESCAPE,$^)' $(LDFLAGS_FOR_TARGET) -o '$(call SHESCAPE,$@)'
@@ -452,7 +452,7 @@ $(call MKESCAPE,$(BUILDDIR))/linker_nomap.ld: linker_uefi_aarch64.ld.in
$(CC_FOR_TARGET) -x c -E -P -undef -DLINKER_NOMAP linker_uefi_aarch64.ld.in -o '$(call SHESCAPE,$(BUILDDIR))/linker_nomap.ld'
$(call MKESCAPE,$(BUILDDIR))/limine_nomap.elf: $(call MKESCAPE,$(BUILDDIR))/limine-efi/src/crt0-efi-aarch64.S.o $(call MKESCAPE,$(BUILDDIR))/limine-efi/src/reloc_aarch64.c.o $(OBJ)
- $(MAKE) -f '$(call SHESCAPE,$(SRCDIR))/common.mk' '$(call SHESCAPE,$(BUILDDIR))/linker_nomap.ld'
+ $(MAKE) -f common.mk '$(call SHESCAPE,$(BUILDDIR))/linker_nomap.ld'
$(LD_FOR_TARGET) \
-T'$(call SHESCAPE,$(BUILDDIR))/linker_nomap.ld' \
'$(call OBJESCAPE,$^)' $(LDFLAGS_FOR_TARGET) -o '$(call SHESCAPE,$@)'
@@ -462,7 +462,7 @@ $(call MKESCAPE,$(BUILDDIR))/linker.ld: linker_uefi_aarch64.ld.in
$(CC_FOR_TARGET) -x c -E -P -undef linker_uefi_aarch64.ld.in -o '$(call SHESCAPE,$(BUILDDIR))/linker.ld'
$(call MKESCAPE,$(BUILDDIR))/limine.elf: $(call MKESCAPE,$(BUILDDIR))/limine-efi/src/crt0-efi-aarch64.S.o $(call MKESCAPE,$(BUILDDIR))/limine-efi/src/reloc_aarch64.c.o $(OBJ) $(call MKESCAPE,$(BUILDDIR))/full.map.o
- $(MAKE) -f '$(call SHESCAPE,$(SRCDIR))/common.mk' '$(call SHESCAPE,$(BUILDDIR))/linker.ld'
+ $(MAKE) -f common.mk '$(call SHESCAPE,$(BUILDDIR))/linker.ld'
$(LD_FOR_TARGET) \
-T'$(call SHESCAPE,$(BUILDDIR))/linker.ld' \
'$(call OBJESCAPE,$^)' $(LDFLAGS_FOR_TARGET) -o '$(call SHESCAPE,$@)'
@@ -498,7 +498,7 @@ $(call MKESCAPE,$(BUILDDIR))/linker_nomap.ld: linker_uefi_riscv64.ld.in
$(CC_FOR_TARGET) -x c -E -P -undef -DLINKER_NOMAP linker_uefi_riscv64.ld.in -o '$(call SHESCAPE,$(BUILDDIR))/linker_nomap.ld'
$(call MKESCAPE,$(BUILDDIR))/limine_nomap.elf: $(call MKESCAPE,$(BUILDDIR))/limine-efi/src/crt0-efi-riscv64.S.o $(call MKESCAPE,$(BUILDDIR))/limine-efi/src/reloc_riscv64.c.o $(OBJ)
- $(MAKE) -f '$(call SHESCAPE,$(SRCDIR))/common.mk' '$(call SHESCAPE,$(BUILDDIR))/linker_nomap.ld'
+ $(MAKE) -f common.mk '$(call SHESCAPE,$(BUILDDIR))/linker_nomap.ld'
$(LD_FOR_TARGET) \
-T'$(call SHESCAPE,$(BUILDDIR))/linker_nomap.ld' \
'$(call OBJESCAPE,$^)' $(LDFLAGS_FOR_TARGET) -o '$(call SHESCAPE,$@)'
@@ -508,7 +508,7 @@ $(call MKESCAPE,$(BUILDDIR))/linker.ld: linker_uefi_riscv64.ld.in
$(CC_FOR_TARGET) -x c -E -P -undef linker_uefi_riscv64.ld.in -o '$(call SHESCAPE,$(BUILDDIR))/linker.ld'
$(call MKESCAPE,$(BUILDDIR))/limine.elf: $(call MKESCAPE,$(BUILDDIR))/limine-efi/src/crt0-efi-riscv64.S.o $(call MKESCAPE,$(BUILDDIR))/limine-efi/src/reloc_riscv64.c.o $(OBJ) $(call MKESCAPE,$(BUILDDIR))/full.map.o
- $(MAKE) -f '$(call SHESCAPE,$(SRCDIR))/common.mk' '$(call SHESCAPE,$(BUILDDIR))/linker.ld'
+ $(MAKE) -f common.mk '$(call SHESCAPE,$(BUILDDIR))/linker.ld'
$(LD_FOR_TARGET) \
-T'$(call SHESCAPE,$(BUILDDIR))/linker.ld' \
'$(call OBJESCAPE,$^)' $(LDFLAGS_FOR_TARGET) -o '$(call SHESCAPE,$@)'
@@ -544,7 +544,7 @@ $(call MKESCAPE,$(BUILDDIR))/linker_nomap.ld: linker_uefi_loongarch64.ld.in
$(CC_FOR_TARGET) -x c -E -P -undef -DLINKER_NOMAP linker_uefi_loongarch64.ld.in -o '$(call SHESCAPE,$(BUILDDIR))/linker_nomap.ld'
$(call MKESCAPE,$(BUILDDIR))/limine_nomap.elf: $(call MKESCAPE,$(BUILDDIR))/limine-efi/src/crt0-efi-loongarch64.S.o $(call MKESCAPE,$(BUILDDIR))/limine-efi/src/reloc_loongarch64.c.o $(OBJ)
- $(MAKE) -f '$(call SHESCAPE,$(SRCDIR))/common.mk' '$(call SHESCAPE,$(BUILDDIR))/linker_nomap.ld'
+ $(MAKE) -f common.mk '$(call SHESCAPE,$(BUILDDIR))/linker_nomap.ld'
$(LD_FOR_TARGET) \
-T'$(call SHESCAPE,$(BUILDDIR))/linker_nomap.ld' \
'$(call OBJESCAPE,$^)' $(LDFLAGS_FOR_TARGET) -o '$(call SHESCAPE,$@)'
@@ -554,7 +554,7 @@ $(call MKESCAPE,$(BUILDDIR))/linker.ld: linker_uefi_loongarch64.ld.in
$(CC_FOR_TARGET) -x c -E -P -undef linker_uefi_loongarch64.ld.in -o '$(call SHESCAPE,$(BUILDDIR))/linker.ld'
$(call MKESCAPE,$(BUILDDIR))/limine.elf: $(call MKESCAPE,$(BUILDDIR))/limine-efi/src/crt0-efi-loongarch64.S.o $(call MKESCAPE,$(BUILDDIR))/limine-efi/src/reloc_loongarch64.c.o $(OBJ) $(call MKESCAPE,$(BUILDDIR))/full.map.o
- $(MAKE) -f '$(call SHESCAPE,$(SRCDIR))/common.mk' '$(call SHESCAPE,$(BUILDDIR))/linker.ld'
+ $(MAKE) -f common.mk '$(call SHESCAPE,$(BUILDDIR))/linker.ld'
$(LD_FOR_TARGET) \
-T'$(call SHESCAPE,$(BUILDDIR))/linker.ld' \
'$(call OBJESCAPE,$^)' $(LDFLAGS_FOR_TARGET) -o '$(call SHESCAPE,$@)'
@@ -590,7 +590,7 @@ $(call MKESCAPE,$(BUILDDIR))/linker_nomap.ld: linker_uefi_ia32.ld.in
$(CC_FOR_TARGET) -x c -E -P -undef -DLINKER_NOMAP linker_uefi_ia32.ld.in -o '$(call SHESCAPE,$(BUILDDIR))/linker_nomap.ld'
$(call MKESCAPE,$(BUILDDIR))/limine_nomap.elf: $(call MKESCAPE,$(BUILDDIR))/limine-efi/src/crt0-efi-ia32.S.o $(call MKESCAPE,$(BUILDDIR))/limine-efi/src/reloc_ia32.c.o $(OBJ)
- $(MAKE) -f '$(call SHESCAPE,$(SRCDIR))/common.mk' '$(call SHESCAPE,$(BUILDDIR))/linker_nomap.ld'
+ $(MAKE) -f common.mk '$(call SHESCAPE,$(BUILDDIR))/linker_nomap.ld'
$(LD_FOR_TARGET) \
-T'$(call SHESCAPE,$(BUILDDIR))/linker_nomap.ld' \
'$(call OBJESCAPE,$^)' $(LDFLAGS_FOR_TARGET) -o '$(call SHESCAPE,$@)'
@@ -600,7 +600,7 @@ $(call MKESCAPE,$(BUILDDIR))/linker.ld: linker_uefi_ia32.ld.in
$(CC_FOR_TARGET) -x c -E -P -undef linker_uefi_ia32.ld.in -o '$(call SHESCAPE,$(BUILDDIR))/linker.ld'
$(call MKESCAPE,$(BUILDDIR))/limine.elf: $(call MKESCAPE,$(BUILDDIR))/limine-efi/src/crt0-efi-ia32.S.o $(call MKESCAPE,$(BUILDDIR))/limine-efi/src/reloc_ia32.c.o $(OBJ) $(call MKESCAPE,$(BUILDDIR))/full.map.o
- $(MAKE) -f '$(call SHESCAPE,$(SRCDIR))/common.mk' '$(call SHESCAPE,$(BUILDDIR))/linker.ld'
+ $(MAKE) -f common.mk '$(call SHESCAPE,$(BUILDDIR))/linker.ld'
$(LD_FOR_TARGET) \
-T'$(call SHESCAPE,$(BUILDDIR))/linker.ld' \
'$(call OBJESCAPE,$^)' $(LDFLAGS_FOR_TARGET) -o '$(call SHESCAPE,$@)'
