diff --git a/build/systemMenu_RED/DS_DownloadPlay/banner/Makefile b/build/systemMenu_RED/DS_DownloadPlay/banner/Makefile index 1f8aa1d4..e373c033 100644 --- a/build/systemMenu_RED/DS_DownloadPlay/banner/Makefile +++ b/build/systemMenu_RED/DS_DownloadPlay/banner/Makefile @@ -28,11 +28,10 @@ INSTALL_DIR = ./ INSTALL_TARGETS = $(TARGETS) BANNER_ICON_NAME = $(basename $(BANNER_ICON)) +BANNER_ICON_MIDDLE = $(addprefix $(BANNER_ICON_NAME), .nbfs .nbfc .nbfp) LDIRT_CLEAN = $(TARGETS) \ - $(BANNER_ICON_NAME).nbfs \ - $(BANNER_ICON_NAME).nbfc \ - $(BANNER_ICON_NAME).nbfp \ + $(BANNER_ICON_MIDDLE) \ $(TARGETS:.bnr=.srl) include $(TWL_IPL_RED_ROOT)/build/buildtools/modulerules @@ -42,8 +41,7 @@ include $(TWL_IPL_RED_ROOT)/build/buildtools/modulerules #---------------------------------------------------------------------------- do-build: $(TARGETS) -$(TARGETS): $(BANNER_SPEC) $(BANNER_ICON) - $(NTEXCONV) -no -bg -bgb -bgnc $(BANNER_ICON) >/dev/null && \ +$(TARGETS): $(BANNER_SPEC) $(BANNER_ICON) $(BANNER_ICON_MIDDLE) $(MAKEBANNER) -N $(BANNER_ICON_NAME) $(BANNER_SPEC) $(TARGETS) # diff --git a/build/systemMenu_RED/Launcher/banner/Makefile b/build/systemMenu_RED/Launcher/banner/Makefile index 1f8aa1d4..e373c033 100644 --- a/build/systemMenu_RED/Launcher/banner/Makefile +++ b/build/systemMenu_RED/Launcher/banner/Makefile @@ -28,11 +28,10 @@ INSTALL_DIR = ./ INSTALL_TARGETS = $(TARGETS) BANNER_ICON_NAME = $(basename $(BANNER_ICON)) +BANNER_ICON_MIDDLE = $(addprefix $(BANNER_ICON_NAME), .nbfs .nbfc .nbfp) LDIRT_CLEAN = $(TARGETS) \ - $(BANNER_ICON_NAME).nbfs \ - $(BANNER_ICON_NAME).nbfc \ - $(BANNER_ICON_NAME).nbfp \ + $(BANNER_ICON_MIDDLE) \ $(TARGETS:.bnr=.srl) include $(TWL_IPL_RED_ROOT)/build/buildtools/modulerules @@ -42,8 +41,7 @@ include $(TWL_IPL_RED_ROOT)/build/buildtools/modulerules #---------------------------------------------------------------------------- do-build: $(TARGETS) -$(TARGETS): $(BANNER_SPEC) $(BANNER_ICON) - $(NTEXCONV) -no -bg -bgb -bgnc $(BANNER_ICON) >/dev/null && \ +$(TARGETS): $(BANNER_SPEC) $(BANNER_ICON) $(BANNER_ICON_MIDDLE) $(MAKEBANNER) -N $(BANNER_ICON_NAME) $(BANNER_SPEC) $(TARGETS) # diff --git a/build/systemMenu_RED/MachineSettings/banner/Makefile b/build/systemMenu_RED/MachineSettings/banner/Makefile index 1f8aa1d4..e373c033 100644 --- a/build/systemMenu_RED/MachineSettings/banner/Makefile +++ b/build/systemMenu_RED/MachineSettings/banner/Makefile @@ -28,11 +28,10 @@ INSTALL_DIR = ./ INSTALL_TARGETS = $(TARGETS) BANNER_ICON_NAME = $(basename $(BANNER_ICON)) +BANNER_ICON_MIDDLE = $(addprefix $(BANNER_ICON_NAME), .nbfs .nbfc .nbfp) LDIRT_CLEAN = $(TARGETS) \ - $(BANNER_ICON_NAME).nbfs \ - $(BANNER_ICON_NAME).nbfc \ - $(BANNER_ICON_NAME).nbfp \ + $(BANNER_ICON_MIDDLE) \ $(TARGETS:.bnr=.srl) include $(TWL_IPL_RED_ROOT)/build/buildtools/modulerules @@ -42,8 +41,7 @@ include $(TWL_IPL_RED_ROOT)/build/buildtools/modulerules #---------------------------------------------------------------------------- do-build: $(TARGETS) -$(TARGETS): $(BANNER_SPEC) $(BANNER_ICON) - $(NTEXCONV) -no -bg -bgb -bgnc $(BANNER_ICON) >/dev/null && \ +$(TARGETS): $(BANNER_SPEC) $(BANNER_ICON) $(BANNER_ICON_MIDDLE) $(MAKEBANNER) -N $(BANNER_ICON_NAME) $(BANNER_SPEC) $(TARGETS) # diff --git a/build/systemMenu_tools/HWInfoWriter/banner/Makefile b/build/systemMenu_tools/HWInfoWriter/banner/Makefile index 1f8aa1d4..e373c033 100644 --- a/build/systemMenu_tools/HWInfoWriter/banner/Makefile +++ b/build/systemMenu_tools/HWInfoWriter/banner/Makefile @@ -28,11 +28,10 @@ INSTALL_DIR = ./ INSTALL_TARGETS = $(TARGETS) BANNER_ICON_NAME = $(basename $(BANNER_ICON)) +BANNER_ICON_MIDDLE = $(addprefix $(BANNER_ICON_NAME), .nbfs .nbfc .nbfp) LDIRT_CLEAN = $(TARGETS) \ - $(BANNER_ICON_NAME).nbfs \ - $(BANNER_ICON_NAME).nbfc \ - $(BANNER_ICON_NAME).nbfp \ + $(BANNER_ICON_MIDDLE) \ $(TARGETS:.bnr=.srl) include $(TWL_IPL_RED_ROOT)/build/buildtools/modulerules @@ -42,8 +41,7 @@ include $(TWL_IPL_RED_ROOT)/build/buildtools/modulerules #---------------------------------------------------------------------------- do-build: $(TARGETS) -$(TARGETS): $(BANNER_SPEC) $(BANNER_ICON) - $(NTEXCONV) -no -bg -bgb -bgnc $(BANNER_ICON) >/dev/null && \ +$(TARGETS): $(BANNER_SPEC) $(BANNER_ICON) $(BANNER_ICON_MIDDLE) $(MAKEBANNER) -N $(BANNER_ICON_NAME) $(BANNER_SPEC) $(TARGETS) # diff --git a/build/systemMenu_tools/NandInitializer/banner/Makefile b/build/systemMenu_tools/NandInitializer/banner/Makefile index 1f8aa1d4..e373c033 100644 --- a/build/systemMenu_tools/NandInitializer/banner/Makefile +++ b/build/systemMenu_tools/NandInitializer/banner/Makefile @@ -28,11 +28,10 @@ INSTALL_DIR = ./ INSTALL_TARGETS = $(TARGETS) BANNER_ICON_NAME = $(basename $(BANNER_ICON)) +BANNER_ICON_MIDDLE = $(addprefix $(BANNER_ICON_NAME), .nbfs .nbfc .nbfp) LDIRT_CLEAN = $(TARGETS) \ - $(BANNER_ICON_NAME).nbfs \ - $(BANNER_ICON_NAME).nbfc \ - $(BANNER_ICON_NAME).nbfp \ + $(BANNER_ICON_MIDDLE) \ $(TARGETS:.bnr=.srl) include $(TWL_IPL_RED_ROOT)/build/buildtools/modulerules @@ -42,8 +41,7 @@ include $(TWL_IPL_RED_ROOT)/build/buildtools/modulerules #---------------------------------------------------------------------------- do-build: $(TARGETS) -$(TARGETS): $(BANNER_SPEC) $(BANNER_ICON) - $(NTEXCONV) -no -bg -bgb -bgnc $(BANNER_ICON) >/dev/null && \ +$(TARGETS): $(BANNER_SPEC) $(BANNER_ICON) $(BANNER_ICON_MIDDLE) $(MAKEBANNER) -N $(BANNER_ICON_NAME) $(BANNER_SPEC) $(TARGETS) # diff --git a/build/systemMenu_tools/NandInitializerProduction/banner/Makefile b/build/systemMenu_tools/NandInitializerProduction/banner/Makefile index 1f8aa1d4..e373c033 100644 --- a/build/systemMenu_tools/NandInitializerProduction/banner/Makefile +++ b/build/systemMenu_tools/NandInitializerProduction/banner/Makefile @@ -28,11 +28,10 @@ INSTALL_DIR = ./ INSTALL_TARGETS = $(TARGETS) BANNER_ICON_NAME = $(basename $(BANNER_ICON)) +BANNER_ICON_MIDDLE = $(addprefix $(BANNER_ICON_NAME), .nbfs .nbfc .nbfp) LDIRT_CLEAN = $(TARGETS) \ - $(BANNER_ICON_NAME).nbfs \ - $(BANNER_ICON_NAME).nbfc \ - $(BANNER_ICON_NAME).nbfp \ + $(BANNER_ICON_MIDDLE) \ $(TARGETS:.bnr=.srl) include $(TWL_IPL_RED_ROOT)/build/buildtools/modulerules @@ -42,8 +41,7 @@ include $(TWL_IPL_RED_ROOT)/build/buildtools/modulerules #---------------------------------------------------------------------------- do-build: $(TARGETS) -$(TARGETS): $(BANNER_SPEC) $(BANNER_ICON) - $(NTEXCONV) -no -bg -bgb -bgnc $(BANNER_ICON) >/dev/null && \ +$(TARGETS): $(BANNER_SPEC) $(BANNER_ICON) $(BANNER_ICON_MIDDLE) $(MAKEBANNER) -N $(BANNER_ICON_NAME) $(BANNER_SPEC) $(TARGETS) # diff --git a/build/systemMenu_tools/NandInitializerRed/banner/Makefile b/build/systemMenu_tools/NandInitializerRed/banner/Makefile index 1f8aa1d4..e373c033 100644 --- a/build/systemMenu_tools/NandInitializerRed/banner/Makefile +++ b/build/systemMenu_tools/NandInitializerRed/banner/Makefile @@ -28,11 +28,10 @@ INSTALL_DIR = ./ INSTALL_TARGETS = $(TARGETS) BANNER_ICON_NAME = $(basename $(BANNER_ICON)) +BANNER_ICON_MIDDLE = $(addprefix $(BANNER_ICON_NAME), .nbfs .nbfc .nbfp) LDIRT_CLEAN = $(TARGETS) \ - $(BANNER_ICON_NAME).nbfs \ - $(BANNER_ICON_NAME).nbfc \ - $(BANNER_ICON_NAME).nbfp \ + $(BANNER_ICON_MIDDLE) \ $(TARGETS:.bnr=.srl) include $(TWL_IPL_RED_ROOT)/build/buildtools/modulerules @@ -42,8 +41,7 @@ include $(TWL_IPL_RED_ROOT)/build/buildtools/modulerules #---------------------------------------------------------------------------- do-build: $(TARGETS) -$(TARGETS): $(BANNER_SPEC) $(BANNER_ICON) - $(NTEXCONV) -no -bg -bgb -bgnc $(BANNER_ICON) >/dev/null && \ +$(TARGETS): $(BANNER_SPEC) $(BANNER_ICON) $(BANNER_ICON_MIDDLE) $(MAKEBANNER) -N $(BANNER_ICON_NAME) $(BANNER_SPEC) $(TARGETS) # diff --git a/build/systemMenu_tools/SystemUpdater/banner/Makefile b/build/systemMenu_tools/SystemUpdater/banner/Makefile index 1f8aa1d4..e373c033 100644 --- a/build/systemMenu_tools/SystemUpdater/banner/Makefile +++ b/build/systemMenu_tools/SystemUpdater/banner/Makefile @@ -28,11 +28,10 @@ INSTALL_DIR = ./ INSTALL_TARGETS = $(TARGETS) BANNER_ICON_NAME = $(basename $(BANNER_ICON)) +BANNER_ICON_MIDDLE = $(addprefix $(BANNER_ICON_NAME), .nbfs .nbfc .nbfp) LDIRT_CLEAN = $(TARGETS) \ - $(BANNER_ICON_NAME).nbfs \ - $(BANNER_ICON_NAME).nbfc \ - $(BANNER_ICON_NAME).nbfp \ + $(BANNER_ICON_MIDDLE) \ $(TARGETS:.bnr=.srl) include $(TWL_IPL_RED_ROOT)/build/buildtools/modulerules @@ -42,8 +41,7 @@ include $(TWL_IPL_RED_ROOT)/build/buildtools/modulerules #---------------------------------------------------------------------------- do-build: $(TARGETS) -$(TARGETS): $(BANNER_SPEC) $(BANNER_ICON) - $(NTEXCONV) -no -bg -bgb -bgnc $(BANNER_ICON) >/dev/null && \ +$(TARGETS): $(BANNER_SPEC) $(BANNER_ICON) $(BANNER_ICON_MIDDLE) $(MAKEBANNER) -N $(BANNER_ICON_NAME) $(BANNER_SPEC) $(TARGETS) # diff --git a/build/tests/CheckPreloadParameters/banner/Makefile b/build/tests/CheckPreloadParameters/banner/Makefile index 1f8aa1d4..e373c033 100644 --- a/build/tests/CheckPreloadParameters/banner/Makefile +++ b/build/tests/CheckPreloadParameters/banner/Makefile @@ -28,11 +28,10 @@ INSTALL_DIR = ./ INSTALL_TARGETS = $(TARGETS) BANNER_ICON_NAME = $(basename $(BANNER_ICON)) +BANNER_ICON_MIDDLE = $(addprefix $(BANNER_ICON_NAME), .nbfs .nbfc .nbfp) LDIRT_CLEAN = $(TARGETS) \ - $(BANNER_ICON_NAME).nbfs \ - $(BANNER_ICON_NAME).nbfc \ - $(BANNER_ICON_NAME).nbfp \ + $(BANNER_ICON_MIDDLE) \ $(TARGETS:.bnr=.srl) include $(TWL_IPL_RED_ROOT)/build/buildtools/modulerules @@ -42,8 +41,7 @@ include $(TWL_IPL_RED_ROOT)/build/buildtools/modulerules #---------------------------------------------------------------------------- do-build: $(TARGETS) -$(TARGETS): $(BANNER_SPEC) $(BANNER_ICON) - $(NTEXCONV) -no -bg -bgb -bgnc $(BANNER_ICON) >/dev/null && \ +$(TARGETS): $(BANNER_SPEC) $(BANNER_ICON) $(BANNER_ICON_MIDDLE) $(MAKEBANNER) -N $(BANNER_ICON_NAME) $(BANNER_SPEC) $(TARGETS) # diff --git a/build/tests/RelocateChecker/banner/Makefile b/build/tests/RelocateChecker/banner/Makefile index 27b48038..cf9ea411 100644 --- a/build/tests/RelocateChecker/banner/Makefile +++ b/build/tests/RelocateChecker/banner/Makefile @@ -28,11 +28,10 @@ INSTALL_DIR = ./ INSTALL_TARGETS = $(TARGETS) BANNER_ICON_NAME = $(basename $(BANNER_ICON)) +BANNER_ICON_MIDDLE = $(addprefix $(BANNER_ICON_NAME), .nbfs .nbfc .nbfp) LDIRT_CLEAN = $(TARGETS) \ - $(BANNER_ICON_NAME).nbfs \ - $(BANNER_ICON_NAME).nbfc \ - $(BANNER_ICON_NAME).nbfp \ + $(BANNER_ICON_MIDDLE) \ $(TARGETS:.bnr=.srl) include $(TWL_IPL_RED_ROOT)/build/buildtools/modulerules @@ -42,8 +41,7 @@ include $(TWL_IPL_RED_ROOT)/build/buildtools/modulerules #---------------------------------------------------------------------------- do-build: $(TARGETS) -$(TARGETS): $(BANNER_SPEC) $(BANNER_ICON) - $(NTEXCONV) -no -bg -bgb -bgnc $(BANNER_ICON) >/dev/null && \ +$(TARGETS): $(BANNER_SPEC) $(BANNER_ICON) $(BANNER_ICON_MIDDLE) $(MAKEBANNER) -d -N $(BANNER_ICON_NAME) $(BANNER_SPEC) $(TARGETS) #