From cb29f5945766acdde8b765a60a6f96bd7cddfc42 Mon Sep 17 00:00:00 2001
From: jief666 <github.com@jfa.knudsen.ovh>
Date: Mon, 9 Nov 2020 16:05:03 +0300
Subject: [PATCH] build_rule.template : echo before the compilation step.

---
 BaseTools/Conf/build_rule.template | 104 +++++++++++++++--------------
 1 file changed, 54 insertions(+), 50 deletions(-)

diff --git a/BaseTools/Conf/build_rule.template b/BaseTools/Conf/build_rule.template
index 1c22352e5..f6bf230f0 100644
--- a/BaseTools/Conf/build_rule.template
+++ b/BaseTools/Conf/build_rule.template
@@ -119,17 +119,17 @@
         $(OUTPUT_DIR)(+)${s_dir}(+)${s_base}.obj
 
     <Command.MSFT, Command.INTEL>
-        $(AT)"$(CC)" /Fo${dst} $(CC_FLAGS) $(INC) ${src}
         @"echo" [CPP] ${s_base}
+        $(AT)"$(CC)" /Fo${dst} $(CC_FLAGS) $(INC) ${src}
 
     <Command.GCC, Command.RVCT>
+        @"echo" [CPP] ${s_base}
         # For RVCTCYGWIN CC_FLAGS must be first to work around pathing issues
         $(AT)"$(CC)" $(CXX_FLAGS) -c -o ${dst} $(INC) ${src}
-        @"echo" [CPP] ${s_base}
 
     <Command.XCODE>
-        $(AT)"$(CC)" $(CC_FLAGS) -o ${dst} $(INC) ${src}
         @"echo" [CPP] ${s_base}
+        $(AT)"$(CC)" $(CC_FLAGS) -o ${dst} $(INC) ${src}
 
 [C-Code-File]
     <InputFile>
@@ -145,17 +145,17 @@
         $(OUTPUT_DIR)(+)${s_dir}(+)${s_base}.obj
 
     <Command.MSFT, Command.INTEL>
-        $(AT)"$(CC)" /Fo${dst} $(CC_FLAGS) $(INC) ${src}
         @"echo" [CPP] ${s_base}
+        $(AT)"$(CC)" /Fo${dst} $(CC_FLAGS) $(INC) ${src}
 
     <Command.GCC, Command.RVCT>
+        @"echo" [CC] ${s_base}
         # For RVCTCYGWIN CC_FLAGS must be first to work around pathing issues
         $(AT)"$(CC)" $(CC_FLAGS) -c -o ${dst} $(INC) ${src}
-        @"echo" [CC] ${s_base}
 
     <Command.XCODE>
-        $(AT)"$(CC)" $(CC_FLAGS) -o ${dst} $(INC) ${src}
         @"echo" [CC] ${s_base}
+        $(AT)"$(CC)" $(CC_FLAGS) -o ${dst} $(INC) ${src}
 
 [C-Code-File.BASE.AARCH64,C-Code-File.SEC.AARCH64,C-Code-File.PEI_CORE.AARCH64,C-Code-File.PEIM.AARCH64,C-Code-File.BASE.ARM,C-Code-File.SEC.ARM,C-Code-File.PEI_CORE.ARM,C-Code-File.PEIM.ARM]
     <InputFile>
@@ -168,6 +168,7 @@
         $(OUTPUT_DIR)(+)${s_dir}(+)${s_base}.obj
 
     <Command.GCC, Command.RVCT>
+        @"echo" [CC] ${s_base}
         $(AT)"$(CC)" $(CC_FLAGS) $(CC_XIPFLAGS) -c -o ${dst} $(INC) ${src}
 
 [C-Header-File]
@@ -192,18 +193,18 @@
         $(OUTPUT_DIR)(+)${s_dir}(+)${s_base}.obj
 
     <Command.MSFT, Command.INTEL>
+        @"echo" [ASM] ${s_base}
         $(AT)"$(PP)" $(PP_FLAGS) $(INC) ${src} > ${d_path}(+)${s_base}.i
         $(AT)Trim --source-code --convert-hex --trim-long -o ${d_path}(+)${s_base}.iii ${d_path}(+)${s_base}.i
         $(AT)"$(ASM)" /Fo${dst} $(ASM_FLAGS) /I${s_path} $(INC) ${d_path}(+)${s_base}.iii
-        @"echo" [ASM] ${s_base}
 
     <Command.GCC, Command.RVCT>
+        @"echo" [ASM] ${s_base}
         $(AT)"$(PP)" $(PP_FLAGS) $(INC) ${src} > ${d_path}(+)${s_base}.i
         $(AT)Trim --source-code -o ${d_path}(+)${s_base}.iii ${d_path}(+)${s_base}.i
         #--trim-long
         # For RVCTCYGWIN ASM_FLAGS must be first to work around pathing issues
         $(AT)"$(ASM)" $(ASM_FLAGS) -o ${dst} $(INC) ${d_path}(+)${s_base}.iii
-        @"echo" [ASM] ${s_base}
 
 [Assembly-Code-File.COMMON.ARM,Assembly-Code-File.COMMON.AARCH64]
     # Remove --convert-hex for ARM as it breaks MSFT assemblers
@@ -220,23 +221,23 @@
         $(OUTPUT_DIR)(+)${s_dir}(+)${s_base}.obj
 
     <Command.INTEL>
+        @"echo" [ASM] ${s_base}
         $(AT)"$(PP)" $(PP_FLAGS) $(INC) ${src} > ${d_path}(+)${s_base}.i
         $(AT)Trim --source-code --convert-hex --trim-long -o ${d_path}(+)${s_base}.iii ${d_path}(+)${s_base}.i
         $(AT)"$(ASM)" /Fo${dst} $(ASM_FLAGS) /I${s_path} $(INC) ${d_path}(+)${s_base}.iii
-        @"echo" [ASM] ${s_base}
 
     <Command.MSFT>
+        @"echo" [ASM] ${s_base}
         $(AT)"$(PP)" $(PP_FLAGS) $(INC) ${src} > ${d_path}(+)${s_base}.i
         $(AT)Trim --source-code --trim-long -o ${d_path}(+)${s_base}.iii ${d_path}(+)${s_base}.i
         $(AT)"$(ASM)" /Fo${dst} $(ASM_FLAGS) /I${s_path} $(INC) ${d_path}(+)${s_base}.iii
-        @"echo" [ASM] ${s_base}
 
     <Command.GCC, Command.RVCT>
+        @"echo" [ASM] ${s_base}
         $(AT)"$(PP)" $(PP_FLAGS) $(INC) ${src} > ${d_path}(+)${s_base}.i
         $(AT)Trim --trim-long --source-code -o ${d_path}(+)${s_base}.iii ${d_path}(+)${s_base}.i
         # For RVCTCYGWIN ASM_FLAGS must be first to work around pathing issues
         $(AT)"$(ASM)" $(ASM_FLAGS) -o ${dst} $(INC) ${d_path}(+)${s_base}.iii
-        @"echo" [ASM] ${s_base}
 
 [Nasm-Assembly-Code-File.COMMON.COMMON]
     <InputFile>
@@ -249,10 +250,10 @@
         $(OUTPUT_DIR)(+)${s_dir}(+)${s_base}.obj
 
     <Command>
+        @"echo" [NASM] ${s_base}
         $(AT)"$(PP)" $(PP_FLAGS) $(INC) ${src} > ${d_path}(+)${s_base}.i
         $(AT)Trim --trim-long --source-code -o ${d_path}(+)${s_base}.iii ${d_path}(+)${s_base}.i
         $(AT)"$(NASM)" -I${s_path}(+) $(NASM_INC) $(NASM_FLAGS) -o $dst ${d_path}(+)${s_base}.iii
-        @"echo" [NASM] ${s_base}
 
 [Device-Tree-Source-File]
     <InputFile>
@@ -265,9 +266,9 @@
         $(OUTPUT_DIR)(+)${s_dir}(+)${s_base}.dtb
 
     <Command.GCC>
+        @"echo" [DTC] ${s_base}
         $(AT)"$(DTCPP)" $(DTCPP_FLAGS) $(INC) ${src} > ${d_path}(+)${s_base}.i
         $(AT)"$(DTC)" $(DTC_FLAGS) -I dts -O dtb -o ${dst} ${d_path}(+)${s_base}.i
-        @"echo" [DTC] ${s_base}
 
 [Visual-Form-Representation-File]
     <InputFile>
@@ -282,9 +283,9 @@
         $(DEBUG_DIR)(+)${s_dir}(+)${s_base}.c
 
     <Command>
+        @"echo" [VFR] $(MODULE_NAME)
         $(AT)"$(VFRPP)" $(VFRPP_FLAGS) $(INC) ${src} > $(OUTPUT_DIR)(+)${s_base}.i
         $(AT)"$(VFR)" $(VFR_FLAGS) --string-db $(OUTPUT_DIR)(+)$(MODULE_NAME)StrDefs.hpk --output-directory ${d_path} $(OUTPUT_DIR)(+)${s_base}.i
-        @"echo" [VFR] $(MODULE_NAME)
 
 [Object-File]
     <InputFile>
@@ -295,26 +296,26 @@
         $(OUTPUT_DIR)(+)$(MODULE_NAME).lib
 
     <Command.MSFT, Command.INTEL>
-        $(AT)"$(SLINK)" $(SLINK_FLAGS) /OUT:${dst} @$(OBJECT_FILES_LIST)
         @"echo" [SLINK] $(MODULE_NAME)
+        $(AT)"$(SLINK)" $(SLINK_FLAGS) /OUT:${dst} @$(OBJECT_FILES_LIST)
 
     <Command.GCC>
+        @"echo" [SLINK] $(MODULE_NAME)
         $(AT)$(RM) ${dst}
         $(AT)"$(SLINK)" -cr ${dst} $(SLINK_FLAGS) @$(OBJECT_FILES_LIST)
-        @"echo" [SLINK] $(MODULE_NAME)
     
     <Command.RVCT>
-        $(AT)"$(SLINK)" $(SLINK_FLAGS) ${dst} --via $(OBJECT_FILES_LIST)
         @"echo" [SLINK] $(MODULE_NAME)
+        $(AT)"$(SLINK)" $(SLINK_FLAGS) ${dst} --via $(OBJECT_FILES_LIST)
     
     <Command.RVCTCYGWIN>
+        @"echo" [SLINK] $(MODULE_NAME)
         # $(OBJECT_FILES_LIST) has wrong paths for cygwin
         $(AT)"$(SLINK)" $(SLINK_FLAGS) ${dst} $(OBJECT_FILES)
-        @"echo" [SLINK] $(MODULE_NAME)
 
     <Command.XCODE>
-        $(AT)"$(SLINK)" $(SLINK_FLAGS) ${dst} -filelist $(OBJECT_FILES_LIST)
         @"echo" [SLINK] $(MODULE_NAME)
+        $(AT)"$(SLINK)" $(SLINK_FLAGS) ${dst} -filelist $(OBJECT_FILES_LIST)
 
 [Static-Library-File]
     <InputFile>
@@ -327,27 +328,27 @@
         $(DEBUG_DIR)(+)$(MODULE_NAME).dll
 
     <Command.MSFT, Command.INTEL>
+        @"echo" [DLINK] $(MODULE_NAME)
         $(AT)"$(DLINK)" /OUT:${dst} $(DLINK_FLAGS) $(DLINK2_FLAGS) $(DLINK_SPATH) @$(STATIC_LIBRARY_FILES_LIST)
         $(AT)"$(DLINK)" /OUT:${dst} $(DLINK_FLAGS) $(DLINK_SPATH) @$(STATIC_LIBRARY_FILES_LIST)
-        @"echo" [DLINK] $(MODULE_NAME)
 
     <Command.GCC>
+        @"echo" [DLINK] $(MODULE_NAME)
         $(AT)"$(DLINK)" -o ${dst} $(DLINK_FLAGS) $(GCCLINK_PREFIX)--start-group  $(DLINK_SPATH) @$(STATIC_LIBRARY_FILES_LIST) $(GCCLINK_PREFIX)--end-group $(DLINK2_FLAGS)
         $(AT)"$(OBJCOPY)" $(OBJCOPY_FLAGS) ${dst}
-        @"echo" [DLINK] $(MODULE_NAME)
 
     <Command.RVCT>
-        $(AT)"$(DLINK)" $(DLINK_FLAGS) -o ${dst} $(DLINK_SPATH) --via $(STATIC_LIBRARY_FILES_LIST) $(DLINK2_FLAGS)
         @"echo" [DLINK] $(MODULE_NAME)
+        $(AT)"$(DLINK)" $(DLINK_FLAGS) -o ${dst} $(DLINK_SPATH) --via $(STATIC_LIBRARY_FILES_LIST) $(DLINK2_FLAGS)
 
     <Command.RVCTCYGWIN>
+        @"echo" [DLINK] $(MODULE_NAME)
         #$(STATIC_LIBRARY_FILES_LIST) has wrong paths for cygwin
         $(AT)"$(DLINK)" $(DLINK_FLAGS) -o ${dst} $(DLINK_SPATH) $(STATIC_LIBRARY_FILES) $(DLINK2_FLAGS)
-        @"echo" [DLINK] $(MODULE_NAME)
 
     <Command.XCODE>
-        $(AT)"$(DLINK)" $(DLINK_FLAGS) -o ${dst} $(DLINK_SPATH) -filelist $(STATIC_LIBRARY_FILES_LIST)  $(DLINK2_FLAGS)
         @"echo" [DLINK] $(MODULE_NAME)
+        $(AT)"$(DLINK)" $(DLINK_FLAGS) -o ${dst} $(DLINK_SPATH) -filelist $(STATIC_LIBRARY_FILES_LIST)  $(DLINK2_FLAGS)
     
     
 [Static-Library-File.SEC.AARCH64, Static-Library-File.PEI_CORE.AARCH64, Static-Library-File.PEIM.AARCH64,Static-Library-File.SEC.ARM, Static-Library-File.PEI_CORE.ARM, Static-Library-File.PEIM.ARM]
@@ -361,9 +362,9 @@
         $(DEBUG_DIR)(+)$(MODULE_NAME).dll
 
     <Command.GCC>
+        @"echo" [DLINK] $(MODULE_NAME)
         $(AT)"$(DLINK)" -o ${dst} $(DLINK_FLAGS) $(DLINK_XIPFLAGS) -Wl,--start-group,@$(STATIC_LIBRARY_FILES_LIST),--end-group $(CC_FLAGS) $(CC_XIPFLAGS) $(DLINK2_FLAGS)
         $(AT)"$(OBJCOPY)" $(OBJCOPY_FLAGS) ${dst}
-        @"echo" [DLINK] $(MODULE_NAME)
 
 
 [Static-Library-File.USER_DEFINED, Static-Library-File.HOST_APPLICATION]
@@ -377,25 +378,25 @@
         $(DEBUG_DIR)(+)$(MODULE_NAME)
 
     <Command.MSFT, Command.INTEL>
-        $(AT)"$(DLINK)" $(DLINK_FLAGS) $(DLINK_SPATH) @$(STATIC_LIBRARY_FILES_LIST)
         @"echo" [DLINK] $(MODULE_NAME)
+        $(AT)"$(DLINK)" $(DLINK_FLAGS) $(DLINK_SPATH) @$(STATIC_LIBRARY_FILES_LIST)
 
     <Command.GCC>
-        $(AT)"$(DLINK)" $(DLINK_FLAGS) $(GCCLINK_PREFIX)--start-group $(DLINK_SPATH) @$(STATIC_LIBRARY_FILES_LIST) $(GCCLINK_PREFIX)--end-group $(DLINK2_FLAGS)
         @"echo" [DLINK] $(MODULE_NAME)
+        $(AT)"$(DLINK)" $(DLINK_FLAGS) $(GCCLINK_PREFIX)--start-group $(DLINK_SPATH) @$(STATIC_LIBRARY_FILES_LIST) $(GCCLINK_PREFIX)--end-group $(DLINK2_FLAGS)
 
     <Command.RVCT>
-        $(AT)"$(DLINK)" $(DLINK_FLAGS) -o ${dst} $(DLINK_SPATH) --via $(STATIC_LIBRARY_FILES_LIST) $(DLINK2_FLAGS)
         @"echo" [DLINK] $(MODULE_NAME)
+        $(AT)"$(DLINK)" $(DLINK_FLAGS) -o ${dst} $(DLINK_SPATH) --via $(STATIC_LIBRARY_FILES_LIST) $(DLINK2_FLAGS)
 
     <Command.RVCTCYGWIN>
+        @"echo" [DLINK] $(MODULE_NAME)
         #$(STATIC_LIBRARY_FILES_LIST) has the wrong paths for cygwin
         $(AT)"$(DLINK)" $(DLINK_FLAGS) -o ${dst} $(DLINK_SPATH) $(STATIC_LIBRARY_FILES) $(DLINK2_FLAGS)
-        @"echo" [DLINK] $(MODULE_NAME)
 
     <Command.XCODE>
-        $(AT)"$(DLINK)" -o ${dst} $(DLINK_FLAGS)  $(DLINK_SPATH) -filelist $(STATIC_LIBRARY_FILES_LIST)  $(DLINK2_FLAGS)
         @"echo" [DLINK] $(MODULE_NAME)
+        $(AT)"$(DLINK)" -o ${dst} $(DLINK_FLAGS)  $(DLINK_SPATH) -filelist $(STATIC_LIBRARY_FILES_LIST)  $(DLINK2_FLAGS)
       
       
 [Dynamic-Library-File]
@@ -406,14 +407,15 @@
         $(OUTPUT_DIR)(+)$(MODULE_NAME).efi
 
     <Command.MSFT, Command.INTEL, Command.RVCT>
+        @"echo" [GENFW] $(MODULE_NAME)
         $(AT)"$(GENFW)" -e $(MODULE_TYPE) -o ${dst} ${src} $(GENFW_FLAGS)
         $(AT)$(CP) ${dst} $(DEBUG_DIR)
         $(AT)$(CP) ${dst} $(BIN_DIR)(+)$(MODULE_NAME_GUID).efi
         -$(AT)$(CP) $(DEBUG_DIR)(+)*.map $(OUTPUT_DIR)
         -$(AT)$(CP) $(DEBUG_DIR)(+)*.pdb $(OUTPUT_DIR) 
-        @"echo" [GENFW] $(MODULE_NAME)
 
     <Command.GCC>
+        @"echo" [OBJCOPY] $(MODULE_NAME)
         $(AT)$(OBJCOPY) --only-keep-debug ${src} $(DEBUG_DIR)(+)$(MODULE_NAME).debug
         #$(AT)$(OBJCOPY) --strip-debug ${src} $(DEBUG_DIR)(+)$(MODULE_NAME).debug
         #$(AT)$(OBJCOPY) --strip-unneeded -R .eh_frame ${src}
@@ -423,26 +425,25 @@
         #
         -$(AT)$(OBJCOPY) $(OBJCOPY_ADDDEBUGFLAG) ${src}
         $(AT)$(CP) $(DEBUG_DIR)(+)$(MODULE_NAME).debug $(BIN_DIR)(+)$(MODULE_NAME_GUID).debug
-        @"echo" [OBJCOPY] $(MODULE_NAME)
 
+        @"echo" [GENFW] $(MODULE_NAME)
         $(AT)"$(GENFW)" -e $(MODULE_TYPE) -o ${dst} ${src} $(GENFW_FLAGS)
         $(AT)$(CP) ${dst} $(DEBUG_DIR)
         $(AT)$(CP) ${dst} $(BIN_DIR)(+)$(MODULE_NAME_GUID).efi
         -$(AT)$(CP) $(DEBUG_DIR)(+)*.map $(OUTPUT_DIR)
-        @"echo" [GENFW] $(MODULE_NAME)
         
     <Command.XCODE>
+        @"echo" [MTOC] $(MODULE_NAME)
         # tool to convert Mach-O to PE/COFF
         #"$(STRIP)" ${src}
         $(AT)"$(MTOC)" -subsystem $(MODULE_TYPE)  $(MTOC_FLAGS)  ${src}  $(DEBUG_DIR)(+)$(MODULE_NAME).pecoff
-        @"echo" [MTOC] $(MODULE_NAME)
         # create symbol file for GDB debug
         -$(AT)$(DSYMUTIL) ${src}
+        @"echo" [GENFW] $(MODULE_NAME)
         $(AT)"$(GENFW)" -e $(MODULE_TYPE) -o ${dst} $(DEBUG_DIR)(+)$(MODULE_NAME).pecoff $(GENFW_FLAGS)
         $(AT)$(CP) ${dst} $(DEBUG_DIR)
         $(AT)$(CP) ${dst} $(BIN_DIR)(+)$(MODULE_NAME_GUID).efi
         -$(AT)$(CP) $(DEBUG_DIR)(+)*.map $(OUTPUT_DIR)
-        @"echo" [GENFW] $(MODULE_NAME)
 
 [Dependency-Expression-File]
     <InputFile>
@@ -455,10 +456,10 @@
         $(MAKE_FILE)
 
     <Command>
+        @"echo" [DEPEX] $(MODULE_NAME)
         $(AT)"$(PP)" $(APP_FLAGS) $(INC) ${src} > $(OUTPUT_DIR)(+)${s_dir}(+)${s_base}.i
         $(AT)Trim --source-code -o $(OUTPUT_DIR)(+)${s_dir}(+)${s_base}.iii $(OUTPUT_DIR)(+)${s_dir}(+)${s_base}.i
         $(AT)GenDepex -t $(MODULE_TYPE) -o ${dst} $(OUTPUT_DIR)(+)${s_dir}(+)${s_base}.iii
-        @"echo" [DEPEX] $(MODULE_NAME)
 
 [Acpi-Source-Language-File]
     <InputFile>
@@ -477,12 +478,12 @@
         $(AT)"$(ASL)" $(ASL_FLAGS) $(ASL_OUTFLAGS)${dst} $(OUTPUT_DIR)(+)${s_dir}(+)${s_base}.iiii
 
     <Command.GCC>
+        @"echo" [ASLPP] ${s_base}
         $(AT)Trim --asl-file -o $(OUTPUT_DIR)(+)${s_dir}(+)${s_base}.i -i $(INC_LIST) ${src}
         $(AT)"$(ASLPP)" $(ASLPP_FLAGS) $(INC) -I${s_path} $(OUTPUT_DIR)(+)${s_dir}(+)${s_base}.i > $(OUTPUT_DIR)(+)${s_dir}(+)${s_base}.iii
-        @"echo" [ASLPP] ${s_base}
+        @"echo" [ASLBIN] ${s_base}
         $(AT)Trim --source-code -l -o $(OUTPUT_DIR)(+)${s_dir}(+)${s_base}.iiii $(OUTPUT_DIR)(+)${s_dir}(+)${s_base}.iii
         $(AT)"$(ASL)" $(ASL_FLAGS) $(ASL_OUTFLAGS)${dst} $(OUTPUT_DIR)(+)${s_dir}(+)${s_base}.iiii
-        @"echo" [ASLBIN] ${s_base}
 
 [C-Code-File.AcpiTable]
     <InputFile>
@@ -500,11 +501,11 @@
         $(AT)"$(GENFW)" -o ${dst} -c $(OUTPUT_DIR)(+)${s_dir}(+)${s_base}.dll $(GENFW_FLAGS)
 
     <Command.GCC>
+        @"echo" [ASLDLINK] ${s_base}
         $(AT)"$(ASLCC)" -c -o $(OUTPUT_DIR)(+)${s_dir}(+)${s_base}.obj $(CC_FLAGS) $(ASLCC_FLAGS) $(INC) ${src}
         $(AT)"$(ASLDLINK)" -o $(OUTPUT_DIR)(+)${s_dir}(+)${s_base}.dll $(ASLDLINK_FLAGS) $(OUTPUT_DIR)(+)${s_dir}(+)${s_base}.obj
-        @"echo" [ASLDLINK] ${s_base}
-        $(AT)"$(GENFW)" -o ${dst} -c $(OUTPUT_DIR)(+)${s_dir}(+)${s_base}.dll $(GENFW_FLAGS)
         @"echo" [GENFW] ${s_base}
+        $(AT)"$(GENFW)" -o ${dst} -c $(OUTPUT_DIR)(+)${s_dir}(+)${s_base}.dll $(GENFW_FLAGS)
 
 [Acpi-Table-Code-File]
     <InputFile>
@@ -522,11 +523,11 @@
         $(AT)"$(GENFW)" -o ${dst} -c $(OUTPUT_DIR)(+)${s_dir}(+)${s_base}.dll $(GENFW_FLAGS)
 
     <Command.GCC>
+        @"echo" [ASLDLINK-ACPI] ${s_base}
         $(AT)"$(ASLCC)" -c -o $(OUTPUT_DIR)(+)${s_dir}(+)${s_base}.obj $(CC_FLAGS) $(ASLCC_FLAGS) $(INC) ${src}
         $(AT)"$(ASLDLINK)" -o $(OUTPUT_DIR)(+)${s_dir}(+)${s_base}.dll $(ASLDLINK_FLAGS) $(OUTPUT_DIR)(+)${s_dir}(+)${s_base}.obj
-        @"echo" [ASLDLINK-ACPI] ${s_base}
-        $(AT)"$(GENFW)" -o ${dst} -c $(OUTPUT_DIR)(+)${s_dir}(+)${s_base}.dll $(GENFW_FLAGS)
         @"echo" [GENFW-ACPI] ${s_base}
+        $(AT)"$(GENFW)" -o ${dst} -c $(OUTPUT_DIR)(+)${s_dir}(+)${s_base}.dll $(GENFW_FLAGS)
         
     <Command.XCODE>        
         @"echo" [ASLCC-ACPI] $(MODULE_NAME)
@@ -536,8 +537,8 @@
         @"echo" [MTOC-ACPI] $(MODULE_NAME)
         #"$(STRIP)" ${src}
         $(AT)"$(MTOC)" -subsystem $(MODULE_TYPE)  $(MTOC_FLAGS) $(OUTPUT_DIR)(+)${s_dir}(+)${s_base}.dll $(OUTPUT_DIR)(+)${s_dir}(+)${s_base}.efi
-        $(AT)"$(GENFW)" -o ${dst} -c $(OUTPUT_DIR)(+)${s_dir}(+)${s_base}.pecoff $(GENFW_FLAGS)
         @"echo" [GENFW-ACPI] $(MODULE_NAME)
+        $(AT)"$(GENFW)" -o ${dst} -c $(OUTPUT_DIR)(+)${s_dir}(+)${s_base}.pecoff $(GENFW_FLAGS)
       
       
 [Masm16-Code-File]
@@ -551,27 +552,27 @@
         $(OUTPUT_DIR)(+)${s_base}.com
 
     <Command.MSFT, Command.INTEL>
+        @"echo" [ASM] $(s_base)
         $(AT)"$(PP)" $(PP_FLAGS) $(INC) ${src} > ${d_path}(+)${s_base}.i
         $(AT)Trim --source-code --convert-hex --trim-long -o ${d_path}(+)${s_base}.iii ${d_path}(+)${s_base}.i
         $(AT)cd $(OUTPUT_DIR)(+)${s_dir}
         $(AT)"$(ASM16)" /nologo /c /omf $(INC) /Fo$(OUTPUT_DIR)(+)${s_dir}(+)${s_base}.obj ${d_path}(+)${s_base}.iii
         $(AT)"$(ASMLINK)" $(ASMLINK_FLAGS) $(OUTPUT_DIR)(+)${s_dir}(+)${s_base}.obj,${dst},,,,
-        @"echo" [ASM] $(s_base)
 
     <Command.GCC>
+        @"echo" [ASM] $(s_base)
         $(AT)"$(PP)" $(PP_FLAGS) $(INC) ${src} > ${d_path}(+)${s_base}.i
         $(AT)Trim --source-code -o ${d_path}(+)${s_base}.iii ${d_path}(+)${s_base}.i
         $(AT)"$(ASM)" -o $(OUTPUT_DIR)(+)${s_dir}(+)${s_base}.obj $(ASM_FLAGS) $(INC) ${d_path}(+)${s_base}.iii
         $(AT)"$(DLINK)" -o ${dst} $(DLINK_FLAGS) --start-group $(DLINK_SPATH) $(LIBS) $(OUTPUT_DIR)(+)${s_dir}(+)${s_base}.obj --end-group
-        @"echo" [ASM] $(s_base)
      
     <Command.XCODE>
+        @"echo" [ASM] ${s_base}
         $(AT)"$(PP)" $(PP_FLAGS) $(INC) ${src} > ${d_path}(+)${s_base}.i
         $(AT)Trim --source-code -o ${d_path}(+)${s_base}.iii ${d_path}(+)${s_base}.i
         $(AT)"$(ASM)" -o $(OUTPUT_DIR)(+)${s_dir}(+)${s_base}.obj $(ASM_FLAGS) $(INC) ${d_path}(+)${s_base}.iii
         $(AT)"$(SLINK)" $(SLINK_FLAGS) $(OUTPUT_DIR)(+)${s_dir}(+)${s_base}.slib $(OUTPUT_DIR)(+)${s_dir}(+)${s_base}.obj
         $(AT)otool -t $(OUTPUT_DIR)(+)${s_dir}(+)${s_base}.slib | hex2bin.py ${dst}
-        @"echo" [ASM] ${s_base}
       
 
 [Nasm-to-Binary-Code-File]
@@ -585,10 +586,10 @@
         $(OUTPUT_DIR)(+)${s_base}.bin
 
     <Command>
+        @"echo" [NASMB] ${s_base}
         $(AT)"$(PP)" $(PP_FLAGS) $(INC) ${src} > ${d_path}(+)${s_base}.i
         $(AT)Trim --source-code --convert-hex -o ${d_path}(+)${s_base}.iii ${d_path}(+)${s_base}.i
         $(AT)"$(NASM)" -I${s_path}(+) -l ${d_path}(+)${s_base}.lst $(NASMB_FLAGS) -o $dst ${d_path}(+)${s_base}.iii
-        @"echo" [NASMB] ${s_base}
         # copy the output file with .com postfix that be same to the output file of .asm16
         $(AT)$(CP) ${dst} $(OUTPUT_DIR)(+)${s_base}.com
 
@@ -600,6 +601,7 @@
         $(OUTPUT_DIR)(+)${s_base}.mcb
 
     <Command>
+        @"echo" [GENFW] ${s_base}
         $(AT)"$(GENFW)" -o ${dst} -m ${src} $(GENFW_FLAGS)
 
 [Microcode-Binary-File]
@@ -613,6 +615,7 @@
         $(OUTPUT_DIR)(+)$(MODULE_NAME).bin
 
     <Command>
+        @"echo" [GENFW] ${s_base}
         $(AT)"$(GENFW)" -o ${dst} -j $(MICROCODE_BINARY_FILES) $(GENFW_FLAGS)
         -$(AT)$(CP) ${dst} $(BIN_DIR)(+)$(MODULE_NAME_GUID).bin
 
@@ -689,6 +692,7 @@
         $(OUTPUT_DIR)(+)${s_dir}(+)${s_base}.hpk
 
     <Command>
+        @"echo" [VFR] ${s_base}
         "$(VFRPP)" $(VFRPP_FLAGS) $(INC) ${src} > $(OUTPUT_DIR)(+)${s_dir}(+)${s_base}.i
         "$(VFR)" $(VFR_FLAGS) --create-ifr-package --string-db $(OUTPUT_DIR)(+)$(MODULE_NAME)StrDefs.hpk --output-directory $(OUTPUT_DIR)(+)${s_dir} $(OUTPUT_DIR)(+)${s_dir}(+)${s_base}.i
 
@@ -703,17 +707,17 @@
         $(OUTPUT_DIR)(+)$(MODULE_NAME)hii.rc
 
     <Command.MSFT, Command.INTEL>
+        @"echo" [GENFW-HII] $(MODULE_NAME)
         $(AT)"$(GENFW)" -o $(OUTPUT_DIR)(+)$(MODULE_NAME)hii.rc -g $(MODULE_GUID) --hiipackage $(HII_BINARY_PACKAGES) $(GENFW_FLAGS)
         $(AT)"$(RC)" /Fo${dst} $(OUTPUT_DIR)(+)$(MODULE_NAME)hii.rc
-        @"echo" [GENFW-HII] $(MODULE_NAME)
 
     <Command.GCC>
+        @"echo" [GENFW-HII] $(MODULE_NAME)
         $(AT)"$(GENFW)" -o $(OUTPUT_DIR)(+)$(MODULE_NAME)hii.rc -g $(MODULE_GUID) --hiibinpackage $(HII_BINARY_PACKAGES) $(GENFW_FLAGS)
         $(AT)"$(RC)" $(RC_FLAGS) $(OUTPUT_DIR)(+)$(MODULE_NAME)hii.rc ${dst}
-        @"echo" [GENFW-HII] $(MODULE_NAME)
         
     <Command.XCODE, Command.RVCT>
-        $(AT)GenFw -o $(OUTPUT_DIR)(+)$(MODULE_NAME)hii.rc -g $(MODULE_GUID) --hiibinpackage $(HII_BINARY_PACKAGES)
         @"echo" [GENFW-HII] $(MODULE_NAME)
+        $(AT)GenFw -o $(OUTPUT_DIR)(+)$(MODULE_NAME)hii.rc -g $(MODULE_GUID) --hiibinpackage $(HII_BINARY_PACKAGES)