From ce53a8c3b23b6e6a483a4d626be59f122c6763ae Mon Sep 17 00:00:00 2001
From: yshi8 <yshi8@6f19259b-4bc3-4df7-8a09-765794883524>
Date: Fri, 16 Jun 2006 11:42:42 +0000
Subject: 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/GenFvImage/GenFvImageLib.c | 26 +++++++++++-----------
 Tools/Source/TianoTools/GenFvImage/GenFvImageLib.h |  4 +++-
 .../TianoTools/GenFvImage/GenFvImageLibInternal.h  |  8 ++++---
 Tools/Source/TianoTools/GenFvImage/build.xml       |  8 ++-----
 4 files changed, 23 insertions(+), 23 deletions(-)

(limited to 'Tools/Source/TianoTools/GenFvImage')

diff --git a/Tools/Source/TianoTools/GenFvImage/GenFvImageLib.c b/Tools/Source/TianoTools/GenFvImage/GenFvImageLib.c
index 6cc5a0d56f..379818b7ed 100644
--- a/Tools/Source/TianoTools/GenFvImage/GenFvImageLib.c
+++ b/Tools/Source/TianoTools/GenFvImage/GenFvImageLib.c
@@ -23,8 +23,6 @@ Abstract:
 //
 // Include files
 //
-#define EFI_SPECIFICATION_VERSION 0x00020000
-#define EDK_RELEASE_VERSION       0x00020000
 #ifdef __GNUC__
 #include <uuid/uuid.h>
 #include <sys/stat.h>
@@ -34,19 +32,21 @@ Abstract:
 #include <io.h>
 #endif
 #include <assert.h>
-#include <Dxe.h>
-#include <Library/PeCoffLib.h>
+
+#include <Common/UefiBaseTypes.h>
+#include <Common/FirmwareVolumeImageFormat.h>
+#include <Common/Variable.h>
+#include <Common/WorkingBlockHeader.h>
+#include <Guid/FirmwareFileSystem.h>
+
 #include "GenFvImageLib.h"
 #include "GenFvImageLibInternal.h"
-#include <CommonLib.h>
-#include <FirmwareVolumeImageFormat.h>
-#include <Crc32.h>
-#include <EfiUtilityMsgs.h>
-#include <FvLib.h>
-#include <EfiCompress.h>
-#include <Variable.h>
-#include <WinNtInclude.h>
-#include <WorkingBlockHeader.h>
+#include "CommonLib.h"
+#include "Crc32.h"
+#include "EfiUtilityMsgs.h"
+#include "FvLib.h"
+#include "EfiCompress.h"
+#include "WinNtInclude.h"
 
 
 //
diff --git a/Tools/Source/TianoTools/GenFvImage/GenFvImageLib.h b/Tools/Source/TianoTools/GenFvImage/GenFvImageLib.h
index cc761b8e5a..47a5a3b1b2 100644
--- a/Tools/Source/TianoTools/GenFvImage/GenFvImageLib.h
+++ b/Tools/Source/TianoTools/GenFvImage/GenFvImageLib.h
@@ -26,7 +26,9 @@ Abstract:
 //
 // Include files
 //
-// #include "Efi2WinNT.h"
+#include <Common/UefiBaseTypes.h>
+#include <Common/MultiPhase.h>
+
 #include "ParseInf.h"
 
 //
diff --git a/Tools/Source/TianoTools/GenFvImage/GenFvImageLibInternal.h b/Tools/Source/TianoTools/GenFvImage/GenFvImageLibInternal.h
index f38fe1151a..cff3b1aea4 100644
--- a/Tools/Source/TianoTools/GenFvImage/GenFvImageLibInternal.h
+++ b/Tools/Source/TianoTools/GenFvImage/GenFvImageLibInternal.h
@@ -26,10 +26,12 @@ Abstract:
 //
 // Include files
 //
-#include "GenFvImageLib.h"
 #include <stdlib.h>
-#include <CommonLib.h>
-#include "FirmwareVolumeHeader.h"
+
+#include <Common/FirmwareVolumeHeader.h>
+
+#include "CommonLib.h"
+#include "GenFvImageLib.h"
 
 //
 // Private data declarations
diff --git a/Tools/Source/TianoTools/GenFvImage/build.xml b/Tools/Source/TianoTools/GenFvImage/build.xml
index cc2141d3bb..15fbf7cb35 100644
--- a/Tools/Source/TianoTools/GenFvImage/build.xml
+++ b/Tools/Source/TianoTools/GenFvImage/build.xml
@@ -123,14 +123,10 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
 
       <includepath path="${PACKAGE_DIR}/${ToolName}"/>
       <includepath path="${PACKAGE_DIR}/Include"/>
-      <includepath path="${PACKAGE_DIR}/Include"/>
       <includepath path="${PACKAGE_DIR}/Include/Ia32"/>
-      <includepath path="${PACKAGE_DIR}/Include/Common"/>
-      <includepath path="${PACKAGE_DIR}/Include/Protocol"/>
-      <includepath path="${PACKAGE_DIR}/Include/Library"/>
-      <includepath path="${PACKAGE_DIR}/Include/ToBeRemoved"/>
       <includepath path="${PACKAGE_DIR}/Common"/>
-      <libset dir="${LIB_DIR}" libs="CommonTools CustomizedCompress"/>
+      <libset dir="${LIB_DIR}" libs="CommonTools"/>
+
       <linkerarg value="/nodefaultlib:libc.lib" unless="gcc"/>
       <syslibset dir="${syslibdirs}" libs="${syslibs}" if="gcc"/>
       <syslibset libs="RpcRT4" unless="gcc"/>
-- 
cgit v1.2.3