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

IntelFrameworkPkg/IntelFrameworkPkg.dec

@@ -38,8 +38,7 @@
 #
 ################################################################################
 [Includes.common]
-  Include                        # BASE
+  Include                        # Root include for the package
-
 
 ################################################################################
 #

MdeModulePkg/Application/HelloWorld/HelloWorld.inf

@@ -64,8 +64,8 @@
 ################################################################################
 
 [Packages]
-  $(WORKSPACE)/MdeModulePkg/MdeModulePkg.dec
   $(WORKSPACE)/MdePkg/MdePkg.dec
+  $(WORKSPACE)/MdeModulePkg/MdeModulePkg.dec
 
 
 ################################################################################

MdeModulePkg/MdeModulePkg.dec

@@ -28,7 +28,8 @@
   PACKAGE_GUID                   = BA0D78D6-2CAF-414b-BD4D-B6762A894288
   PACKAGE_VERSION                = 0.1
 
-
+[Includes.common]
+  Include                        
 
 ################################################################################
 #
@@ -62,13 +63,6 @@
   gEfiMdePkgTokenSpaceGuid       = { 0xA1AFF049, 0xFDEB, 0x442a, { 0xB3, 0x20, 0x13, 0xAB, 0x4C, 0xB7, 0x2B, 0xBC }}
 
 
-[Includes.common]
-  Include                        
-  Include/Library                
-  Include/Ppi                    
-  Include/Common                 
-  Include/Protocol               
-
 ################################################################################
 #
 # Global Protocols Definition section - list of Global Protocols C Name Data

MdePkg/MdePkg.dec

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

Nt32Pkg/Include/Library/WinNtLib.h

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

Nt32Pkg/Nt32Pkg.dec

@@ -37,11 +37,7 @@
 #
 ################################################################################
 [Includes.common]
-  Include                        # FlashLayout WinNtDxe WinNtPeim
+  Include                        # Root include for the package
-  Include/Library                # EdkGenericBdsLib WinNtLib
-  Include/Ppi                    # NtAutoscan NtFwh NtPeiLoadFile NtThunk
-  Include/Common                 # WinNTInclude
-  Include/Protocol               # WinNtIo WinNtThunk
 
 
 ################################################################################