:: commit 470e6a6fce1d24ef318616671240bace6efdb1e2

mintsuki <mintsuki@protonmail.com> — 2022-08-27 03:09

parents: abbfb0c765

build: Pretty up find calls

diff --git a/common/GNUmakefile b/common/GNUmakefile
index 1d519e3d..301f6524 100644
--- a/common/GNUmakefile
+++ b/common/GNUmakefile
@@ -143,26 +143,26 @@ ifeq ($(TARGET),uefi-ia32)
         -ztext
 endif
 
-override C_FILES := $(shell find ./ -type f -name '*.c')
+override C_FILES := $(shell find . -type f -name '*.c')
 ifeq ($(TARGET),bios)
-    override ASMX86_FILES := $(shell find ./ -type f -name '*.asm_x86')
-    override ASM32_FILES := $(shell find ./ -type f -name '*.asm_ia32')
-    override ASMB_FILES := $(shell find ./ -type f -name '*.asm_bios_ia32')
+    override ASMX86_FILES := $(shell find . -type f -name '*.asm_x86')
+    override ASM32_FILES := $(shell find . -type f -name '*.asm_ia32')
+    override ASMB_FILES := $(shell find . -type f -name '*.asm_bios_ia32')
 
     override OBJ := $(addprefix $(call MKESCAPE,$(BUILDDIR))/, $(C_FILES:.c=.o) $(ASM32_FILES:.asm_ia32=.o) $(ASMB_FILES:.asm_bios_ia32=.o) $(ASMX86_FILES:.asm_x86=.o))
     override OBJ_S2 := $(filter %.s2.o,$(OBJ))
 endif
 ifeq ($(TARGET),uefi-x86-64)
-    override ASMX86_FILES := $(shell find ./ -type f -name '*.asm_x86')
-    override ASM64_FILES := $(shell find ./ -type f -name '*.asm_x86_64')
-    override ASM64U_FILES := $(shell find ./ -type f -name '*.asm_uefi_x86_64')
+    override ASMX86_FILES := $(shell find . -type f -name '*.asm_x86')
+    override ASM64_FILES := $(shell find . -type f -name '*.asm_x86_64')
+    override ASM64U_FILES := $(shell find . -type f -name '*.asm_uefi_x86_64')
 
     override OBJ := $(addprefix $(call MKESCAPE,$(BUILDDIR))/, $(C_FILES:.c=.o) $(ASM64_FILES:.asm_x86_64=.o) $(ASM64U_FILES:.asm_uefi_x86_64=.o) $(ASMX86_FILES:.asm_x86=.o))
 endif
 ifeq ($(TARGET),uefi-ia32)
-    override ASMX86_FILES := $(shell find ./ -type f -name '*.asm_x86')
-    override ASM32_FILES := $(shell find ./ -type f -name '*.asm_ia32')
-    override ASM32U_FILES := $(shell find ./ -type f -name '*.asm_uefi_ia32')
+    override ASMX86_FILES := $(shell find . -type f -name '*.asm_x86')
+    override ASM32_FILES := $(shell find . -type f -name '*.asm_ia32')
+    override ASM32U_FILES := $(shell find . -type f -name '*.asm_uefi_ia32')
 
     override OBJ := $(addprefix $(call MKESCAPE,$(BUILDDIR))/, $(C_FILES:.c=.o) $(ASM32_FILES:.asm_ia32=.o) $(ASM32U_FILES:.asm_uefi_ia32=.o) $(ASMX86_FILES:.asm_x86=.o))
 endif
diff --git a/decompressor/GNUmakefile b/decompressor/GNUmakefile
index d33752e6..73ddd20b 100644
--- a/decompressor/GNUmakefile
+++ b/decompressor/GNUmakefile
@@ -51,8 +51,8 @@ ifneq ($(CROSS_LD_NO_PIE_BUG),1)
     override CROSS_LDFLAGS += -no-pie
 endif
 
-override C_FILES := $(shell find ./ -type f -name '*.c')
-override ASM_FILES := $(shell find ./ -type f -name '*.asm')
+override C_FILES := $(shell find . -type f -name '*.c')
+override ASM_FILES := $(shell find . -type f -name '*.asm')
 override OBJ := $(addprefix $(call MKESCAPE,$(BUILDDIR))/, $(ASM_FILES:.asm=.o) $(C_FILES:.c=.o))
 override HEADER_DEPS := $(addprefix $(call MKESCAPE,$(BUILDDIR))/, $(C_FILES:.c=.d))
 
tab: 248 wrap: offon