Try to remove duplicated include path in command line option

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

diff --git a/BaseTools/Conf/build_rule.template b/BaseTools/Conf/build_rule.template
index 84262b271d6da2233aad28d3df5e91f0437c535e..83dd6a8fd0fd31447e70db637864a5a0f46c7111 100644 (file)
--- a/BaseTools/Conf/build_rule.template
+++ b/BaseTools/Conf/build_rule.template
@@ -64,6 +64,7 @@
 #   $(BIN_DIR)          Common directory for executable files\r
 #   $(FV_DIR)           Directory to store flash image files\r
 #   $(INC)              Search path of current module\r
+#   $(INC_LIST)         A file containing search pathes of current module\r
 #   $(LIBS)             Static library files of current module\r
 #   $(<tool>_FLAGS)     Tools flags of current module\r
 #   $(MODULE_NAME)      Current module name\r
@@ -73,9 +74,17 @@
 #   $(TARGET)           Target of current module (DEBUG/RELEASE)\r
 #   $(<tool>)           Path of tool\r
 #   $(EDK_TOOLS_PATH)   Path of build tools\r
-#   $(<FILE_TYPE_LIST>) File list of each file type\r
+#   $(<FILE_TYPES>)     File list of each file type\r
 #                       (Note: The macro name is derived from file type name. For example,\r
-#                        C-Code-File will have C_CODE_FILE_LIST macro.)\r
+#                        C-Code-File will have C_CODE_FILES macro.)\r
+#   $(<FILE_TYPES_LIST>) Macro point to a file containing list of files of a file type\r
+#                       (\r
+#                        Note: The macro and file name are derived from file type name.\r
+#                        For example, C-Code-File will have C_CODE_FILES_LIST macro pointing\r
+#                        to $(OUTPUT_DIR)/c_code_files.lst. The list file and macro name\r
+#                        will be generated only when this macro is used in command line.\r
+#                        This is intended to get over the long command line limitation.\r
+#                       )\r
 #\r
 #   $(CP)     copy command\r
 #   $(MV)     move command\r
@@ -144,7 +153,7 @@
     <Command.MSFT, Command.INTEL>\r
         "$(PP)" $(PP_FLAGS) $(INC) ${src} > ${d_path}(+)${s_base}.i\r
         Trim --source-code --convert-hex -o ${d_path}(+)${s_base}.iii ${d_path}(+)${s_base}.i\r
-        "$(ASM)" /Fo${dst} $(ASM_FLAGS) $(INC) ${d_path}(+)${s_base}.iii\r
+        "$(ASM)" /Fo${dst} $(ASM_FLAGS) /I${s_path} $(INC) ${d_path}(+)${s_base}.iii\r
 \r
     <Command.GCC>\r
         "$(PP)" $(PP_FLAGS) $(INC) ${src} > ${d_path}(+)${s_base}.i\r
@@ -179,7 +188,7 @@
         $(DEBUG_DIR)(+)${s_dir}(+)${s_base}.c\r
 \r
     <Command>\r
-        "$(PP)" $(VFRPP_FLAGS) $(INC) ${src} > $(OUTPUT_DIR)(+)${s_dir}(+)${s_base}.i\r
+        "$(VFRPP)" $(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
         "$(VFR)" $(VFR_FLAGS) --output-directory ${d_path} $(OUTPUT_DIR)(+)${s_dir}(+)${s_base}.iii\r
@@ -193,27 +202,42 @@
         $(OUTPUT_DIR)(+)$(MODULE_NAME).lib\r
 \r
     <Command.MSFT, Command.INTEL>\r
-        "$(SLINK)" $(SLINK_FLAGS) /OUT:${dst} ${src}\r
+        "$(SLINK)" $(SLINK_FLAGS) /OUT:${dst} $(OBJECT_FILES)\r
 \r
     <Command.GCC>\r
-        "$(SLINK)" -cr ${dst} $(SLINK_FLAGS) ${src}\r
+        "$(SLINK)" -cr ${dst} $(SLINK_FLAGS) $(OBJECT_FILES)\r
 \r
 [Static-Library-File]\r
     <InputFile>\r
-        ?.lib\r
+        *.lib\r
 \r
     <ExtraDependency>\r
-        $(LIBS)\r
         $(MAKE_FILE)\r
 \r
     <OutputFile>\r
         $(DEBUG_DIR)(+)$(MODULE_NAME).dll\r
 \r
     <Command.MSFT, Command.INTEL>\r
-        "$(DLINK)" /OUT:${dst} $(DLINK_FLAGS) $(DLINK_SPATH) $(LIBS) ${src}\r
+        "$(DLINK)" /OUT:${dst} $(DLINK_FLAGS) $(DLINK_SPATH) $(STATIC_LIBRARY_FILES)\r
 \r
     <Command.GCC>\r
-        "$(DLINK)" -o ${dst} $(DLINK_FLAGS) -\( $(DLINK_SPATH) $(LIBS) ${src} -\) $(DLINK2_FLAGS)\r
+        "$(DLINK)" -o ${dst} $(DLINK_FLAGS) -\( $(DLINK_SPATH) $(STATIC_LIBRARY_FILES) -\) $(DLINK2_FLAGS)\r
+\r
+[Static-Library-File.USER_DEFINED]\r
+    <InputFile>\r
+        *.lib\r
+\r
+    <ExtraDependency>\r
+        $(MAKE_FILE)\r
+\r
+    <OutputFile>\r
+        $(DEBUG_DIR)(+)$(MODULE_NAME)\r
+\r
+    <Command.MSFT, Command.INTEL>\r
+        "$(DLINK)" $(DLINK_FLAGS) $(DLINK_SPATH) $(STATIC_LIBRARY_FILES)\r
+\r
+    <Command.GCC>\r
+        "$(DLINK)" $(DLINK_FLAGS) -\( $(DLINK_SPATH) $(STATIC_LIBRARY_FILES) -\) $(DLINK2_FLAGS)\r
 \r
 [Dynamic-Library-File]\r
     <InputFile>\r
@@ -245,21 +269,37 @@
         ?.asl, ?.Asl, ?.ASL\r
 \r
     <OutputFile>\r
-        $(OUTPUT_DIR)(+)${s_base}.aml\r
+        $(OUTPUT_DIR)(+)${s_dir}(+)${s_base}.aml\r
 \r
     <ExtraDependency>\r
         $(MAKE_FILE)\r
 \r
     <Command.MSFT, Command.INTEL>\r
-        "$(ASLPP)" $(ASLPP_FLAGS) $(INC) ${src} > ${d_path}(+)${s_dir}(+)${s_base}.i\r
-        "$(ASL)" -p ${dst} $(ASL_FLAGS) ${d_path}(+)${s_dir}(+)${s_base}.i\r
+        Trim --asl-file -o $(OUTPUT_DIR)(+)${s_dir}(+)${s_base}.i ${src}\r
+        "$(ASLPP)" $(ASLPP_FLAGS) $(INC) /I${s_path} $(OUTPUT_DIR)(+)${s_dir}(+)${s_base}.i > $(OUTPUT_DIR)(+)${s_dir}(+)${s_base}.iii\r
+        "$(ASL)" -p ${dst} $(ASL_FLAGS) $(OUTPUT_DIR)(+)${s_dir}(+)${s_base}.iii\r
+\r
+[C-Code-File.AcpiTable]\r
+    <InputFile>\r
+        ?.c\r
+\r
+    <OutputFile>\r
+        $(OUTPUT_DIR)(+)${s_dir}(+)${s_base}.acpi\r
+\r
+    <ExtraDependency>\r
+        $(MAKE_FILE)\r
+\r
+    <Command.MSFT, Command.INTEL>\r
+        "$(ASLCC)" /Fo$(OUTPUT_DIR)(+)${s_dir}(+)${s_base}.obj $(CC_FLAGS) $(ASLCC_FLAGS) $(INC) ${src}\r
+        "$(ASLDLINK)" /OUT:$(OUTPUT_DIR)(+)${s_dir}(+)${s_base}.dll $(ASLDLINK_FLAGS) $(OUTPUT_DIR)(+)${s_dir}(+)${s_base}.obj\r
+        GenFw -o ${dst} -c $(OUTPUT_DIR)(+)${s_dir}(+)${s_base}.dll\r
 \r
 [Acpi-Table-Code-File]\r
     <InputFile>\r
-        ?.aslc\r
+        ?.aslc, ?.act\r
 \r
     <OutputFile>\r
-        $(OUTPUT_DIR)(+)${s_base}.acpi\r
+        $(OUTPUT_DIR)(+)${s_dir}(+)${s_base}.acpi\r
 \r
     <ExtraDependency>\r
         $(MAKE_FILE)\r
@@ -302,24 +342,23 @@
         $(OUTPUT_DIR)(+)$(MODULE_NAME).bin\r
 \r
     <Command>\r
-        GenFw -o ${dst} -j ${src}\r
+        GenFw -o ${dst} -j $(MICROCODE_BINARY_FILES)\r
         -$(CP) ${dst} $(BIN_DIR)\r
 \r
-[Unicode-Text-File]\r
+[EFI-Image-File]\r
     <InputFile>\r
-        *.uni, *.Uni, *.UNI\r
+        ?.efi, ?.Efi, ?.EFI\r
 \r
     <OutputFile>\r
-        $(DEBUG_DIR)(+)AutoGen.c\r
-        $(DEBUG_DIR)(+)AutoGen.h\r
 \r
     <Command>\r
 \r
-[EFI-Image-File]\r
+[Unicode-Text-File]\r
     <InputFile>\r
-        ?.efi, ?.Efi, ?.EFI\r
+        *.uni, *.Uni, *.UNI\r
 \r
     <OutputFile>\r
+        $(DEBUG_DIR)(+)AutoGen.c\r
+        $(DEBUG_DIR)(+)$(MODULE_NAME)StrDefs.h\r
 \r
     <Command>\r
-\r