Updated *.dec files and .h files to support correct include path scheme

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

diff --git a/IntelFrameworkPkg/IntelFrameworkPkg.dec b/IntelFrameworkPkg/IntelFrameworkPkg.dec
index 71c1b6b357fec3d9ad2823f14d7e636fd8125af9..67d9a66e6dd54570fe61fcfdad8c8173e8c82ed1 100644 (file)
--- a/IntelFrameworkPkg/IntelFrameworkPkg.dec
+++ b/IntelFrameworkPkg/IntelFrameworkPkg.dec
@@ -38,8 +38,7 @@
 #\r
 ################################################################################\r
 [Includes.common]\r
-  Include                        # BASE\r
-\r
+  Include                        # Root include for the package\r
 \r
 ################################################################################\r
 #\r

diff --git a/MdeModulePkg/Application/HelloWorld/HelloWorld.inf b/MdeModulePkg/Application/HelloWorld/HelloWorld.inf
index dbe69fced244bd595d11baad549c6d848bc6ef6d..80eba65750a276236a8982588a189cd9cea8faa9 100644 (file)
--- a/MdeModulePkg/Application/HelloWorld/HelloWorld.inf
+++ b/MdeModulePkg/Application/HelloWorld/HelloWorld.inf
@@ -64,8 +64,8 @@
 ################################################################################\r
 \r
 [Packages]\r
-  $(WORKSPACE)/MdeModulePkg/MdeModulePkg.dec\r
   $(WORKSPACE)/MdePkg/MdePkg.dec\r
+  $(WORKSPACE)/MdeModulePkg/MdeModulePkg.dec\r
 \r
 \r
 ################################################################################\r

diff --git a/MdeModulePkg/MdeModulePkg.dec b/MdeModulePkg/MdeModulePkg.dec
index 26663663be314e2a67ca3bfd4e56f9e0a0b83749..700939fe505dc56898cfb9ea4c471663c3411e2f 100644 (file)
--- a/MdeModulePkg/MdeModulePkg.dec
+++ b/MdeModulePkg/MdeModulePkg.dec
@@ -28,7 +28,8 @@
   PACKAGE_GUID                   = BA0D78D6-2CAF-414b-BD4D-B6762A894288\r
   PACKAGE_VERSION                = 0.1\r
 \r
-\r
+[Includes.common]\r
+  Include                        \r
 \r
 ################################################################################\r
 #\r
@@ -62,13 +63,6 @@
   gEfiMdePkgTokenSpaceGuid       = { 0xA1AFF049, 0xFDEB, 0x442a, { 0xB3, 0x20, 0x13, 0xAB, 0x4C, 0xB7, 0x2B, 0xBC }}\r
 \r
 \r
-[Includes.common]\r
-  Include                        \r
-  Include/Library                \r
-  Include/Ppi                    \r
-  Include/Common                 \r
-  Include/Protocol               \r
-\r
 ################################################################################\r
 #\r
 # Global Protocols Definition section - list of Global Protocols C Name Data\r

diff --git a/MdePkg/MdePkg.dec b/MdePkg/MdePkg.dec
index 5f6d8176f9c6e1aef5e264da171acc92457cd98e..0a84e9a96f80f451b294a4235eb9b086a5b8f53e 100644 (file)
--- a/MdePkg/MdePkg.dec
+++ b/MdePkg/MdePkg.dec
@@ -40,26 +40,19 @@
 #\r
 ################################################################################\r
 [Includes.common]\r
-  Include                        # Base PiPei PiDxe Uefi\r
-  Include/Guid                   # GUIDs that are declared by the MDE Package\r
-  Include/Library                # All Mde Libraries\r
-  Include/IndustryStandard       # Acpi Pci22 Scsi Usb SmBus\r
-  Include/Protocol               # The summary of protocols introduced by UEFI2.0/UEFI2.1/EFI1.1/PI1.0\r
-  Include/Ppi                    # All PPIs defined in PI1.0\r
-  Include/Pi                     # PI definitions\r
-  Include/Uefi                   # UEFI definitions\r
+  Include                        # Root include for the package\r
 \r
 [Includes.Ia32]\r
-  Include/Ia32                   # ProcessorBind\r
+  Include/Ia32                   # Processor specific include path for pacakge\r
 \r
 [Includes.X64]\r
-  Include/x64                    # ProcessorBind\r
+  Include/x64                    # Processor specific include path for pacakge\r
 \r
 [Includes.IPF]\r
-  Include/Ipf                    # IpfDefines IpfMacro ProcessorBind SalApi\r
+  Include/Ipf                    # Processor specific include path for pacakge\r
 \r
 [Includes.EBC]\r
-  Include/Ebc                    # ProcessorBind\r
+  Include/Ebc                    # Processor specific include path for pacakge\r
 \r
 ################################################################################\r
 #\r

diff --git a/Nt32Pkg/Include/Library/WinNtLib.h b/Nt32Pkg/Include/Library/WinNtLib.h
index 9210a572b575507459bd4de679dea5f3e8a84bd3..0d202257c417309de5e6daf461643e1d7928d987 100644 (file)
--- a/Nt32Pkg/Include/Library/WinNtLib.h
+++ b/Nt32Pkg/Include/Library/WinNtLib.h
@@ -1,28 +1,22 @@
-/*++\r
-\r
-Copyright (c) 2006, Intel Corporation                                                         \r
-All rights reserved. This program and the accompanying materials                          \r
-are licensed and made available under the terms and conditions of the BSD License         \r
-which accompanies this distribution.  The full text of the license may be found at        \r
-http://opensource.org/licenses/bsd-license.php                                            \r
-                                                                                          \r
-THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,                     \r
-WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.             \r
-\r
-Module Name:\r
-\r
-  WinNtLib.h\r
+/** @file\r
+  Public include file for the WinNt Library\r
 \r
-Abstract:\r
+Copyright (c) 2006 - 2007, Intel Corporation\r
+All rights reserved. This program and the accompanying materials\r
+are licensed and made available under the terms and conditions of the BSD License\r
+which accompanies this distribution.  The full text of the license may be found at\r
+http://opensource.org/licenses/bsd-license.php\r
 \r
-  Public include file for the WinNt Library\r
+THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,\r
+WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.\r
 \r
---*/\r
+**/\r
 \r
 #ifndef __WIN_NT_LIB_H__\r
 #define __WIN_NT_LIB_H__\r
 \r
-#include <WinNtThunk.h>\r
+#include <Protocol/WinNtThunk.h>\r
+\r
 extern EFI_WIN_NT_THUNK_PROTOCOL  *gWinNt;\r
 \r
-#endif
\ No newline at end of file
+#endif\r

diff --git a/Nt32Pkg/Nt32Pkg.dec b/Nt32Pkg/Nt32Pkg.dec
index 0476aeb28b8b073dd1c3f0b7c47f7c786bda8653..02c19e005abce663c094f610ff630dd464474a3a 100644 (file)
--- a/Nt32Pkg/Nt32Pkg.dec
+++ b/Nt32Pkg/Nt32Pkg.dec
@@ -37,11 +37,7 @@
 #\r
 ################################################################################\r
 [Includes.common]\r
-  Include                        # FlashLayout WinNtDxe WinNtPeim\r
-  Include/Library                # EdkGenericBdsLib WinNtLib\r
-  Include/Ppi                    # NtAutoscan NtFwh NtPeiLoadFile NtThunk\r
-  Include/Common                 # WinNTInclude\r
-  Include/Protocol               # WinNtIo WinNtThunk\r
+  Include                        # Root include for the package\r
 \r
 \r
 ################################################################################\r