Fixed typos (PVCS tracker 749)

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

diff --git a/BaseTools/Conf/build_rule.template b/BaseTools/Conf/build_rule.template
index bca246c3e00688af644c754b97659b5b09103d89..8808afff281283656ae797c2a85ce96f779f3a54 100644 (file)
--- a/BaseTools/Conf/build_rule.template
+++ b/BaseTools/Conf/build_rule.template
@@ -50,7 +50,7 @@
 \r
 ## Macro\r
 #   $(WORKSPACE)        Workspace directory\r
-#   $(OUTPUT_DIR)       Directory for intermediate files for building a module \r
+#   $(OUTPUT_DIR)       Directory for intermediate files for building a module\r
 #   $(DEBUG_DIR)        Directory for files used to debug a module\r
 #   $(BUILD_DIR)        All files for building a platform will be put in this directory\r
 #   $(BIN_DIR)          Common directory for executable files\r
@@ -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
@@ -135,7 +135,9 @@
         "$(ASM)" /Fo${dst} $(ASM_FLAGS) $(INC) ${d_path}(+)${s_base}.iii\r
 \r
     <Command.GCC>\r
-        "$(ASM)" -o ${dst} $(ASM_FLAGS) $(INC) ${src}\r
+        "$(PP)" $(PP_FLAGS) $(INC) ${src} > ${d_path}(+)${s_base}.i\r
+        Trim --source-code -o ${d_path}(+)${s_base}.iii ${d_path}(+)${s_base}.i\r
+        "$(ASM)" -o ${dst} $(ASM_FLAGS) $(INC) ${d_path}(+)${s_base}.iii\r
 \r
 [Build.Iasm-Code-File]\r
     <InputFile>\r
@@ -145,8 +147,9 @@
         $(OUTPUT_DIR)(+)${s_dir}(+)${s_base}.obj\r
 \r
     <Command.MSFT, Command.INTEL>\r
-        "$(APP)" $(APP_FLAGS) $(INC) ${src} > ${d_path}(+)${s_base}.i\r
-        "$(ASM)" -o ${dst} $(ASM_FLAGS) ${d_path}(+)${s_base}.i\r
+        "$(PP)" $(PP_FLAGS) $(INC) ${src} > ${d_path}(+)${s_base}.i\r
+        Trim --source-code -o ${d_path}(+)${s_base}.iii ${d_path}(+)${s_base}.i\r
+        "$(ASM)" -o ${dst} $(ASM_FLAGS) ${d_path}(+)${s_base}.iii\r
 \r
 [Build.Visual-Form-Representation-File]\r
     <InputFile>\r
@@ -194,9 +197,15 @@
 #        "$(SLINK)" -cr ${dst} $(SLINK_FLAGS) ${src1} -( ${src2} -)\r
 #\r
 [Build.Static-Library-File]\r
-    <InputFile>\r
+    <InputFile.MSFT, InputFile.Intel>\r
+        ?.lib\r
+        $(LIBS)\r
+        $(MAKE_FILE)\r
+\r
+    <InputFile.GCC>\r
         ?.lib\r
         $(LIBS)\r
+        $(MAKE_FILE)\r
 \r
     <OutputFile>\r
         $(DEBUG_DIR)(+)$(MODULE_NAME).dll\r
@@ -205,7 +214,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} -\)\r
 \r
 [Build.Dynamic-Library-File]\r
     <InputFile>\r
@@ -227,8 +236,10 @@
     <OutputFile>\r
         $(OUTPUT_DIR)(+)$(MODULE_NAME).depex\r
 \r
-    <Command.MSFT>\r
-#       GenDepex -o ${dst} ${src}\r
+    <Command>\r
+        "$(PP)" $(CC_FLAGS) $(APP_FLAGS) $(INC) ${src} > $(OUTPUT_DIR)(+)${s_dir}(+)${s_base}.i\r
+        Trim --source-code -o $(OUTPUT_DIR)(+)${s_dir}(+)${s_base}.iii $(OUTPUT_DIR)(+)${s_dir}(+)${s_base}.i\r
+        GenDepex -t $(MODULE_TYPE) -o ${dst} $(OUTPUT_DIR)(+)${s_dir}(+)${s_base}.iii\r
 \r
 [Build.Acpi-Source-Language-File]\r
     <InputFile>\r
@@ -239,8 +250,7 @@
 \r
     <Command.MSFT, Command.INTEL>\r
         "$(PP)" $(APP_FLAGS) $(INC) ${src} > ${d_path}(+)${s_base}.i\r
-        Trim --source-code -o ${d_path}(+)${s_base}.iii ${d_path}(+)${s_base}.i\r
-        "$(ASL)" -p ${dst} ${d_path}(+)${s_base}.iii\r
+        "$(ASL)" -p ${dst} ${d_path}(+)${s_base}.i\r
 \r
 [Build.Acpi-Table-Code-File]\r
     <InputFile>\r
@@ -249,9 +259,9 @@
     <OutputFile>\r
         $(OUTPUT_DIR)(+)${s_base}.acpi\r
 \r
-    <Command.MSFT>\r
+    <Command.MSFT, Command.INTEL>\r
         "$(CC)" /Fo$(OUTPUT_DIR)(+)${s_dir}(+)${s_base}.obj $(CC_FLAGS) $(INC) ${src}\r
-        "$(DLINK)" /OUT:$(OUTPUT_DIR)(+)${s_dir}(+)${s_base}.dll $(SLINK_FLAGS) $(OUTPUT_DIR)(+)${s_dir}(+)${s_base}.obj \r
+        "$(DLINK)" /OUT:$(OUTPUT_DIR)(+)${s_dir}(+)${s_base}.dll $(SLINK_FLAGS) $(OUTPUT_DIR)(+)${s_dir}(+)${s_base}.obj\r
         GenFw -o ${dst} -c $(OUTPUT_DIR)(+)${s_dir}(+)${s_base}.dll\r
 \r
 [Build.Masm16-Code-File]\r
@@ -259,13 +269,12 @@
         ?.asm16, ?.Asm16, ?.ASM16\r
 \r
     <OutputFile>\r
-        $(OUTPUT_DIR)(+)${s_dir}(+)${s_base}.com\r
+        $(OUTPUT_DIR)(+)${s_base}.com\r
 \r
     <Command.MSFT, Command.INTEL>\r
-        pushd .\r
         cd $(OUTPUT_DIR)(+)${s_dir}\r
-        "$(ASM)" /nologo /omf ${src} /Bl"$(ASMLINK)" $(ASMLINK_FLAGS)\r
-        -$(CP) ${dst} $(OUTPUT_DIR) & popd\r
+        "$(ASM)" /nologo /c /omf /Fo$(OUTPUT_DIR)(+)${s_dir}(+)${s_base}.obj ${src}\r
+        "$(ASMLINK)" $(ASMLINK_FLAGS) $(OUTPUT_DIR)(+)${s_dir}(+)${s_base}.obj,${dst},,,,\r
 \r
 [Build.Microcode-File]\r
     <InputFile>\r