1. Removed the unnecessary #include statements and include files

2. Removed the unnecessary library and include path from MSA files


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

Tools/Source/TianoTools/GuidChk/GuidList.c

@@ -39,14 +39,12 @@ Notes:
 #include <stdlib.h>
 #include <ctype.h>
 
-#include <Base.h>
-#include <UefiBaseTypes.h>
-#include <UgaDraw.h>
+#include <Common/UefiBaseTypes.h>
+#include <Guid/Apriori.h>
+#include <Guid/AcpiTableStorage.h>
+
 #include "EfiUtilityMsgs.h"
 
-#include <Apriori.h>
-#include <AcpiTableStorage.h>
-// #include <Bmp.h>
 
 #define GUID_XREF(varname, guid) { \
     #varname, #guid, guid \

Tools/Source/TianoTools/GuidChk/UtilsMsgs.c

@@ -25,8 +25,8 @@ Abstract:
 #include <ctype.h>
 #include <stdarg.h>
 
-#include <Base.h>
-#include <UefiBaseTypes.h>
+#include <Common/UefiBaseTypes.h>
+
 #include "EfiUtilityMsgs.h"
 
 #define MAX_LINE_LEN  200

Tools/Source/TianoTools/GuidChk/build.xml

@@ -61,22 +61,22 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
       </echo>
     </else>
     </if>
-		<if>
-		  <equals arg1="${ToolChain}" arg2="msvc"/>
-			<then>
+    <if>
+      <equals arg1="${ToolChain}" arg2="msvc"/>
+      <then>
         <property name="ext_static" value=".lib"/>
         <property name="ext_dynamic" value=".dll"/>
         <property name="ext_exe" value=".exe"/>
-			</then>
-			<elseif>
-			  <equals arg1="${ToolChain}" arg2="gcc"/>
-				<then>
+      </then>
+      <elseif>
+        <equals arg1="${ToolChain}" arg2="gcc"/>
+        <then>
           <property name="ext_static" value=".a"/>
           <property name="ext_dynamic" value=".so"/>
           <property name="ext_exe" value=""/>
-				</then>
-			</elseif>
-		</if>
+        </then>
+      </elseif>
+    </if>
   </target>
 
   <target name="Tool" depends="init" unless="gcc">
@@ -93,12 +93,8 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
 
       <includepath path="${PACKAGE_DIR}/Include"/>
       <includepath path="${PACKAGE_DIR}/Include/Ia32"/>
-      <includepath path="${PACKAGE_DIR}/Include/Common"/>
-      <includepath path="${PACKAGE_DIR}/Include/Guid"/>
-      <includepath path="${PACKAGE_DIR}/Include/Protocol"/>
       <includepath path="${PACKAGE_DIR}/Common"/>
-			<linkerarg value="${LIB_DIR}/CommonTools.lib"/>
-			<linkerarg value="${LIB_DIR}/CustomizedCompress.lib"/>
+      <libset dir="${LIB_DIR}" libs="CommonTools"/>
 
     </cc>
   </target>