Add the missing OUTPUT directory for the EFI and depex file in Rule section.

git-svn-id: https://edk2.svn.sourceforge.net/svnroot/edk2/trunk/edk2@10135 6f19259b-4bc3-4df7-8a09-765794883524

diff --git a/DuetPkg/DuetPkg.fdf b/DuetPkg/DuetPkg.fdf
index d6c38446e9863a3bba2d95b48680b9a3344423f1..b9079810a429dcb1df017653f585156fd24f94ea 100644 (file)
--- a/DuetPkg/DuetPkg.fdf
+++ b/DuetPkg/DuetPkg.fdf
@@ -129,29 +129,29 @@ FILE FREEFORM = PCD(gEfiIntelFrameworkModulePkgTokenSpaceGuid.PcdLogoFile) {
 \r
 [Rule.Common.DXE_CORE]\r
   FILE DXE_CORE = $(NAMED_GUID) {\r
-      PE32     PE32           $(MODULE_NAME).efi\r
+      PE32     PE32           $(INF_OUTPUT)/$(MODULE_NAME).efi\r
   }\r
 \r
 [Rule.Common.UEFI_DRIVER]\r
   FILE DRIVER = $(NAMED_GUID) {\r
-    DXE_DEPEX    DXE_DEPEX Optional      $(MODULE_NAME).depex\r
-        PE32     PE32                    $(MODULE_NAME).efi\r
+    DXE_DEPEX    DXE_DEPEX Optional      $(INF_OUTPUT)/$(MODULE_NAME).depex\r
+        PE32     PE32                    $(INF_OUTPUT)/$(MODULE_NAME).efi\r
   }\r
 \r
 [Rule.Common.DXE_DRIVER]\r
   FILE DRIVER = $(NAMED_GUID) {\r
-    DXE_DEPEX    DXE_DEPEX Optional      $(MODULE_NAME).depex\r
-        PE32     PE32                    $(MODULE_NAME).efi\r
+    DXE_DEPEX    DXE_DEPEX Optional      $(INF_OUTPUT)/$(MODULE_NAME).depex\r
+        PE32     PE32                    $(INF_OUTPUT)/$(MODULE_NAME).efi\r
   }\r
 \r
 [Rule.Common.DXE_RUNTIME_DRIVER]\r
   FILE DRIVER = $(NAMED_GUID) {\r
-    DXE_DEPEX    DXE_DEPEX Optional      $(MODULE_NAME).depex\r
-        PE32     PE32                    $(MODULE_NAME).efi\r
+    DXE_DEPEX    DXE_DEPEX Optional      $(INF_OUTPUT)/$(MODULE_NAME).depex\r
+        PE32     PE32                    $(INF_OUTPUT)/$(MODULE_NAME).efi\r
   }\r
 \r
 [Rule.Common.UEFI_APPLICATION]\r
   FILE APPLICATION = $(NAMED_GUID) {\r
-        PE32     PE32                    $(MODULE_NAME).efi\r
+        PE32     PE32                    $(INF_OUTPUT)/$(MODULE_NAME).efi\r
   }\r
 \r

diff --git a/Nt32Pkg/Nt32Pkg.fdf b/Nt32Pkg/Nt32Pkg.fdf
index d34b76097dd491e366a9c4df5c1fd1f039e71c56..4671db8133e86b37818c841220edf1483038b469 100644 (file)
--- a/Nt32Pkg/Nt32Pkg.fdf
+++ b/Nt32Pkg/Nt32Pkg.fdf
@@ -279,10 +279,10 @@ FILE FREEFORM = PCD(gEfiIntelFrameworkModulePkgTokenSpaceGuid.PcdLogoFile) {
 #\r
 #[Rule.Common.DXE_DRIVER]\r
 #  FILE DRIVER = $(NAMED_GUID) {\r
-#    DXE_DEPEX    DXE_DEPEX Optional      $(MODULE_NAME).depex\r
+#    DXE_DEPEX    DXE_DEPEX Optional      $(INF_OUTPUT)/$(MODULE_NAME).depex\r
 #    COMPRESS PI_STD {\r
 #      GUIDED {\r
-#        PE32     PE32                    $(MODULE_NAME).efi\r
+#        PE32     PE32                    $(INF_OUTPUT)/$(MODULE_NAME).efi\r
 #        UI       STRING="$(MODULE_NAME)" Optional\r
 #        VERSION  STRING="$(INF_VERSION)" Optional BUILD_NUM=$(BUILD_NUMBER)\r
 #      }\r
@@ -293,15 +293,15 @@ FILE FREEFORM = PCD(gEfiIntelFrameworkModulePkgTokenSpaceGuid.PcdLogoFile) {
 \r
 [Rule.Common.PEI_CORE]\r
   FILE PEI_CORE = $(NAMED_GUID) {\r
-    PE32     PE32    Align=4K     $(MODULE_NAME).efi\r
+    PE32     PE32    Align=4K     $(INF_OUTPUT)/$(MODULE_NAME).efi\r
     UI       STRING ="$(MODULE_NAME)" Optional         \r
     VERSION  STRING ="$(INF_VERSION)" Optional BUILD_NUM=$(BUILD_NUMBER)    \r
   }\r
 \r
 [Rule.Common.PEIM]\r
   FILE PEIM = $(NAMED_GUID) {\r
-     PEI_DEPEX PEI_DEPEX Optional        $(MODULE_NAME).depex\r
-     PE32      PE32    Align=4K          $(MODULE_NAME).efi\r
+     PEI_DEPEX PEI_DEPEX Optional        $(INF_OUTPUT)/$(MODULE_NAME).depex\r
+     PE32      PE32    Align=4K          $(INF_OUTPUT)/$(MODULE_NAME).efi\r
      UI       STRING="$(MODULE_NAME)" Optional         \r
      VERSION  STRING="$(INF_VERSION)" Optional BUILD_NUM=$(BUILD_NUMBER)   \r
   }\r
@@ -309,7 +309,7 @@ FILE FREEFORM = PCD(gEfiIntelFrameworkModulePkgTokenSpaceGuid.PcdLogoFile) {
 [Rule.Common.DXE_CORE]\r
   FILE DXE_CORE = $(NAMED_GUID) {\r
     COMPRESS PI_STD {\r
-      PE32     PE32      $(MODULE_NAME).efi\r
+      PE32     PE32      $(INF_OUTPUT)/$(MODULE_NAME).efi\r
       UI       STRING="$(MODULE_NAME)" Optional\r
       VERSION  STRING="$(INF_VERSION)" Optional BUILD_NUM=$(BUILD_NUMBER)\r
     }\r
@@ -317,10 +317,10 @@ FILE FREEFORM = PCD(gEfiIntelFrameworkModulePkgTokenSpaceGuid.PcdLogoFile) {
 \r
 [Rule.Common.UEFI_DRIVER]\r
   FILE DRIVER = $(NAMED_GUID) {\r
-    DXE_DEPEX    DXE_DEPEX Optional      $(MODULE_NAME).depex\r
+    DXE_DEPEX    DXE_DEPEX Optional      $(INF_OUTPUT)/$(MODULE_NAME).depex\r
     COMPRESS PI_STD {\r
       GUIDED {\r
-        PE32     PE32                    $(MODULE_NAME).efi\r
+        PE32     PE32                    $(INF_OUTPUT)/$(MODULE_NAME).efi\r
         UI       STRING="$(MODULE_NAME)" Optional\r
         VERSION  STRING="$(INF_VERSION)" Optional BUILD_NUM=$(BUILD_NUMBER)\r
       }\r
@@ -329,9 +329,9 @@ FILE FREEFORM = PCD(gEfiIntelFrameworkModulePkgTokenSpaceGuid.PcdLogoFile) {
 \r
 [Rule.Common.UEFI_DRIVER.TIANOCOMPRESSED]\r
   FILE DRIVER = $(NAMED_GUID) {\r
-    DXE_DEPEX    DXE_DEPEX Optional      $(MODULE_NAME).depex\r
+    DXE_DEPEX    DXE_DEPEX Optional      $(INF_OUTPUT)/$(MODULE_NAME).depex\r
     GUIDED A31280AD-481E-41B6-95E8-127F4C984779 PROCESSING_REQUIRED = TRUE {\r
-      PE32     PE32                    $(MODULE_NAME).efi\r
+      PE32     PE32                    $(INF_OUTPUT)/$(MODULE_NAME).efi\r
       UI       STRING="$(MODULE_NAME)" Optional\r
       VERSION  STRING="$(INF_VERSION)" Optional BUILD_NUM=$(BUILD_NUMBER)\r
     }\r
@@ -339,10 +339,10 @@ FILE FREEFORM = PCD(gEfiIntelFrameworkModulePkgTokenSpaceGuid.PcdLogoFile) {
 \r
 [Rule.Common.DXE_DRIVER]\r
   FILE DRIVER = $(NAMED_GUID) {\r
-    DXE_DEPEX    DXE_DEPEX Optional      $(MODULE_NAME).depex\r
+    DXE_DEPEX    DXE_DEPEX Optional      $(INF_OUTPUT)/$(MODULE_NAME).depex\r
     COMPRESS PI_STD {\r
       GUIDED {\r
-        PE32     PE32                    $(MODULE_NAME).efi\r
+        PE32     PE32                    $(INF_OUTPUT)/$(MODULE_NAME).efi\r
         UI       STRING="$(MODULE_NAME)" Optional\r
         VERSION  STRING="$(INF_VERSION)" Optional BUILD_NUM=$(BUILD_NUMBER)\r
       }\r
@@ -351,10 +351,10 @@ FILE FREEFORM = PCD(gEfiIntelFrameworkModulePkgTokenSpaceGuid.PcdLogoFile) {
 \r
 [Rule.Common.DXE_RUNTIME_DRIVER]\r
   FILE DRIVER = $(NAMED_GUID) {\r
-    DXE_DEPEX    DXE_DEPEX Optional      $(MODULE_NAME).depex\r
+    DXE_DEPEX    DXE_DEPEX Optional      $(INF_OUTPUT)/$(MODULE_NAME).depex\r
     COMPRESS PI_STD {\r
       GUIDED {\r
-        PE32     PE32                    $(MODULE_NAME).efi\r
+        PE32     PE32                    $(INF_OUTPUT)/$(MODULE_NAME).efi\r
         UI       STRING="$(MODULE_NAME)" Optional\r
         VERSION  STRING="$(INF_VERSION)" Optional BUILD_NUM=$(BUILD_NUMBER)\r
       }\r
@@ -365,7 +365,7 @@ FILE FREEFORM = PCD(gEfiIntelFrameworkModulePkgTokenSpaceGuid.PcdLogoFile) {
   FILE APPLICATION = $(NAMED_GUID) {\r
     COMPRESS PI_STD {\r
       GUIDED {\r
-        PE32     PE32                    $(MODULE_NAME).efi\r
+        PE32     PE32                    $(INF_OUTPUT)/$(MODULE_NAME).efi\r
         UI       STRING="$(MODULE_NAME)" Optional\r
         VERSION  STRING="$(INF_VERSION)" Optional BUILD_NUM=$(BUILD_NUMBER)\r
       }\r

diff --git a/OvmfPkg/OvmfPkg.fdf b/OvmfPkg/OvmfPkg.fdf
index cd70de9caf8b7c2f7c0f69c95c942a7228527e62..1c5d82d0ac717254b5005445ec0baadfabc261d5 100644 (file)
--- a/OvmfPkg/OvmfPkg.fdf
+++ b/OvmfPkg/OvmfPkg.fdf
@@ -254,39 +254,39 @@ FILE FREEFORM = 1BA0062E-C779-4582-8566-336AE8F78F09 {
 \r
 [Rule.Common.PEI_CORE]\r
   FILE PEI_CORE = $(NAMED_GUID) {\r
-    PE32     PE32   Align=32    $(MODULE_NAME).efi\r
+    PE32     PE32   Align=32    $(INF_OUTPUT)/$(MODULE_NAME).efi\r
     UI       STRING ="$(MODULE_NAME)" Optional\r
     VERSION  STRING ="$(INF_VERSION)" Optional BUILD_NUM=$(BUILD_NUMBER)\r
   }\r
 \r
 [Rule.Common.SEC]\r
   FILE SEC = $(NAMED_GUID) {\r
-    PE32     PE32           $(MODULE_NAME).efi\r
+    PE32     PE32           $(INF_OUTPUT)/$(MODULE_NAME).efi\r
     UI       STRING ="$(MODULE_NAME)" Optional\r
     VERSION  STRING ="$(INF_VERSION)" Optional BUILD_NUM=$(BUILD_NUMBER)\r
   }\r
 \r
 [Rule.Common.PEIM.NORELOC]\r
   FILE PEIM = $(NAMED_GUID) RELOCS_STRIPPED  {\r
-     PEI_DEPEX PEI_DEPEX Optional        $(MODULE_NAME).depex\r
-     TE        TE                        $(MODULE_NAME).efi\r
+     PEI_DEPEX PEI_DEPEX Optional        $(INF_OUTPUT)/$(MODULE_NAME).depex\r
+     TE        TE                        $(INF_OUTPUT)/$(MODULE_NAME).efi\r
      UI        STRING="$(MODULE_NAME)" Optional\r
      VERSION   STRING="$(INF_VERSION)" Optional BUILD_NUM=$(BUILD_NUMBER)\r
   }\r
 \r
 [Rule.Common.PEIM]\r
   FILE PEIM = $(NAMED_GUID) {\r
-     PEI_DEPEX PEI_DEPEX Optional        $(MODULE_NAME).depex\r
-     PE32      PE32   Align=32           $(MODULE_NAME).efi\r
+     PEI_DEPEX PEI_DEPEX Optional        $(INF_OUTPUT)/$(MODULE_NAME).depex\r
+     PE32      PE32   Align=32           $(INF_OUTPUT)/$(MODULE_NAME).efi\r
      UI       STRING="$(MODULE_NAME)" Optional\r
      VERSION  STRING="$(INF_VERSION)" Optional BUILD_NUM=$(BUILD_NUMBER)\r
   }\r
 \r
 [Rule.Common.PEIM.TIANOCOMPRESSED]\r
   FILE PEIM = $(NAMED_GUID) {\r
-    PEI_DEPEX PEI_DEPEX Optional         $(MODULE_NAME).depex\r
+    PEI_DEPEX PEI_DEPEX Optional         $(INF_OUTPUT)/$(MODULE_NAME).depex\r
     GUIDED A31280AD-481E-41B6-95E8-127F4C984779 PROCESSING_REQUIRED = TRUE {\r
-      PE32      PE32                     $(MODULE_NAME).efi\r
+      PE32      PE32                     $(INF_OUTPUT)/$(MODULE_NAME).efi\r
       UI        STRING="$(MODULE_NAME)" Optional\r
       VERSION   STRING="$(INF_VERSION)" Optional BUILD_NUM=$(BUILD_NUMBER)\r
     }\r
@@ -294,38 +294,38 @@ FILE FREEFORM = 1BA0062E-C779-4582-8566-336AE8F78F09 {
 \r
 [Rule.Common.DXE_CORE]\r
   FILE DXE_CORE = $(NAMED_GUID) {\r
-    PE32     PE32           $(MODULE_NAME).efi\r
+    PE32     PE32           $(INF_OUTPUT)/$(MODULE_NAME).efi\r
     UI       STRING="$(MODULE_NAME)" Optional\r
     VERSION  STRING="$(INF_VERSION)" Optional BUILD_NUM=$(BUILD_NUMBER)\r
   }\r
 \r
 [Rule.Common.UEFI_DRIVER]\r
   FILE DRIVER = $(NAMED_GUID) {\r
-    DXE_DEPEX    DXE_DEPEX Optional      $(MODULE_NAME).depex\r
-    PE32     PE32                    $(MODULE_NAME).efi\r
+    DXE_DEPEX    DXE_DEPEX Optional      $(INF_OUTPUT)/$(MODULE_NAME).depex\r
+    PE32     PE32                    $(INF_OUTPUT)/$(MODULE_NAME).efi\r
     UI       STRING="$(MODULE_NAME)" Optional\r
     VERSION  STRING="$(INF_VERSION)" Optional BUILD_NUM=$(BUILD_NUMBER)\r
   }\r
 \r
 [Rule.Common.DXE_DRIVER]\r
   FILE DRIVER = $(NAMED_GUID) {\r
-    DXE_DEPEX    DXE_DEPEX Optional      $(MODULE_NAME).depex\r
-    PE32     PE32                    $(MODULE_NAME).efi\r
+    DXE_DEPEX    DXE_DEPEX Optional      $(INF_OUTPUT)/$(MODULE_NAME).depex\r
+    PE32     PE32                    $(INF_OUTPUT)/$(MODULE_NAME).efi\r
     UI       STRING="$(MODULE_NAME)" Optional\r
     VERSION  STRING="$(INF_VERSION)" Optional BUILD_NUM=$(BUILD_NUMBER)\r
   }\r
 \r
 [Rule.Common.DXE_RUNTIME_DRIVER]\r
   FILE DRIVER = $(NAMED_GUID) {\r
-    DXE_DEPEX    DXE_DEPEX Optional      $(MODULE_NAME).depex\r
-    PE32     PE32                    $(MODULE_NAME).efi\r
+    DXE_DEPEX    DXE_DEPEX Optional      $(INF_OUTPUT)/$(MODULE_NAME).depex\r
+    PE32     PE32                    $(INF_OUTPUT)/$(MODULE_NAME).efi\r
     UI       STRING="$(MODULE_NAME)" Optional\r
     VERSION  STRING="$(INF_VERSION)" Optional BUILD_NUM=$(BUILD_NUMBER)\r
   }\r
 \r
 [Rule.Common.UEFI_APPLICATION]\r
   FILE APPLICATION = $(NAMED_GUID) {\r
-    PE32     PE32                    $(MODULE_NAME).efi\r
+    PE32     PE32                    $(INF_OUTPUT)/$(MODULE_NAME).efi\r
     UI       STRING="$(MODULE_NAME)" Optional\r
     VERSION  STRING="$(INF_VERSION)" Optional BUILD_NUM=$(BUILD_NUMBER)\r
   }\r

diff --git a/OvmfPkg/OvmfPkgIa32X64.fdf b/OvmfPkg/OvmfPkgIa32X64.fdf
index ec87b1190a0652458a678a620f4225dbbe6776f7..b6866e137b4974744b4082be1e16f3133f200874 100644 (file)
--- a/OvmfPkg/OvmfPkgIa32X64.fdf
+++ b/OvmfPkg/OvmfPkgIa32X64.fdf
@@ -260,39 +260,39 @@ FILE FREEFORM = 1BA0062E-C779-4582-8566-336AE8F78F09 {
 \r
 [Rule.Common.PEI_CORE]\r
   FILE PEI_CORE = $(NAMED_GUID) {\r
-    PE32     PE32   Align=32    $(MODULE_NAME).efi\r
+    PE32     PE32   Align=32    $(INF_OUTPUT)/$(MODULE_NAME).efi\r
     UI       STRING ="$(MODULE_NAME)" Optional\r
     VERSION  STRING ="$(INF_VERSION)" Optional BUILD_NUM=$(BUILD_NUMBER)\r
   }\r
 \r
 [Rule.Common.SEC]\r
   FILE SEC = $(NAMED_GUID) {\r
-    PE32     PE32           $(MODULE_NAME).efi\r
+    PE32     PE32           $(INF_OUTPUT)/$(MODULE_NAME).efi\r
     UI       STRING ="$(MODULE_NAME)" Optional\r
     VERSION  STRING ="$(INF_VERSION)" Optional BUILD_NUM=$(BUILD_NUMBER)\r
   }\r
 \r
 [Rule.Common.PEIM.NORELOC]\r
   FILE PEIM = $(NAMED_GUID) RELOCS_STRIPPED  {\r
-     PEI_DEPEX PEI_DEPEX Optional        $(MODULE_NAME).depex\r
-     TE        TE                        $(MODULE_NAME).efi\r
+     PEI_DEPEX PEI_DEPEX Optional        $(INF_OUTPUT)/$(MODULE_NAME).depex\r
+     TE        TE                        $(INF_OUTPUT)/$(MODULE_NAME).efi\r
      UI        STRING="$(MODULE_NAME)" Optional\r
      VERSION   STRING="$(INF_VERSION)" Optional BUILD_NUM=$(BUILD_NUMBER)\r
   }\r
 \r
 [Rule.Common.PEIM]\r
   FILE PEIM = $(NAMED_GUID) {\r
-     PEI_DEPEX PEI_DEPEX Optional        $(MODULE_NAME).depex\r
-     PE32      PE32   Align=32           $(MODULE_NAME).efi\r
+     PEI_DEPEX PEI_DEPEX Optional        $(INF_OUTPUT)/$(MODULE_NAME).depex\r
+     PE32      PE32   Align=32           $(INF_OUTPUT)/$(MODULE_NAME).efi\r
      UI       STRING="$(MODULE_NAME)" Optional\r
      VERSION  STRING="$(INF_VERSION)" Optional BUILD_NUM=$(BUILD_NUMBER)\r
   }\r
 \r
 [Rule.Common.PEIM.TIANOCOMPRESSED]\r
   FILE PEIM = $(NAMED_GUID) {\r
-    PEI_DEPEX PEI_DEPEX Optional         $(MODULE_NAME).depex\r
+    PEI_DEPEX PEI_DEPEX Optional         $(INF_OUTPUT)/$(MODULE_NAME).depex\r
     GUIDED A31280AD-481E-41B6-95E8-127F4C984779 PROCESSING_REQUIRED = TRUE {\r
-      PE32      PE32                     $(MODULE_NAME).efi\r
+      PE32      PE32                     $(INF_OUTPUT)/$(MODULE_NAME).efi\r
       UI        STRING="$(MODULE_NAME)" Optional\r
       VERSION   STRING="$(INF_VERSION)" Optional BUILD_NUM=$(BUILD_NUMBER)\r
     }\r
@@ -300,38 +300,38 @@ FILE FREEFORM = 1BA0062E-C779-4582-8566-336AE8F78F09 {
 \r
 [Rule.Common.DXE_CORE]\r
   FILE DXE_CORE = $(NAMED_GUID) {\r
-    PE32     PE32           $(MODULE_NAME).efi\r
+    PE32     PE32           $(INF_OUTPUT)/$(MODULE_NAME).efi\r
     UI       STRING="$(MODULE_NAME)" Optional\r
     VERSION  STRING="$(INF_VERSION)" Optional BUILD_NUM=$(BUILD_NUMBER)\r
   }\r
 \r
 [Rule.Common.UEFI_DRIVER]\r
   FILE DRIVER = $(NAMED_GUID) {\r
-    DXE_DEPEX    DXE_DEPEX Optional      $(MODULE_NAME).depex\r
-    PE32     PE32                    $(MODULE_NAME).efi\r
+    DXE_DEPEX    DXE_DEPEX Optional      $(INF_OUTPUT)/$(MODULE_NAME).depex\r
+    PE32     PE32                    $(INF_OUTPUT)/$(MODULE_NAME).efi\r
     UI       STRING="$(MODULE_NAME)" Optional\r
     VERSION  STRING="$(INF_VERSION)" Optional BUILD_NUM=$(BUILD_NUMBER)\r
   }\r
 \r
 [Rule.Common.DXE_DRIVER]\r
   FILE DRIVER = $(NAMED_GUID) {\r
-    DXE_DEPEX    DXE_DEPEX Optional      $(MODULE_NAME).depex\r
-    PE32     PE32                    $(MODULE_NAME).efi\r
+    DXE_DEPEX    DXE_DEPEX Optional      $(INF_OUTPUT)/$(MODULE_NAME).depex\r
+    PE32     PE32                    $(INF_OUTPUT)/$(MODULE_NAME).efi\r
     UI       STRING="$(MODULE_NAME)" Optional\r
     VERSION  STRING="$(INF_VERSION)" Optional BUILD_NUM=$(BUILD_NUMBER)\r
   }\r
 \r
 [Rule.Common.DXE_RUNTIME_DRIVER]\r
   FILE DRIVER = $(NAMED_GUID) {\r
-    DXE_DEPEX    DXE_DEPEX Optional      $(MODULE_NAME).depex\r
-    PE32     PE32                    $(MODULE_NAME).efi\r
+    DXE_DEPEX    DXE_DEPEX Optional      $(INF_OUTPUT)/$(MODULE_NAME).depex\r
+    PE32     PE32                    $(INF_OUTPUT)/$(MODULE_NAME).efi\r
     UI       STRING="$(MODULE_NAME)" Optional\r
     VERSION  STRING="$(INF_VERSION)" Optional BUILD_NUM=$(BUILD_NUMBER)\r
   }\r
 \r
 [Rule.Common.UEFI_APPLICATION]\r
   FILE APPLICATION = $(NAMED_GUID) {\r
-    PE32     PE32                    $(MODULE_NAME).efi\r
+    PE32     PE32                    $(INF_OUTPUT)/$(MODULE_NAME).efi\r
     UI       STRING="$(MODULE_NAME)" Optional\r
     VERSION  STRING="$(INF_VERSION)" Optional BUILD_NUM=$(BUILD_NUMBER)\r
   }\r

diff --git a/UnixPkg/UnixPkg.fdf b/UnixPkg/UnixPkg.fdf
index bdc9494d7712a643ef6beb1e6ec65f206634d3c1..80399cd1a5b12534fc11f932d9d7d5bf57ebf1a6 100644 (file)
--- a/UnixPkg/UnixPkg.fdf
+++ b/UnixPkg/UnixPkg.fdf
@@ -299,10 +299,10 @@ FILE FREEFORM = PCD(gEfiIntelFrameworkModulePkgTokenSpaceGuid.PcdLogoFile) {
 #  \r
 #[Rule.Common.DXE_DRIVER]\r
 #  FILE DRIVER = $(NAMED_GUID) {\r
-#    DXE_DEPEX    DXE_DEPEX Optional      $(MODULE_NAME).depex\r
+#    DXE_DEPEX    DXE_DEPEX Optional      $(INF_OUTPUT)/$(MODULE_NAME).depex\r
 #    COMPRESS PI_STD {\r
 #      GUIDED {\r
-#        PE32     PE32                    $(MODULE_NAME).efi\r
+#        PE32     PE32                    $(INF_OUTPUT)/$(MODULE_NAME).efi\r
 #        UI       STRING="$(MODULE_NAME)" Optional\r
 #        VERSION  STRING="$(INF_VERSION)" Optional BUILD_NUM=$(BUILD_NUMBER)\r
 #      }\r
@@ -313,24 +313,24 @@ FILE FREEFORM = PCD(gEfiIntelFrameworkModulePkgTokenSpaceGuid.PcdLogoFile) {
 \r
 [Rule.Common.PEI_CORE]\r
   FILE PEI_CORE = $(NAMED_GUID) {\r
-    PE32     PE32    Align=32       $(MODULE_NAME).efi\r
+    PE32     PE32    Align=32       $(INF_OUTPUT)/$(MODULE_NAME).efi\r
     UI       STRING ="$(MODULE_NAME)" Optional         \r
     VERSION  STRING ="$(INF_VERSION)" Optional BUILD_NUM=$(BUILD_NUMBER)    \r
   }\r
 \r
 [Rule.Common.PEIM]\r
   FILE PEIM = $(NAMED_GUID) {\r
-     PEI_DEPEX PEI_DEPEX Optional        $(MODULE_NAME).depex\r
-     PE32      PE32   Align=32       $(MODULE_NAME).efi\r
+     PEI_DEPEX PEI_DEPEX Optional        $(INF_OUTPUT)/$(MODULE_NAME).depex\r
+     PE32      PE32   Align=32       $(INF_OUTPUT)/$(MODULE_NAME).efi\r
      UI       STRING="$(MODULE_NAME)" Optional         \r
      VERSION  STRING="$(INF_VERSION)" Optional BUILD_NUM=$(BUILD_NUMBER)   \r
   }\r
 \r
 [Rule.Common.PEIM.TIANOCOMPRESSED]\r
   FILE PEIM = $(NAMED_GUID) {\r
-    PEI_DEPEX PEI_DEPEX Optional         $(MODULE_NAME).depex\r
+    PEI_DEPEX PEI_DEPEX Optional         $(INF_OUTPUT)/$(MODULE_NAME).depex\r
     GUIDED A31280AD-481E-41B6-95E8-127F4C984779 PROCESSING_REQUIRED = TRUE {\r
-      PE32      PE32                     $(MODULE_NAME).efi\r
+      PE32      PE32                     $(INF_OUTPUT)/$(MODULE_NAME).efi\r
       UI        STRING="$(MODULE_NAME)" Optional\r
       VERSION   STRING="$(INF_VERSION)" Optional BUILD_NUM=$(BUILD_NUMBER)\r
     }\r
@@ -339,7 +339,7 @@ FILE FREEFORM = PCD(gEfiIntelFrameworkModulePkgTokenSpaceGuid.PcdLogoFile) {
 [Rule.Common.DXE_CORE]\r
   FILE DXE_CORE = $(NAMED_GUID) {\r
     COMPRESS PI_STD {\r
-      PE32     PE32           $(MODULE_NAME).efi\r
+      PE32     PE32           $(INF_OUTPUT)/$(MODULE_NAME).efi\r
       UI       STRING="$(MODULE_NAME)" Optional\r
       VERSION  STRING="$(INF_VERSION)" Optional BUILD_NUM=$(BUILD_NUMBER)\r
     }\r
@@ -347,10 +347,10 @@ FILE FREEFORM = PCD(gEfiIntelFrameworkModulePkgTokenSpaceGuid.PcdLogoFile) {
 \r
 [Rule.Common.UEFI_DRIVER]\r
   FILE DRIVER = $(NAMED_GUID) {\r
-    DXE_DEPEX    DXE_DEPEX Optional      $(MODULE_NAME).depex\r
+    DXE_DEPEX    DXE_DEPEX Optional      $(INF_OUTPUT)/$(MODULE_NAME).depex\r
     COMPRESS PI_STD {\r
       GUIDED {\r
-        PE32     PE32                    $(MODULE_NAME).efi\r
+        PE32     PE32                    $(INF_OUTPUT)/$(MODULE_NAME).efi\r
         UI       STRING="$(MODULE_NAME)" Optional\r
         VERSION  STRING="$(INF_VERSION)" Optional BUILD_NUM=$(BUILD_NUMBER)\r
       }\r
@@ -359,10 +359,10 @@ FILE FREEFORM = PCD(gEfiIntelFrameworkModulePkgTokenSpaceGuid.PcdLogoFile) {
 \r
 [Rule.Common.DXE_DRIVER]\r
   FILE DRIVER = $(NAMED_GUID) {\r
-    DXE_DEPEX    DXE_DEPEX Optional      $(MODULE_NAME).depex\r
+    DXE_DEPEX    DXE_DEPEX Optional      $(INF_OUTPUT)/$(MODULE_NAME).depex\r
     COMPRESS PI_STD {\r
       GUIDED {\r
-        PE32     PE32                    $(MODULE_NAME).efi\r
+        PE32     PE32                    $(INF_OUTPUT)/$(MODULE_NAME).efi\r
         UI       STRING="$(MODULE_NAME)" Optional\r
         VERSION  STRING="$(INF_VERSION)" Optional BUILD_NUM=$(BUILD_NUMBER)\r
       }\r
@@ -371,10 +371,10 @@ FILE FREEFORM = PCD(gEfiIntelFrameworkModulePkgTokenSpaceGuid.PcdLogoFile) {
 \r
 [Rule.Common.DXE_RUNTIME_DRIVER]\r
   FILE DRIVER = $(NAMED_GUID) {\r
-    DXE_DEPEX    DXE_DEPEX Optional      $(MODULE_NAME).depex\r
+    DXE_DEPEX    DXE_DEPEX Optional      $(INF_OUTPUT)/$(MODULE_NAME).depex\r
     COMPRESS PI_STD {\r
       GUIDED {\r
-        PE32     PE32                    $(MODULE_NAME).efi\r
+        PE32     PE32                    $(INF_OUTPUT)/$(MODULE_NAME).efi\r
         UI       STRING="$(MODULE_NAME)" Optional\r
         VERSION  STRING="$(INF_VERSION)" Optional BUILD_NUM=$(BUILD_NUMBER)\r
       }\r
@@ -385,7 +385,7 @@ FILE FREEFORM = PCD(gEfiIntelFrameworkModulePkgTokenSpaceGuid.PcdLogoFile) {
   FILE APPLICATION = $(NAMED_GUID) {\r
     COMPRESS PI_STD {\r
       GUIDED {\r
-        PE32     PE32                    $(MODULE_NAME).efi\r
+        PE32     PE32                    $(INF_OUTPUT)/$(MODULE_NAME).efi\r
         UI       STRING="$(MODULE_NAME)" Optional\r
         VERSION  STRING="$(INF_VERSION)" Optional BUILD_NUM=$(BUILD_NUMBER)\r
       }\r