code review's result.

[mirror_edk2.git] / BaseTools / Conf / build_rule.template

diff --git a/BaseTools/Conf/build_rule.template b/BaseTools/Conf/build_rule.template
index fc26a42f976d0c4d55debd41cb0c2c8e999577b0..c6cde8f2e5a4ff27204fd7806a21afb738759f54 100644 (file)
--- a/BaseTools/Conf/build_rule.template
+++ b/BaseTools/Conf/build_rule.template
@@ -78,7 +78,7 @@
 \r
 ## Reserved File-Type\r
 #\r
-# Dont't change following names of file types and their associated files,\r
+# Don't change following names of file types and their associated files,\r
 # which are also used in tools' code\r
 #\r
 #   C-Code-File\r
@@ -98,6 +98,7 @@
         ?.cpp\r
         ?.Cpp\r
         ?.CPP\r
+        $(MAKE_FILE)\r
 \r
     <OutputFile>\r
         $(OUTPUT_DIR)(+)${s_dir}(+)${s_base}.obj\r
@@ -122,9 +123,11 @@
 [Build.Assembly-Code-File]\r
     <InputFile.MSFT, InputFile.INTEL>\r
         Assembly-Code-File = ?.asm, ?.Asm, ?.ASM\r
+        $(MAKE_FILE)\r
 \r
     <InputFile.GCC>\r
         ?.S\r
+        $(MAKE_FILE)\r
 \r
     <OutputFile>\r
         $(OUTPUT_DIR)(+)${s_dir}(+)${s_base}.obj\r
@@ -142,6 +145,7 @@
 [Build.Iasm-Code-File]\r
     <InputFile>\r
         ?.s\r
+        $(MAKE_FILE)\r
 \r
     <OutputFile>\r
         $(OUTPUT_DIR)(+)${s_dir}(+)${s_base}.obj\r
@@ -156,6 +160,7 @@
         ?.vfr\r
         ?.Vfr\r
         ?.VFR\r
+        $(MAKE_FILE)\r
 \r
     <OutputFile>\r
         $(DEBUG_DIR)(+)${s_dir}(+)${s_base}.c\r
@@ -164,7 +169,7 @@
         "$(PP)" $(VFRPP_FLAGS) $(INC) ${src} > $(OUTPUT_DIR)(+)${s_dir}(+)${s_base}.i\r
         Trim --vfr-file -o $(OUTPUT_DIR)(+)${s_dir}(+)${s_base}.iii $(OUTPUT_DIR)(+)${s_dir}(+)${s_base}.i\r
         -mkdir ${d_path} > NUL 2>&1\r
-        VfrCompile -od ${d_path} $(OUTPUT_DIR)(+)${s_dir}(+)${s_base}.iii\r
+        "$(VFR)" $(VFR_FLAGS) --output-directory ${d_path} $(OUTPUT_DIR)(+)${s_dir}(+)${s_base}.iii\r
 \r
 [Build.Object-File]\r
     <InputFile>\r
@@ -214,7 +219,7 @@
         "$(DLINK)" /OUT:${dst} $(DLINK_FLAGS) $(DLINK_SPATH) $(LIBS) ${src}\r
 \r
     <Command.GCC>\r
-        "$(DLINK)" -o ${dst} $(DLINK_FLAGS) -\( $(DLINK_SPATH) $(LIBS) ${src} -\)\r
+        "$(DLINK)" -o ${dst} $(DLINK_FLAGS) -\( $(DLINK_SPATH) $(LIBS) ${src} -\) $(DLINK2_FLAGS)\r
 \r
 [Build.Dynamic-Library-File]\r
     <InputFile>\r
@@ -250,7 +255,7 @@
 \r
     <Command.MSFT, Command.INTEL>\r
         "$(PP)" $(APP_FLAGS) $(INC) ${src} > ${d_path}(+)${s_base}.i\r
-        "$(ASL)" -p ${dst} ${d_path}(+)${s_base}.i\r
+        "$(ASL)" -p ${dst} $(ASL_FLAGS) ${d_path}(+)${s_base}.i\r
 \r
 [Build.Acpi-Table-Code-File]\r
     <InputFile>\r
@@ -295,6 +300,7 @@
 \r
     <Command>\r
         GenFw -o ${dst} -j ${src}\r
+        -$(CP) ${dst} $(BIN_DIR)\r
 \r
 [Build.Unicode-Text-File]\r
     <InputFile>\r