From af1dd46d37b6f6e3f9bed4c6a485d0c4832a2dd6 Mon Sep 17 00:00:00 2001
From: lhauch <lhauch@6f19259b-4bc3-4df7-8a09-765794883524>
Date: Tue, 1 Aug 2006 23:58:18 +0000
Subject: Updated to handle cygwin/gcc and moved msvc,gcc property settings to
 the TianoTools/build.xml file.  Properties are inherited, so we only need to
 set them one.  Cleaned up clean and cleanall targets to remove the
 executables and library files.  Added makefile.cygwin to antlr and dlg
 programs to generate the .exe needed for cygwin.

FlashMap.c needed a newline at the end of the file to remove a warning message in cygwin.


git-svn-id: https://edk2.svn.sourceforge.net/svnroot/edk2/trunk/edk2@1174 6f19259b-4bc3-4df7-8a09-765794883524
---
 Tools/Source/TianoTools/Common/build.xml           |  62 +-----
 Tools/Source/TianoTools/CompressDll/build.xml      |  69 ++-----
 Tools/Source/TianoTools/CreateMtFile/build.xml     |  58 +-----
 .../Source/TianoTools/CustomizedCompress/build.xml |  69 ++-----
 Tools/Source/TianoTools/EfiCompress/build.xml      |  58 +-----
 Tools/Source/TianoTools/EfiRom/build.xml           |  58 +-----
 Tools/Source/TianoTools/FlashMap/FlashMap.c        |   3 +-
 Tools/Source/TianoTools/FlashMap/build.xml         |  58 +-----
 Tools/Source/TianoTools/FwImage/build.xml          |  57 +-----
 Tools/Source/TianoTools/GenAcpiTable/build.xml     |  58 +-----
 Tools/Source/TianoTools/GenCRC32Section/build.xml  |  57 +-----
 Tools/Source/TianoTools/GenCapsuleHdr/build.xml    |  59 +-----
 Tools/Source/TianoTools/GenDepex/build.xml         |  57 +-----
 Tools/Source/TianoTools/GenFfsFile/build.xml       |  58 +-----
 Tools/Source/TianoTools/GenFvImage/build.xml       | 116 ++++-------
 Tools/Source/TianoTools/GenSection/build.xml       |  58 +-----
 Tools/Source/TianoTools/GenTEImage/build.xml       |  58 +-----
 Tools/Source/TianoTools/GuidChk/build.xml          |  67 ++-----
 Tools/Source/TianoTools/MakeDeps/build.xml         |  58 +-----
 Tools/Source/TianoTools/ModifyInf/build.xml        |  58 +-----
 Tools/Source/TianoTools/Pccts/antlr/build.xml      | 119 +++++------
 Tools/Source/TianoTools/Pccts/antlr/makefile       |   6 +-
 .../Source/TianoTools/Pccts/antlr/makefile.cygwin  | 219 +++++++++++++++++++++
 Tools/Source/TianoTools/Pccts/antlr/makefile1      |   6 +-
 Tools/Source/TianoTools/Pccts/build.xml            |  65 ++----
 Tools/Source/TianoTools/Pccts/dlg/build.xml        |  87 +++-----
 Tools/Source/TianoTools/Pccts/dlg/makefile         |   6 +-
 Tools/Source/TianoTools/Pccts/dlg/makefile.cygwin  | 157 +++++++++++++++
 Tools/Source/TianoTools/PeCoffLoader/build.xml     |  63 ++----
 Tools/Source/TianoTools/PeiRebase/build.xml        |  61 +-----
 .../TianoTools/SecApResetVectorFixup/build.xml     |  58 +-----
 Tools/Source/TianoTools/SecFixup/build.xml         |  58 +-----
 Tools/Source/TianoTools/SetStamp/build.xml         |  58 +-----
 Tools/Source/TianoTools/SplitFile/build.xml        |  58 +-----
 Tools/Source/TianoTools/StrGather/build.xml        |  58 +-----
 Tools/Source/TianoTools/String/build.xml           |  59 +-----
 Tools/Source/TianoTools/Strip/build.xml            |  58 +-----
 Tools/Source/TianoTools/TianoTools.msa             |  27 ++-
 Tools/Source/TianoTools/VfrCompile/VfrCompile.g    |   1 +
 Tools/Source/TianoTools/VfrCompile/build.xml       |  98 ++++-----
 Tools/Source/TianoTools/ZeroDebugData/build.xml    |  62 +-----
 Tools/Source/TianoTools/build.xml                  | 176 +++++++++++++----
 42 files changed, 956 insertions(+), 1800 deletions(-)
 create mode 100644 Tools/Source/TianoTools/Pccts/antlr/makefile.cygwin
 create mode 100644 Tools/Source/TianoTools/Pccts/dlg/makefile.cygwin

diff --git a/Tools/Source/TianoTools/Common/build.xml b/Tools/Source/TianoTools/Common/build.xml
index b4becb71d5..b794bd7f14 100644
--- a/Tools/Source/TianoTools/Common/build.xml
+++ b/Tools/Source/TianoTools/Common/build.xml
@@ -20,59 +20,18 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
   <taskdef resource="net/sf/antcontrib/antlib.xml"/>
 
   <property name="tmp" value="tmp"/>
+  <property name="LibName" value="CommonTool"/>
 
   <property name="LINK_OUTPUT_TYPE" value="static"/>
   <property name="BUILD_DIR" value="${PACKAGE_DIR}/Common/tmp"/>
 
   <target name="CommonTools.lib" depends="init, ToolsLibrary">
-    <echo message="Building the EDK CommonTools Library"/>
+    <echo message="The EDK Tool Library: ${LibName} build has completed."/>
   </target>
 
   <target name="init">
-    <echo message="The EDK CommonTools Library"/>
+    <echo message="Building the EDK Tool Library: ${LibName}"/>
     <mkdir dir="${BUILD_DIR}"/>
-    <if>
-      <equals arg1="${GCC}" arg2="cygwin"/>
-      <then>
-        <echo message="Cygwin Family"/>
-        <property name="ToolChain" value="gcc"/>
-      </then>
-    <elseif>
-      <os family="dos"/>
-      <then>
-        <echo message="Windows Family"/>
-        <property name="ToolChain" value="msvc"/>
-      </then>
-    </elseif>
-    <elseif>
-      <os family="unix"/>
-      <then>
-        <echo message="UNIX Family"/>
-        <property name="ToolChain" value="gcc"/>
-      </then>
-    </elseif>
-
-    <else>
-      <echo>
-        Unsupported Operating System
-        Please Contact Intel Corporation
-      </echo>
-    </else>
-    </if>
-    <if>
-      <equals arg1="${ToolChain}" arg2="msvc"/>
-      <then>
-        <property name="ext_static" value=".lib"/>
-        <property name="ext_dynamic" value=".dll"/>
-      </then>
-      <elseif>
-        <equals arg1="${ToolChain}" arg2="gcc"/>
-        <then>
-          <property name="ext_static" value=".a"/>
-          <property name="ext_dynamic" value=".so"/>
-        </then>
-      </elseif>
-    </if>
   </target>
 
   <target name="ToolsLibrary" depends="init">
@@ -91,17 +50,16 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
     </cc>
   </target>
 
-  <target name="clean" depends="init">
+  <target name="clean">
     <echo message="Removing Intermediate Files Only from ${BUILD_DIR}"/>  
-    <delete>
-      <fileset dir="${BUILD_DIR}" includes="*.obj"/>
-    </delete>
+    <delete dir="${BUILD_DIR}"/>
   </target>
 
-  <target name="cleanall" depends="init">
-    <echo message="Removing Object Files and the Library: CommonTools${ext_static}"/>  
-    <delete dir="${BUILD_DIR}" failonerror="false">
-      <fileset dir="${LIB_DIR}" includes="CommonTools${ext_static}"/>
+  <target name="cleanall">
+    <echo message="Removing Object Files and the Library: ${LibName}${ext_static}"/>  
+    <delete failonerror="false" quiet="true" includeEmptyDirs="true">
+      <fileset dir="${BUILD_DIR}"/>
+      <fileset file="${LIB_DIR}/${LibName}${ext_static}"/>
     </delete>
   </target>
 
diff --git a/Tools/Source/TianoTools/CompressDll/build.xml b/Tools/Source/TianoTools/CompressDll/build.xml
index 28cd4aec74..ff80a6c4ed 100644
--- a/Tools/Source/TianoTools/CompressDll/build.xml
+++ b/Tools/Source/TianoTools/CompressDll/build.xml
@@ -11,12 +11,11 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
 -->
 <project default="GenTool" basedir=".">
 <!--
-    EDK GenDepex Tool
+    EDK CompressDll Tool Library
   Copyright (c) 2006, Intel Corporation
 -->
 
   <property name="WORKSPACE" value="${env.WORKSPACE}"/>
-  <property name="ToolName" value="CompressDll"/>
   <property name="LibName" value="CompressDll"/>
   <property name="FileSet" value="CompressDll.c CompressDll.h"/>
   <property name="LibFileSet" value="CompressDll.c DepexParser.h"/>
@@ -26,56 +25,15 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
   <taskdef resource="net/sf/antcontrib/antlib.xml"/>
 
   <property name="LINK_OUTPUT_TYPE" value="static"/>
-  <property name="BUILD_DIR" value="${WORKSPACE}/Tools/Source/TianoTools/${ToolName}/tmp"/>
+  <property name="BUILD_DIR" value="${WORKSPACE}/Tools/Source/TianoTools/${LibName}/tmp"/>
 
   <target name="GenTool" depends="init,Lib" >
-    <echo message="Building the EDK Tool: ${ToolName}"/>
+    <echo message="The EDK Tool Library: ${LibName} build has completed!"/>
   </target>
 
   <target name="init">
-    <echo message="The EDK Tool: ${ToolName}"/>
+    <echo message="Building the EDK Tool Library: ${LibName}"/>
     <mkdir dir="${BUILD_DIR}"/>
-    <if>
-      <equals arg1="${GCC}" arg2="cygwin"/>
-      <then>
-        <echo message="Cygwin Family"/>
-        <property name="ToolChain" value="gcc"/>
-      </then>
-      <elseif>
-        <os family="dos"/>
-        <then>
-          <echo message="Windows Family"/>
-          <property name="ToolChain" value="msvc"/>
-        </then>
-      </elseif>
-      <elseif>
-        <os family="unix"/>
-        <then>
-          <echo message="UNIX Family"/>
-          <property name="ToolChain" value="gcc"/>
-        </then>
-      </elseif>
-      <else>
-        <echo>Unsupported Operating System
-        Please Contact Intel Corporation</echo>
-      </else>
-    </if>
-    <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>
-          <property name="ext_static" value=".a"/>
-          <property name="ext_dynamic" value=".so"/>
-          <property name="ext_exe" value=""/>
-        </then>
-      </elseif>
-    </if>
   </target>
   
   <target name="Lib" depends="init">
@@ -86,31 +44,32 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
       outfile="${BIN_DIR}/${LibName}"
       outputfileproperty="result"
       >
-      <fileset dir="${ToolName}" includes="${LibFileSet}" defaultexcludes="TRUE" excludes="*.xml *.inf"/>
+      <fileset dir="${LibName}" includes="${LibFileSet}" defaultexcludes="TRUE" excludes="*.xml *.inf"/>
       <includepath path="${PACKAGE_DIR}/Include"/>
       <includepath path="${PACKAGE_DIR}/Include/${HostArch}"/>
       <includepath path="${PACKAGE_DIR}/Common"/>
       <includepath path="${env.JAVA_HOME}/include"/>
-      <includepath path="${env.JAVA_HOME}/include/linux" if="gcc"/>
-      <includepath path="${env.JAVA_HOME}/include/win32" if="windows"/>
+      <includepath path="${env.JAVA_HOME}/include/linux" if="cyglinux"/>
+      <includepath path="${env.JAVA_HOME}/include/win32" if="msft"/>
       <libset dir="${LIB_DIR}" libs="CommonTools"/>
-      <syslibset libs="kernel32" unless="gcc"/>
+      <syslibset libs="kernel32" if="msft"/>
     </cc>
     <copy file="${result}" tofile="${BIN_DIR}/CompressDll.dll"/>
     <chmod file="${BIN_DIR}/CompressDll.dll" perm="ugo+x"/>
   </target>
 
-  <target name="clean" depends="init">
+  <target name="clean">
     <echo message="Removing Intermediate Files Only"/>
     <delete>
       <fileset dir="${BUILD_DIR}" includes="*.obj"/>
     </delete>
   </target>
 
-  <target name="cleanall" depends="init">
-    <echo message="Removing Object Files and the Executable: ${ToolName}${ext_exe}"/>
-    <delete dir="${BUILD_DIR}">
-      <fileset dir="${BIN_DIR}" includes="${ToolName}${ext_dynamic}"/>
+  <target name="cleanall">
+    <echo message="Removing Object Files and the Executable: ${LibName}${ext_shared}"/>
+    <delete failonerror="false" quiet="true" includeEmptyDirs="true">
+      <fileset dir="${BUILD_DIR}"/>
+      <fileset file="${BIN_DIR}/${LibName}.*"/>
     </delete>
   </target>
 </project>
diff --git a/Tools/Source/TianoTools/CreateMtFile/build.xml b/Tools/Source/TianoTools/CreateMtFile/build.xml
index 67142578b3..317ccad411 100644
--- a/Tools/Source/TianoTools/CreateMtFile/build.xml
+++ b/Tools/Source/TianoTools/CreateMtFile/build.xml
@@ -25,63 +25,18 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
   <property name="BUILD_DIR" value="${PACKAGE_DIR}/${ToolName}/tmp"/>
 
   <target name="GenTool" depends="init, Tool">
-    <echo message="Building the EDK Tool: ${ToolName}"/>
+    <echo message="The EDK Tool: ${ToolName} build has completed!"/>
   </target>
 
   <target name="init">
-    <echo message="The EDK Tool: ${ToolName}"/>
+    <echo message="Building the EDK Tool: ${ToolName}"/>
     <mkdir dir="${BUILD_DIR}"/>
-    <if>
-      <equals arg1="${GCC}" arg2="cygwin"/>
-      <then>
-        <echo message="Cygwin Family"/>
-        <property name="ToolChain" value="gcc"/>
-      </then>
-    <elseif>
-      <os family="dos"/>
-      <then>
-        <echo message="Windows Family"/>
-        <property name="ToolChain" value="msvc"/>
-      </then>
-    </elseif>
-    <elseif>
-      <os family="unix"/>
-      <then>
-        <echo message="UNIX Family"/>
-        <property name="ToolChain" value="gcc"/>
-      </then>
-    </elseif>
-
-    <else>
-      <echo>
-        Unsupported Operating System
-        Please Contact Intel Corporation
-      </echo>
-    </else>
-    </if>
-    <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>
-          <property name="ext_static" value=".a"/>
-          <property name="ext_dynamic" value=".so"/>
-          <property name="ext_exe" value=""/>
-        </then>
-      </elseif>
-    </if>
   </target>
 
   <target name="Tool" depends="init">
     <cc name="${ToolChain}" objdir="${BUILD_DIR}" 
         outfile="${BIN_DIR}/${ToolName}"
         outtype="executable"
-        libtool="${haveLibtool}"
         debug="false">
 
       <fileset dir="${basedir}/${ToolName}" 
@@ -95,17 +50,18 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
     </cc>
   </target>
 
-  <target name="clean" depends="init">
+  <target name="clean">
     <echo message="Removing Intermediate Files Only"/>  
     <delete>
       <fileset dir="${BUILD_DIR}" includes="*.obj"/>
     </delete>
   </target>
 
-  <target name="cleanall" depends="init">
+  <target name="cleanall">
     <echo message="Removing Object Files and the Executable: ${ToolName}${ext_exe}"/>  
-    <delete dir="${BUILD_DIR}">
-      <fileset dir="${BIN_DIR}" includes="${ToolName}${ext_exe}"/>
+    <delete failonerror="false" quiet="true" includeEmptyDirs="true">
+      <fileset dir="${BUILD_DIR}"/>
+      <fileset file="${BIN_DIR}/${ToolName}${ext_exe}"/>
     </delete>
   </target>
 
diff --git a/Tools/Source/TianoTools/CustomizedCompress/build.xml b/Tools/Source/TianoTools/CustomizedCompress/build.xml
index 32aa12d1a9..46c9275f92 100644
--- a/Tools/Source/TianoTools/CustomizedCompress/build.xml
+++ b/Tools/Source/TianoTools/CustomizedCompress/build.xml
@@ -9,7 +9,7 @@ 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.
 -->
-<project default="CustomizedCompress.lib" basedir=".">
+<project default="GenLib" basedir="." name="CustomizedCompressLibrary">
 <!--
     EDK Customized Compress Library
   Copyright (c) 2006, Intel Corporation
@@ -19,71 +19,27 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
   <typedef resource="cpptasks.types"/>
   <taskdef resource="net/sf/antcontrib/antlib.xml"/>
 
+  <property name="LibName" value="CustomizedCompress"/>
   <property name="LINK_OUTPUT_TYPE" value="static"/>
   <property name="BUILD_DIR" value="${PACKAGE_DIR}/CustomizedCompress/tmp"/>
 
-  <target name="CustomizedCompress.lib" depends="ToolsLibrary">
-    <echo message="Building the EDK CustomizedCompress Library"/>
+  <target name="GenLib" depends="init, CustomizedCompress">
+    <echo message="The EDK Tool Library ${LibName} build has completed!"/>
   </target>
 
   <target name="init">
-    <echo message="The EDK CustomizedCompress Library"/>
+    <echo message="Building the EDK Tool Library: ${LibName}"/>
     <mkdir dir="${BUILD_DIR}"/>
-    <if>
-      <equals arg1="${GCC}" arg2="cygwin"/>
-      <then>
-        <echo message="Cygwin Family"/>
-        <property name="ToolChain" value="gcc"/>
-      </then>
-    <elseif>
-      <os family="dos"/>
-      <then>
-        <echo message="Windows Family"/>
-        <property name="ToolChain" value="msvc"/>
-      </then>
-    </elseif>
-    <elseif>
-      <os family="unix"/>
-      <then>
-        <echo message="UNIX Family"/>
-        <property name="ToolChain" value="gcc"/>
-      </then>
-    </elseif>
-
-    <else>
-      <echo>
-        Unsupported Operating System
-        Please Contact Intel Corporation
-      </echo>
-    </else>
-    </if>
-
-    <echo message="ToolChain: ${ToolChain}"/>
-    <if>
-      <equals arg1="${ToolChain}" arg2="msvc"/>
-      <then>
-        <property name="ext_static" value=".lib"/>
-        <property name="ext_dynamic" value=".dll"/>
-      </then>
-      <elseif>
-        <equals arg1="${ToolChain}" arg2="gcc"/>
-        <then>
-          <property name="ext_static" value=".a"/>
-          <property name="ext_dynamic" value=".so"/>
-        </then>
-      </elseif>
-    </if>
   </target>
 
-  <target name="ToolsLibrary" depends="init">
+  <target name="CustomizedCompress" depends="init">
     <cc name="${ToolChain}" objdir="${BUILD_DIR}" 
-        outfile="${LIB_DIR}/CustomizedCompress"
+        outfile="${LIB_DIR}/${LibName}"
         outtype="static"
-        libtool="${haveLibtool}"
         optimize="speed">
 
       <fileset dir="${basedir}/CustomizedCompress" 
-        includes="*.h *.c" 
+        includes="*.c" 
         defaultexcludes="TRUE" 
         excludes="*.xml *.inf"/>
 
@@ -91,7 +47,7 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
       <includepath path="${PACKAGE_DIR}/Include/Ia32"/>
     </cc>
     <if>
-      <os family="dos"/>
+      <istrue value="msft"/>
       <then>
         <exec dir="${BUILD_DIR}" executable="lib" failonerror="false">
           <arg line="/NOLOGO *.lib /OUT:${LIB_DIR}/CustomizedCompress${ext_static}"/>
@@ -108,9 +64,10 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
   </target>
 
   <target name="cleanall">
-    <echo message="Removing Object Files and the Library: CustomizedCompress${ext_static}"/>  
-    <delete dir="${BUILD_DIR}" failonerror="false">
-      <fileset dir="${LIB_DIR}" includes="CustomizedCompress${ext_static}"/>
+    <echo message="Removing Object Files and the Library: ${LibName}${ext_static}"/>  
+    <delete failonerror="false" quiet="true" includeEmptyDirs="true">
+      <fileset dir="${BUILD_DIR}"/>
+      <fileset file="${LIB_DIR}/${LibName}${ext_static}"/>
     </delete>
   </target>
 
diff --git a/Tools/Source/TianoTools/EfiCompress/build.xml b/Tools/Source/TianoTools/EfiCompress/build.xml
index 093c478514..ecd2476f57 100644
--- a/Tools/Source/TianoTools/EfiCompress/build.xml
+++ b/Tools/Source/TianoTools/EfiCompress/build.xml
@@ -25,63 +25,18 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
   <property name="BUILD_DIR" value="${PACKAGE_DIR}/${ToolName}/tmp"/>
 
   <target name="GenTool" depends="init, Tool">
-    <echo message="Building the EDK Tool: ${ToolName}"/>
+    <echo message="The EDK Tool: ${ToolName} build has completed!"/>
   </target>
 
   <target name="init">
-    <echo message="The EDK Tool: ${ToolName}"/>
+    <echo message="Building the EDK Tool: ${ToolName}"/>
     <mkdir dir="${BUILD_DIR}"/>
-    <if>
-      <equals arg1="${GCC}" arg2="cygwin"/>
-      <then>
-        <echo message="Cygwin Family"/>
-        <property name="ToolChain" value="gcc"/>
-      </then>
-    <elseif>
-      <os family="dos"/>
-      <then>
-        <echo message="Windows Family"/>
-        <property name="ToolChain" value="msvc"/>
-      </then>
-    </elseif>
-    <elseif>
-      <os family="unix"/>
-      <then>
-        <echo message="UNIX Family"/>
-        <property name="ToolChain" value="gcc"/>
-      </then>
-    </elseif>
-
-    <else>
-      <echo>
-        Unsupported Operating System
-        Please Contact Intel Corporation
-      </echo>
-    </else>
-    </if>
-    <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>
-          <property name="ext_static" value=".a"/>
-          <property name="ext_dynamic" value=".so"/>
-          <property name="ext_exe" value=""/>
-        </then>
-      </elseif>
-    </if>
   </target>
 
   <target name="Tool" depends="init">
     <cc name="${ToolChain}" objdir="${BUILD_DIR}" 
         outfile="${BIN_DIR}/${ToolName}"
         outtype="executable"
-        libtool="${haveLibtool}"
         debug="false">
 
       <fileset dir="${basedir}/${ToolName}" 
@@ -96,17 +51,18 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
     </cc>
   </target>
 
-  <target name="clean" depends="init">
+  <target name="clean">
     <echo message="Removing Intermediate Files Only"/>  
     <delete>
       <fileset dir="${BUILD_DIR}" includes="*.obj"/>
     </delete>
   </target>
 
-  <target name="cleanall" depends="init">
+  <target name="cleanall">
     <echo message="Removing Object Files and the Executable: ${ToolName}${ext_exe}"/>  
-    <delete dir="${BUILD_DIR}">
-      <fileset dir="${BIN_DIR}" includes="${ToolName}${ext_exe}"/>
+    <delete failonerror="false" quiet="true" includeEmptyDirs="true">
+      <fileset dir="${BUILD_DIR}"/>
+      <fileset file="${BIN_DIR}/${ToolName}${ext_exe}"/>
     </delete>
   </target>
 
diff --git a/Tools/Source/TianoTools/EfiRom/build.xml b/Tools/Source/TianoTools/EfiRom/build.xml
index 328761730a..86e117e4ab 100644
--- a/Tools/Source/TianoTools/EfiRom/build.xml
+++ b/Tools/Source/TianoTools/EfiRom/build.xml
@@ -25,63 +25,18 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
   <property name="BUILD_DIR" value="${PACKAGE_DIR}/${ToolName}/tmp"/>
 
   <target name="GenTool" depends="init, Tool">
-    <echo message="Building the EDK Tool: ${ToolName}"/>
+    <echo message="The EDK Tool: ${ToolName} build has completed!"/>
   </target>
 
   <target name="init">
-    <echo message="The EDK Tool: ${ToolName}"/>
+    <echo message="Building the EDK Tool: ${ToolName}"/>
     <mkdir dir="${BUILD_DIR}"/>
-    <if>
-      <equals arg1="${GCC}" arg2="cygwin"/>
-      <then>
-        <echo message="Cygwin Family"/>
-        <property name="ToolChain" value="gcc"/>
-      </then>
-    <elseif>
-      <os family="dos"/>
-      <then>
-        <echo message="Windows Family"/>
-        <property name="ToolChain" value="msvc"/>
-      </then>
-    </elseif>
-    <elseif>
-      <os family="unix"/>
-      <then>
-        <echo message="UNIX Family"/>
-        <property name="ToolChain" value="gcc"/>
-      </then>
-    </elseif>
-
-    <else>
-      <echo>
-        Unsupported Operating System
-        Please Contact Intel Corporation
-      </echo>
-    </else>
-    </if>
-    <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>
-          <property name="ext_static" value=".a"/>
-          <property name="ext_dynamic" value=".so"/>
-          <property name="ext_exe" value=""/>
-        </then>
-      </elseif>
-    </if>
   </target>
 
   <target name="Tool" depends="init">
     <cc name="${ToolChain}" objdir="${BUILD_DIR}" 
         outfile="${BIN_DIR}/${ToolName}"
         outtype="executable"
-        libtool="${haveLibtool}"
         debug="false">
 
       <fileset dir="${basedir}/${ToolName}" 
@@ -96,17 +51,18 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
     </cc>
   </target>
 
-  <target name="clean" depends="init">
+  <target name="clean">
     <echo message="Removing Intermediate Files Only"/>  
     <delete>
       <fileset dir="${BUILD_DIR}" includes="*.obj"/>
     </delete>
   </target>
 
-  <target name="cleanall" depends="init">
+  <target name="cleanall">
     <echo message="Removing Object Files and the Executable: ${ToolName}${ext_exe}"/>  
-    <delete dir="${BUILD_DIR}">
-      <fileset dir="${BIN_DIR}" includes="${ToolName}${ext_exe}"/>
+    <delete failonerror="false" quiet="true" includeEmptyDirs="true">
+      <fileset dir="${BUILD_DIR}"/>
+      <fileset file="${BIN_DIR}/${ToolName}${ext_exe}"/>
     </delete>
   </target>
 
diff --git a/Tools/Source/TianoTools/FlashMap/FlashMap.c b/Tools/Source/TianoTools/FlashMap/FlashMap.c
index 7ce9a575f8..110ebc4931 100644
--- a/Tools/Source/TianoTools/FlashMap/FlashMap.c
+++ b/Tools/Source/TianoTools/FlashMap/FlashMap.c
@@ -765,4 +765,5 @@ NormalizePath (
   }
   
   return Visitor;
-}
\ No newline at end of file
+}
+
diff --git a/Tools/Source/TianoTools/FlashMap/build.xml b/Tools/Source/TianoTools/FlashMap/build.xml
index 6678967555..dee577a35a 100644
--- a/Tools/Source/TianoTools/FlashMap/build.xml
+++ b/Tools/Source/TianoTools/FlashMap/build.xml
@@ -25,63 +25,18 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
   <property name="BUILD_DIR" value="${PACKAGE_DIR}/${ToolName}/tmp"/>
 
   <target name="GenTool" depends="init, Tool">
-    <echo message="Building the EDK Tool: ${ToolName}"/>
+    <echo message="The EDK Tool: ${ToolName} build has completed!"/>
   </target>
 
   <target name="init">
-    <echo message="The EDK Tool: ${ToolName}"/>
+    <echo message="Building the EDK Tool: ${ToolName}"/>
     <mkdir dir="${BUILD_DIR}"/>
-    <if>
-      <equals arg1="${GCC}" arg2="cygwin"/>
-      <then>
-        <echo message="Cygwin Family"/>
-        <property name="ToolChain" value="gcc"/>
-      </then>
-    <elseif>
-      <os family="dos"/>
-      <then>
-        <echo message="Windows Family"/>
-        <property name="ToolChain" value="msvc"/>
-      </then>
-    </elseif>
-    <elseif>
-      <os family="unix"/>
-      <then>
-        <echo message="UNIX Family"/>
-        <property name="ToolChain" value="gcc"/>
-      </then>
-    </elseif>
-
-    <else>
-      <echo>
-        Unsupported Operating System
-        Please Contact Intel Corporation
-      </echo>
-    </else>
-    </if>
-    <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>
-          <property name="ext_static" value=".a"/>
-          <property name="ext_dynamic" value=".so"/>
-          <property name="ext_exe" value=""/>
-        </then>
-      </elseif>
-    </if>
   </target>
 
   <target name="Tool" depends="init">
     <cc name="${ToolChain}" objdir="${BUILD_DIR}" 
         outfile="${BIN_DIR}/${ToolName}"
         outtype="executable"
-        libtool="${haveLibtool}"
         debug="false">
 
       <defineset>
@@ -101,17 +56,18 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
     </cc>
   </target>
 
-  <target name="clean" depends="init">
+  <target name="clean">
     <echo message="Removing Intermediate Files Only"/>  
     <delete>
       <fileset dir="${BUILD_DIR}" includes="*.obj"/>
     </delete>
   </target>
 
-  <target name="cleanall" depends="init">
+  <target name="cleanall">
     <echo message="Removing Object Files and the Executable: ${ToolName}${ext_exe}"/>  
-    <delete dir="${BUILD_DIR}">
-      <fileset dir="${BIN_DIR}" includes="${ToolName}${ext_exe}"/>
+    <delete failonerror="false" quiet="true" includeEmptyDirs="true">
+      <fileset dir="${BUILD_DIR}"/>
+      <fileset file="${BIN_DIR}/${ToolName}${ext_exe}"/>
     </delete>
   </target>
 
diff --git a/Tools/Source/TianoTools/FwImage/build.xml b/Tools/Source/TianoTools/FwImage/build.xml
index 208128393b..64340da55a 100644
--- a/Tools/Source/TianoTools/FwImage/build.xml
+++ b/Tools/Source/TianoTools/FwImage/build.xml
@@ -25,56 +25,12 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
   <property name="BUILD_DIR" value="${PACKAGE_DIR}/${ToolName}/tmp"/>
 
   <target name="GenTool" depends="init, Tool">
-    <echo message="Building the EDK Tool: ${ToolName}"/>
+    <echo message="The EDK Tool: ${ToolName} build has completed!"/>
   </target>
 
   <target name="init">
-    <echo message="The EDK Tool: ${ToolName}"/>
+    <echo message="Building the EDK Tool: ${ToolName}"/>
     <mkdir dir="${BUILD_DIR}"/>
-    <if>
-      <equals arg1="${GCC}" arg2="cygwin"/>
-      <then>
-        <echo message="Cygwin Family"/>
-        <property name="ToolChain" value="gcc"/>
-      </then>
-    <elseif>
-      <os family="dos"/>
-      <then>
-        <echo message="Windows Family"/>
-        <property name="ToolChain" value="msvc"/>
-      </then>
-    </elseif>
-    <elseif>
-      <os family="unix"/>
-      <then>
-        <echo message="UNIX Family"/>
-        <property name="ToolChain" value="gcc"/>
-      </then>
-    </elseif>
-
-    <else>
-      <echo>
-        Unsupported Operating System
-        Please Contact Intel Corporation
-      </echo>
-    </else>
-    </if>
-    <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>
-          <property name="ext_static" value=".a"/>
-          <property name="ext_dynamic" value=".so"/>
-          <property name="ext_exe" value=""/>
-        </then>
-      </elseif>
-    </if>
   </target>
 
   <target name="Tool" depends="init">
@@ -95,17 +51,18 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
     </cc>
   </target>
 
-  <target name="clean" depends="init">
+  <target name="clean">
     <echo message="Removing Intermediate Files Only"/>  
     <delete>
       <fileset dir="${BUILD_DIR}" includes="*.obj"/>
     </delete>
   </target>
 
-  <target name="cleanall" depends="init">
+  <target name="cleanall">
     <echo message="Removing Object Files and the Executable: ${ToolName}${ext_exe}"/>  
-    <delete dir="${BUILD_DIR}">
-      <fileset dir="${BIN_DIR}" includes="${ToolName}${ext_exe}"/>
+    <delete failonerror="false" quiet="true" includeEmptyDirs="true">
+      <fileset dir="${BUILD_DIR}"/>
+      <fileset file="${BIN_DIR}/${ToolName}${ext_exe}"/>
     </delete>
   </target>
 
diff --git a/Tools/Source/TianoTools/GenAcpiTable/build.xml b/Tools/Source/TianoTools/GenAcpiTable/build.xml
index b32446c49e..ba7b74b686 100644
--- a/Tools/Source/TianoTools/GenAcpiTable/build.xml
+++ b/Tools/Source/TianoTools/GenAcpiTable/build.xml
@@ -25,63 +25,18 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
   <property name="BUILD_DIR" value="${PACKAGE_DIR}/${ToolName}/tmp"/>
 
   <target name="GenTool" depends="init, Tool">
-    <echo message="Building the EDK Tool: ${ToolName}"/>
+    <echo message="The EDK Tool: ${ToolName} build has completed!"/>
   </target>
 
   <target name="init">
-    <echo message="The EDK Tool: ${ToolName}"/>
+    <echo message="Building the EDK Tool: ${ToolName}"/>
     <mkdir dir="${BUILD_DIR}"/>
-    <if>
-      <equals arg1="${GCC}" arg2="cygwin"/>
-      <then>
-        <echo message="Cygwin Family"/>
-        <property name="ToolChain" value="gcc"/>
-      </then>
-    <elseif>
-      <os family="dos"/>
-      <then>
-        <echo message="Windows Family"/>
-        <property name="ToolChain" value="msvc"/>
-      </then>
-    </elseif>
-    <elseif>
-      <os family="unix"/>
-      <then>
-        <echo message="UNIX Family"/>
-        <property name="ToolChain" value="gcc"/>
-      </then>
-    </elseif>
-
-    <else>
-      <echo>
-        Unsupported Operating System
-        Please Contact Intel Corporation
-      </echo>
-    </else>
-    </if>
-    <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>
-          <property name="ext_static" value=".a"/>
-          <property name="ext_dynamic" value=".so"/>
-          <property name="ext_exe" value=""/>
-        </then>
-      </elseif>
-    </if>
   </target>
 
   <target name="Tool" depends="init">
     <cc name="${ToolChain}" objdir="${BUILD_DIR}" 
         outfile="${BIN_DIR}/${ToolName}"
         outtype="executable"
-        libtool="${haveLibtool}"
         debug="false">
 
       <fileset dir="${basedir}/${ToolName}" 
@@ -96,17 +51,18 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
     </cc>
   </target>
 
-  <target name="clean" depends="init">
+  <target name="clean">
     <echo message="Removing Intermediate Files Only"/>  
     <delete>
       <fileset dir="${BUILD_DIR}" includes="*.obj"/>
     </delete>
   </target>
 
-  <target name="cleanall" depends="init">
+  <target name="cleanall">
     <echo message="Removing Object Files and the Executable: ${ToolName}${ext_exe}"/>  
-    <delete dir="${BUILD_DIR}">
-      <fileset dir="${BIN_DIR}" includes="${ToolName}${ext_exe}"/>
+    <delete failonerror="false" quiet="true" includeEmptyDirs="true">
+      <fileset dir="${BUILD_DIR}"/>
+      <fileset file="${BIN_DIR}/${ToolName}${ext_exe}"/>
     </delete>
   </target>
 
diff --git a/Tools/Source/TianoTools/GenCRC32Section/build.xml b/Tools/Source/TianoTools/GenCRC32Section/build.xml
index 6a727e61f4..74bc300783 100644
--- a/Tools/Source/TianoTools/GenCRC32Section/build.xml
+++ b/Tools/Source/TianoTools/GenCRC32Section/build.xml
@@ -25,56 +25,12 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
   <property name="BUILD_DIR" value="${PACKAGE_DIR}/${ToolName}/tmp"/>
 
   <target name="GenTool" depends="init, Tool">
-    <echo message="Building the EDK Tool: ${ToolName}"/>
+    <echo message="The EDK Tool: ${ToolName} build has completed!"/>
   </target>
 
   <target name="init">
-    <echo message="The EDK Tool: ${ToolName}"/>
+    <echo message="Building the EDK Tool: ${ToolName}"/>
     <mkdir dir="${BUILD_DIR}"/>
-    <if>
-      <equals arg1="${GCC}" arg2="cygwin"/>
-      <then>
-        <echo message="Cygwin Family"/>
-        <property name="ToolChain" value="gcc"/>
-      </then>
-    <elseif>
-      <os family="dos"/>
-      <then>
-        <echo message="Windows Family"/>
-        <property name="ToolChain" value="msvc"/>
-      </then>
-    </elseif>
-    <elseif>
-      <os family="unix"/>
-      <then>
-        <echo message="UNIX Family"/>
-        <property name="ToolChain" value="gcc"/>
-      </then>
-    </elseif>
-
-    <else>
-      <echo>
-        Unsupported Operating System
-        Please Contact Intel Corporation
-      </echo>
-    </else>
-    </if>
-    <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>
-          <property name="ext_static" value=".a"/>
-          <property name="ext_dynamic" value=".so"/>
-          <property name="ext_exe" value=""/>
-        </then>
-      </elseif>
-    </if>
   </target>
 
   <target name="Tool" depends="init">
@@ -94,17 +50,18 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
     </cc>
   </target>
 
-  <target name="clean" depends="init">
+  <target name="clean">
     <echo message="Removing Intermediate Files Only"/>  
     <delete>
       <fileset dir="${BUILD_DIR}" includes="*.obj"/>
     </delete>
   </target>
 
-  <target name="cleanall" depends="init">
+  <target name="cleanall">
     <echo message="Removing Object Files and the Executable: ${ToolName}${ext_exe}"/>  
-    <delete dir="${BUILD_DIR}">
-      <fileset dir="${BIN_DIR}" includes="${ToolName}${ext_exe}"/>
+    <delete failonerror="false" quiet="true" includeEmptyDirs="true">
+      <fileset dir="${BUILD_DIR}"/>
+      <fileset file="${BIN_DIR}/${ToolName}${ext_exe}"/>
     </delete>
   </target>
 
diff --git a/Tools/Source/TianoTools/GenCapsuleHdr/build.xml b/Tools/Source/TianoTools/GenCapsuleHdr/build.xml
index a322c8e6b2..30952784bb 100644
--- a/Tools/Source/TianoTools/GenCapsuleHdr/build.xml
+++ b/Tools/Source/TianoTools/GenCapsuleHdr/build.xml
@@ -25,64 +25,18 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
   <property name="BUILD_DIR" value="${PACKAGE_DIR}/${ToolName}/tmp"/>
 
   <target name="GenTool" depends="init, Tool">
-    <echo message="Building the EDK Tool: ${ToolName}"/>
+    <echo message="The EDK Tool: ${ToolName} build has completed!"/>
   </target>
 
   <target name="init">
-    <echo message="The EDK Tool: ${ToolName}"/>
+    <echo message="Building the EDK Tool: ${ToolName}"/>
     <mkdir dir="${BUILD_DIR}"/>
-    <if>
-      <equals arg1="${GCC}" arg2="cygwin"/>
-      <then>
-        <echo message="Cygwin Family"/>
-        <property name="ToolChain" value="gcc"/>
-      </then>
-    <elseif>
-      <os family="dos"/>
-      <then>
-        <echo message="Windows Family"/>
-        <property name="ToolChain" value="msvc"/>
-      </then>
-    </elseif>
-    <elseif>
-      <os family="unix"/>
-      <then>
-        <echo message="UNIX Family"/>
-        <property name="ToolChain" value="gcc"/>
-      </then>
-    </elseif>
-
-    <else>
-      <echo>
-        Unsupported Operating System
-        Please Contact Intel Corporation
-      </echo>
-    </else>
-    </if>
-    <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>
-          <property name="ext_static" value=".a"/>
-          <property name="ext_dynamic" value=".so"/>
-          <property name="ext_exe" value=""/>
-        </then>
-      </elseif>
-    </if>
-
   </target>
 
   <target name="Tool" depends="init">
     <cc name="${ToolChain}" objdir="${BUILD_DIR}" 
         outfile="${BIN_DIR}/${ToolName}"
         outtype="executable"
-        libtool="${haveLibtool}"
         debug="false">
 
       <fileset dir="${basedir}/${ToolName}" 
@@ -98,17 +52,18 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
     </cc>
   </target>
 
-  <target name="clean" depends="init">
+  <target name="clean">
     <echo message="Removing Intermediate Files Only"/>  
     <delete>
       <fileset dir="${BUILD_DIR}" includes="*.obj"/>
     </delete>
   </target>
 
-  <target name="cleanall" depends="init">
+  <target name="cleanall">
     <echo message="Removing Object Files and the Executable: ${ToolName}${ext_exe}"/>  
-    <delete dir="${BUILD_DIR}">
-      <fileset dir="${BIN_DIR}" includes="${ToolName}${ext_exe}"/>
+    <delete failonerror="false" quiet="true" includeEmptyDirs="true">
+      <fileset dir="${BUILD_DIR}"/>
+      <fileset file="${BIN_DIR}/${ToolName}${ext_exe}"/>
     </delete>
   </target>
 
diff --git a/Tools/Source/TianoTools/GenDepex/build.xml b/Tools/Source/TianoTools/GenDepex/build.xml
index 5c1c7fc97e..3878b4a97f 100644
--- a/Tools/Source/TianoTools/GenDepex/build.xml
+++ b/Tools/Source/TianoTools/GenDepex/build.xml
@@ -25,56 +25,12 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
   <property name="BUILD_DIR" value="${PACKAGE_DIR}/${ToolName}/tmp"/>
 
   <target name="GenTool" depends="init, Tool">
-    <echo message="Building the EDK Tool: ${ToolName}"/>
+    <echo message="The EDK Tool: ${ToolName} build has completed!"/>
   </target>
 
   <target name="init">
-    <echo message="The EDK Tool: ${ToolName}"/>
+    <echo message="Building the EDK Tool: ${ToolName}"/>
     <mkdir dir="${BUILD_DIR}"/>
-    <if>
-      <equals arg1="${GCC}" arg2="cygwin"/>
-      <then>
-        <echo message="Cygwin Family"/>
-        <property name="ToolChain" value="gcc"/>
-      </then>
-    <elseif>
-      <os family="dos"/>
-      <then>
-        <echo message="Windows Family"/>
-        <property name="ToolChain" value="msvc"/>
-      </then>
-    </elseif>
-    <elseif>
-      <os family="unix"/>
-      <then>
-        <echo message="UNIX Family"/>
-        <property name="ToolChain" value="gcc"/>
-      </then>
-    </elseif>
-
-    <else>
-      <echo>
-        Unsupported Operating System
-        Please Contact Intel Corporation
-      </echo>
-    </else>
-    </if>
-    <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>
-          <property name="ext_static" value=".a"/>
-          <property name="ext_dynamic" value=".so"/>
-          <property name="ext_exe" value=""/>
-        </then>
-      </elseif>
-    </if>
   </target>
 
   <target name="Tool" depends="init">
@@ -93,17 +49,18 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
     </cc>
   </target>
 
-  <target name="clean" depends="init">
+  <target name="clean">
     <echo message="Removing Intermediate Files Only"/>  
     <delete>
       <fileset dir="${BUILD_DIR}" includes="*.obj"/>
     </delete>
   </target>
 
-  <target name="cleanall" depends="init">
+  <target name="cleanall">
     <echo message="Removing Object Files and the Executable: ${ToolName}${ext_exe}"/>  
-    <delete dir="${BUILD_DIR}">
-      <fileset dir="${BIN_DIR}" includes="${ToolName}${ext_exe}"/>
+    <delete failonerror="false" quiet="true" includeEmptyDirs="true">
+      <fileset dir="${BUILD_DIR}"/>
+      <fileset file="${BIN_DIR}/${ToolName}${ext_exe}"/>
     </delete>
   </target>
 
diff --git a/Tools/Source/TianoTools/GenFfsFile/build.xml b/Tools/Source/TianoTools/GenFfsFile/build.xml
index 731cf7324d..a6ccc11497 100644
--- a/Tools/Source/TianoTools/GenFfsFile/build.xml
+++ b/Tools/Source/TianoTools/GenFfsFile/build.xml
@@ -25,63 +25,18 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
   <property name="BUILD_DIR" value="${PACKAGE_DIR}/${ToolName}/tmp"/>
 
   <target name="GenTool" depends="init, Tool">
-    <echo message="Building the EDK Tool: ${ToolName}"/>
+    <echo message="The EDK Tool: ${ToolName} build has completed!"/>
   </target>
 
   <target name="init">
-    <echo message="The EDK Tool: ${ToolName}"/>
+    <echo message="Building the EDK Tool: ${ToolName}"/>
     <mkdir dir="${BUILD_DIR}"/>
-    <if>
-      <equals arg1="${GCC}" arg2="cygwin"/>
-      <then>
-        <echo message="Cygwin Family"/>
-        <property name="ToolChain" value="gcc"/>
-      </then>
-    <elseif>
-      <os family="dos"/>
-      <then>
-        <echo message="Windows Family"/>
-        <property name="ToolChain" value="msvc"/>
-      </then>
-    </elseif>
-    <elseif>
-      <os family="unix"/>
-      <then>
-        <echo message="UNIX Family"/>
-        <property name="ToolChain" value="gcc"/>
-      </then>
-    </elseif>
-
-    <else>
-      <echo>
-        Unsupported Operating System
-        Please Contact Intel Corporation
-      </echo>
-    </else>
-    </if>
-    <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>
-          <property name="ext_static" value=".a"/>
-          <property name="ext_dynamic" value=".so"/>
-          <property name="ext_exe" value=""/>
-        </then>
-      </elseif>
-    </if>
   </target>
 
   <target name="Tool" depends="init">
     <cc name="${ToolChain}" objdir="${BUILD_DIR}" 
         outfile="${BIN_DIR}/${ToolName}"
         outtype="executable"
-        libtool="${haveLibtool}"
         optimize="speed">
 
       <fileset dir="${basedir}/${ToolName}" 
@@ -96,17 +51,18 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
     </cc>
   </target>
 
-  <target name="clean" depends="init">
+  <target name="clean">
     <echo message="Removing Intermediate Files Only"/>  
     <delete>
       <fileset dir="${BUILD_DIR}" includes="*.obj"/>
     </delete>
   </target>
 
-  <target name="cleanall" depends="init">
+  <target name="cleanall">
     <echo message="Removing Object Files and the Executable: ${ToolName}${ext_exe}"/>  
-    <delete dir="${BUILD_DIR}">
-        <fileset dir="${BIN_DIR}" includes="${ToolName}${ext_exe}"/>
+    <delete failonerror="false" quiet="true" includeEmptyDirs="true">
+      <fileset dir="${BUILD_DIR}"/>
+      <fileset file="${BIN_DIR}/${ToolName}${ext_exe}"/>
     </delete>
   </target>
 
diff --git a/Tools/Source/TianoTools/GenFvImage/build.xml b/Tools/Source/TianoTools/GenFvImage/build.xml
index 40e2fa4971..5ba021f4c6 100644
--- a/Tools/Source/TianoTools/GenFvImage/build.xml
+++ b/Tools/Source/TianoTools/GenFvImage/build.xml
@@ -25,86 +25,52 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
   <property name="BUILD_DIR" value="${PACKAGE_DIR}/${ToolName}/tmp"/>
 
   <target name="GenTool" depends="init, Tool">
-    <echo message="Building the EDK Tool: ${ToolName}"/>
+    <echo message="The EDK Tool: ${ToolName} build has completed"/>
   </target>
 
   <target name="init">
-    <echo message="The EDK Tool: ${ToolName}"/>
+    <echo message="Building the EDK Tool: ${ToolName}"/>
     <mkdir dir="${BUILD_DIR}"/>
     <if>
-      <equals arg1="${GCC}" arg2="cygwin"/>
+      <istrue value="${OSX}"/>
       <then>
-        <echo message="Cygwin Family"/>
-        <property name="ToolChain" value="gcc"/>
+        <property name="syslibdirs" value=""/>
+        <property name="syslibs" value=""/>
       </then>
-    <elseif>
-      <os family="dos"/>
+    </if>
+
+    <if>
+      <istrue value="${cygwin}"/>
       <then>
-        <echo message="Windows Family"/>
-        <property name="ToolChain" value="msvc"/>
+        <property name="syslibdirs" value="${env.CYGWIN_HOME}/lib/e2fsprogs"/>
+        <property name="syslibs" value="uuid"/>
       </then>
-    </elseif>
-    <elseif>
-      <os family="unix"/>
+    </if>
+    
+    <if>
+      <istrue value="${msft}"/>
       <then>
-        <echo message="UNIX Family"/>
-        <property name="ToolChain" value="gcc"/>
+        <property name="syslibdirs" value=""/>
+        <property name="syslibs" value="uuid"/>
       </then>
-    </elseif>
-
-    <else>
-      <echo>
-        Unsupported Operating System
-        Please Contact Intel Corporation
-      </echo>
-    </else>
     </if>
-        <property name="ToolChain" value="gcc"/>
+    
     <if>
-      <equals arg1="${ToolChain}" arg2="msvc"/>
+      <istrue value="${linux}"/>
       <then>
-        <property name="ext_static" value=".lib"/>
-        <property name="ext_dynamic" value=".dll"/>
-        <property name="ext_exe" value=".exe"/>
+        <if>
+          <istrue value="${x86_64_linux}"/>
+          <then>
+            <property name="syslibdirs" value="/lib64"/>
+          </then>
+          <else>
+            <property name="syslibdirs" value="/usr/lib"/>
+          </else>
+        </if>
+        <property name="syslibs" value="uuid"/>
       </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>
-
-    <condition property="syslibdirs" value="">
-      <os family="mac"/>
-    </condition>
-    
-    <condition property="syslibs" value="">
-      <os family="mac"/>
-    </condition>
-    
-    <condition property="syslibdirs" value="/lib64">
-      <istrue value="${x86_64_linux}"/>
-    </condition>
-    
-    <condition property="syslibdirs" value="${env.CYGWIN_HOME}/lib/e2fsprogs">
-      <os family="windows"/>
-    </condition>
-    
-    <condition property="syslibs" value="uuid">
-      <os family="windows"/>
-    </condition>
-    
-    <condition property="syslibdirs" value="/usr/lib">
-      <os name="Linux"/>
-    </condition>
-    
-    <condition property="syslibs" value="uuid">
-      <os name="Linux"/>
-    </condition>
-    
+    <echo message="syslibdirs set to: ${syslibdirs}"/>
   </target>
 
   <target name="Tool" depends="init, GenFvImage"/>
@@ -129,27 +95,27 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
       <includepath path="${PACKAGE_DIR}/Common"/>
       <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"/>
+      <linkerarg value="/nodefaultlib:libc.lib" if="msft"/>
+      <syslibset dir="${syslibdirs}" libs="${syslibs}" if="cyglinux"/>
+      <syslibset libs="RpcRT4" if="msft"/>
     </cc>
   </target>
 
-  <target name="clean" depends="init">
+  <target name="clean">
     <echo message="Removing Intermediate Files Only"/>  
     <delete>
       <fileset dir="${BUILD_DIR}" includes="*.obj"/>
     </delete>
   </target>
 
-  <target name="cleanall" depends="init">
+  <target name="cleanall">
     <echo message="Removing Object Files and the Executable: ${ToolName}${ext_exe}"/>  
-    <delete dir="${PACKAGE_DIR}/${ToolName}/tmp">
-      
-      <fileset dir="${BIN_DIR}" includes="${ToolName}_Ia32${ext_exe}"/>
-      <fileset dir="${BIN_DIR}" includes="${ToolName}_X64${ext_exe}"/>
-      <fileset dir="${BIN_DIR}" includes="${ToolName}${ext_exe}"/>
-      <fileset dir="${BIN_DIR}" includes="${ToolName}_Ipf${ext_exe}"/>
+    <delete failonerror="false" quiet="true" includeEmptyDirs="true">
+      <fileset dir="${BUILD_DIR}"/>
+      <fileset file="${BIN_DIR}/${ToolName}_Ia32${ext_exe}"/>
+      <fileset file="${BIN_DIR}/${ToolName}_X64${ext_exe}"/>
+      <fileset file="${BIN_DIR}/${ToolName}${ext_exe}"/>
+      <fileset file="${BIN_DIR}/${ToolName}_Ipf${ext_exe}"/>
     </delete>
   </target>
 
diff --git a/Tools/Source/TianoTools/GenSection/build.xml b/Tools/Source/TianoTools/GenSection/build.xml
index ee1453c128..95987e6077 100644
--- a/Tools/Source/TianoTools/GenSection/build.xml
+++ b/Tools/Source/TianoTools/GenSection/build.xml
@@ -25,63 +25,18 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
   <property name="BUILD_DIR" value="${PACKAGE_DIR}/${ToolName}/tmp"/>
 
   <target name="GenTool" depends="init, Tool">
-    <echo message="Building the EDK Tool: ${ToolName}"/>
+    <echo message="The EDK Tool: ${ToolName} build has completed!"/>
   </target>
 
   <target name="init">
-    <echo message="The EDK Tool: ${ToolName}"/>
+    <echo message="Building the EDK Tool: ${ToolName}"/>
     <mkdir dir="${BUILD_DIR}"/>
-    <if>
-      <equals arg1="${GCC}" arg2="cygwin"/>
-      <then>
-        <echo message="Cygwin Family"/>
-        <property name="ToolChain" value="gcc"/>
-      </then>
-    <elseif>
-      <os family="dos"/>
-      <then>
-        <echo message="Windows Family"/>
-        <property name="ToolChain" value="msvc"/>
-      </then>
-    </elseif>
-    <elseif>
-      <os family="unix"/>
-      <then>
-        <echo message="UNIX Family"/>
-        <property name="ToolChain" value="gcc"/>
-      </then>
-    </elseif>
-
-    <else>
-      <echo>
-        Unsupported Operating System
-        Please Contact Intel Corporation
-      </echo>
-    </else>
-    </if>
-    <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>
-          <property name="ext_static" value=".a"/>
-          <property name="ext_dynamic" value=".so"/>
-          <property name="ext_exe" value=""/>
-        </then>
-      </elseif>
-    </if>
   </target>
 
   <target name="Tool" depends="init">
     <cc name="${ToolChain}" objdir="${BUILD_DIR}" 
         outfile="${BIN_DIR}/${ToolName}"
         outtype="executable"
-        libtool="${haveLibtool}"
         optimize="speed">
 
       <fileset dir="${basedir}/${ToolName}" 
@@ -96,17 +51,18 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
     </cc>
   </target>
 
-  <target name="clean" depends="init">
+  <target name="clean">
     <echo message="Removing Intermediate Files Only"/>  
     <delete>
       <fileset dir="${BUILD_DIR}" includes="*.obj"/>
     </delete>
   </target>
 
-  <target name="cleanall" depends="init">
+  <target name="cleanall">
     <echo message="Removing Object Files and the Executable: ${ToolName}${ext_exe}"/>  
-    <delete dir="${BUILD_DIR}">
-      <fileset dir="${BIN_DIR}" includes="${ToolName}${ext_exe}"/>
+    <delete failonerror="false" quiet="true" includeEmptyDirs="true">
+      <fileset dir="${BUILD_DIR}"/>
+      <fileset file="${BIN_DIR}/${ToolName}${ext_exe}"/>
     </delete>
   </target>
 
diff --git a/Tools/Source/TianoTools/GenTEImage/build.xml b/Tools/Source/TianoTools/GenTEImage/build.xml
index e9235063f3..58dadc12ee 100644
--- a/Tools/Source/TianoTools/GenTEImage/build.xml
+++ b/Tools/Source/TianoTools/GenTEImage/build.xml
@@ -26,63 +26,18 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
   <property name="BUILD_DIR" value="${PACKAGE_DIR}/${ToolName}/tmp"/>
 
   <target name="GenTool" depends="init, Tool">
-    <echo message="Building the EDK Tool: ${ToolName}"/>
+    <echo message="The EDK Tool: ${ToolName} build has completed!"/>
   </target>
 
   <target name="init">
-    <echo message="The EDK Tool: ${ToolName}"/>
+    <echo message="Building the EDK Tool: ${ToolName}"/>
     <mkdir dir="${BUILD_DIR}"/>
-    <if>
-      <equals arg1="${GCC}" arg2="cygwin"/>
-      <then>
-        <echo message="Cygwin Family"/>
-        <property name="ToolChain" value="gcc"/>
-      </then>
-    <elseif>
-      <os family="dos"/>
-      <then>
-        <echo message="Windows Family"/>
-        <property name="ToolChain" value="msvc"/>
-      </then>
-    </elseif>
-    <elseif>
-      <os family="unix"/>
-      <then>
-        <echo message="UNIX Family"/>
-        <property name="ToolChain" value="gcc"/>
-      </then>
-    </elseif>
-
-    <else>
-      <echo>
-        Unsupported Operating System
-        Please Contact Intel Corporation
-      </echo>
-    </else>
-    </if>
-    <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>
-          <property name="ext_static" value=".a"/>
-          <property name="ext_dynamic" value=".so"/>
-          <property name="ext_exe" value=""/>
-        </then>
-      </elseif>
-    </if>
   </target>
 
   <target name="Tool" depends="init">
     <cc name="${ToolChain}" objdir="${BUILD_DIR}" 
         outfile="${BIN_DIR}/${ToolName}"
         outtype="executable"
-        libtool="${haveLibtool}"
         optimize="speed">
 
       <fileset dir="${basedir}/${ToolName}" 
@@ -97,17 +52,18 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
     </cc>
   </target>
 
-  <target name="clean" depends="init">
+  <target name="clean">
     <echo message="Removing Intermediate Files Only"/>  
     <delete>
       <fileset dir="${BUILD_DIR}" includes="*.obj"/>
     </delete>
   </target>
 
-  <target name="cleanall" depends="init">
+  <target name="cleanall">
     <echo message="Removing Object Files and the Executable: ${ToolName}${ext_exe}"/>  
-    <delete dir="${BUILD_DIR}">
-      <fileset dir="${BIN_DIR}" includes="${ToolName}${ext_exe}"/>
+    <delete failonerror="false" quiet="true" includeEmptyDirs="true">
+      <fileset dir="${BUILD_DIR}"/>
+      <fileset file="${BIN_DIR}/${ToolName}${ext_exe}"/>
     </delete>
   </target>
 
diff --git a/Tools/Source/TianoTools/GuidChk/build.xml b/Tools/Source/TianoTools/GuidChk/build.xml
index 9d798c94c7..619be66497 100644
--- a/Tools/Source/TianoTools/GuidChk/build.xml
+++ b/Tools/Source/TianoTools/GuidChk/build.xml
@@ -25,55 +25,24 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
   <property name="BUILD_DIR" value="${PACKAGE_DIR}/${ToolName}/tmp"/>
 
   <target name="GenTool" depends="init, Tool">
-    <echo message="Building the EDK Tool: ${ToolName}"/>
-  </target>
-
-  <target name="init">
-    <echo message="The EDK Tool: ${ToolName}"/>
-    <mkdir dir="${BUILD_DIR}"/>
     <if>
-      <equals arg1="${GCC}" arg2="cygwin"/>
+      <isfalse value="${gcc}"/>
       <then>
-        <echo message="Cygwin Family"/>
-        <property name="ToolChain" value="gcc"/>
+        <echo message="The EDK Tool: ${ToolName} build has completed!"/>
       </then>
-    <elseif>
-      <os family="dos"/>
-      <then>
-        <echo message="Windows Family"/>
-        <property name="ToolChain" value="msvc"/>
-      </then>
-    </elseif>
-    <elseif>
-      <os family="unix"/>
-      <then>
-        <echo message="UNIX Family"/>
-        <property name="ToolChain" value="gcc"/>
-      </then>
-    </elseif>
-
-    <else>
-      <echo>
-        Unsupported Operating System
-        Please Contact Intel Corporation
-      </echo>
-    </else>
     </if>
+  </target>
+
+  <target name="init">
     <if>
-      <equals arg1="${ToolChain}" arg2="msvc"/>
+      <istrue value="${gcc}"/>
       <then>
-        <property name="ext_static" value=".lib"/>
-        <property name="ext_dynamic" value=".dll"/>
-        <property name="ext_exe" value=".exe"/>
+        <echo message="The EDK Tool: ${ToolName} is not built for GCC!"/>
       </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>
+      <else>
+        <echo message="Building the EDK Tool: ${ToolName}"/>
+        <mkdir dir="${BUILD_DIR}"/>
+      </else>
     </if>
   </target>
 
@@ -81,7 +50,6 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
     <cc name="${ToolChain}" objdir="${BUILD_DIR}" 
         outfile="${BIN_DIR}/${ToolName}"
         outtype="executable"
-        libtool="${haveLibtool}"
         optimize="speed">
 
       <fileset dir="${basedir}/${ToolName}" 
@@ -97,17 +65,18 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
     </cc>
   </target>
 
-  <target name="clean" depends="init">
+  <target name="clean">
     <echo message="Removing Intermediate Files Only"/>  
-    <delete>
-      <fileset dir="${BUILD_DIR}" includes="*.obj"/>
+    <delete failonerror="false" quiet="true" includeEmptyDirs="true">
+      <fileset dir="${BUILD_DIR}"/>
     </delete>
   </target>
 
-  <target name="cleanall" depends="init">
+  <target name="cleanall">
     <echo message="Removing Object Files and the Executable: ${ToolName}${ext_exe}"/>  
-    <delete dir="${BUILD_DIR}">
-      <fileset dir="${BIN_DIR}" includes="${ToolName}${ext_exe}"/>
+    <delete failonerror="false" quiet="true" includeEmptyDirs="true">
+      <fileset dir="${BUILD_DIR}"/>
+      <fileset file="${BIN_DIR}/${ToolName}${ext_exe}"/>
     </delete>
   </target>
 
diff --git a/Tools/Source/TianoTools/MakeDeps/build.xml b/Tools/Source/TianoTools/MakeDeps/build.xml
index 8828eca84f..3223732d0b 100755
--- a/Tools/Source/TianoTools/MakeDeps/build.xml
+++ b/Tools/Source/TianoTools/MakeDeps/build.xml
@@ -25,63 +25,18 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
   <property name="BUILD_DIR" value="${PACKAGE_DIR}/${ToolName}/tmp"/>
 
   <target name="GenTool" depends="init, Tool">
-    <echo message="Building the EDK Tool: ${ToolName}"/>
+    <echo message="The EDK Tool: ${ToolName} build has completed!"/>
   </target>
 
   <target name="init">
-    <echo message="The EDK Tool: ${ToolName}"/>
+    <echo message="Building the EDK Tool: ${ToolName}"/>
     <mkdir dir="${BUILD_DIR}"/>
-    <if>
-      <equals arg1="${GCC}" arg2="cygwin"/>
-      <then>
-        <echo message="Cygwin Family"/>
-        <property name="ToolChain" value="gcc"/>
-      </then>
-    <elseif>
-      <os family="dos"/>
-      <then>
-        <echo message="Windows Family"/>
-        <property name="ToolChain" value="msvc"/>
-      </then>
-    </elseif>
-    <elseif>
-      <os family="unix"/>
-      <then>
-        <echo message="UNIX Family"/>
-        <property name="ToolChain" value="gcc"/>
-      </then>
-    </elseif>
-
-    <else>
-      <echo>
-        Unsupported Operating System
-        Please Contact Intel Corporation
-      </echo>
-    </else>
-    </if>
-    <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>
-          <property name="ext_static" value=".a"/>
-          <property name="ext_dynamic" value=".so"/>
-          <property name="ext_exe" value=""/>
-        </then>
-      </elseif>
-    </if>
   </target>
 
   <target name="Tool" depends="init">
     <cc name="${ToolChain}" objdir="${BUILD_DIR}" 
         outfile="${BIN_DIR}/${ToolName}"
         outtype="executable"
-        libtool="${haveLibtool}"
         optimize="speed">
 
       <fileset dir="${basedir}/${ToolName}" 
@@ -96,17 +51,18 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
     </cc>
   </target>
 
-  <target name="clean" depends="init">
+  <target name="clean">
     <echo message="Removing Intermediate Files Only"/>  
     <delete>
       <fileset dir="${BUILD_DIR}" includes="*.obj"/>
     </delete>
   </target>
 
-  <target name="cleanall" depends="init">
+  <target name="cleanall">
     <echo message="Removing Object Files and the Executable: ${ToolName}${ext_exe}"/>  
-    <delete dir="${BUILD_DIR}">
-      <fileset dir="${BIN_DIR}" includes="${ToolName}${ext_exe}"/>
+    <delete failonerror="false" quiet="true" includeEmptyDirs="true">
+      <fileset dir="${BUILD_DIR}"/>
+      <fileset file="${BIN_DIR}/${ToolName}${ext_exe}"/>
     </delete>
   </target>
 
diff --git a/Tools/Source/TianoTools/ModifyInf/build.xml b/Tools/Source/TianoTools/ModifyInf/build.xml
index cd2e742413..35f5e687d3 100644
--- a/Tools/Source/TianoTools/ModifyInf/build.xml
+++ b/Tools/Source/TianoTools/ModifyInf/build.xml
@@ -25,63 +25,18 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
   <property name="BUILD_DIR" value="${PACKAGE_DIR}/${ToolName}/tmp"/>
 
   <target name="GenTool" depends="init, Tool">
-    <echo message="Building the EDK Tool: ${ToolName}"/>
+    <echo message="The EDK Tool: ${ToolName} build has completed!"/>
   </target>
 
   <target name="init">
-    <echo message="The EDK Tool: ${ToolName}"/>
+    <echo message="Building the EDK Tool: ${ToolName}"/>
     <mkdir dir="${BUILD_DIR}"/>
-    <if>
-      <equals arg1="${GCC}" arg2="cygwin"/>
-      <then>
-        <echo message="Cygwin Family"/>
-        <property name="ToolChain" value="gcc"/>
-      </then>
-    <elseif>
-      <os family="dos"/>
-      <then>
-        <echo message="Windows Family"/>
-        <property name="ToolChain" value="msvc"/>
-      </then>
-    </elseif>
-    <elseif>
-      <os family="unix"/>
-      <then>
-        <echo message="UNIX Family"/>
-        <property name="ToolChain" value="gcc"/>
-      </then>
-    </elseif>
-
-    <else>
-      <echo>
-        Unsupported Operating System
-        Please Contact Intel Corporation
-      </echo>
-    </else>
-    </if>
-    <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>
-          <property name="ext_static" value=".a"/>
-          <property name="ext_dynamic" value=".so"/>
-          <property name="ext_exe" value=""/>
-        </then>
-      </elseif>
-    </if>
   </target>
 
   <target name="Tool" depends="init">
     <cc name="${ToolChain}" objdir="${BUILD_DIR}" 
         outfile="${BIN_DIR}/${ToolName}"
         outtype="executable"
-        libtool="${haveLibtool}"
         optimize="speed">
 
       <fileset dir="${basedir}/${ToolName}" 
@@ -96,17 +51,18 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
     </cc>
   </target>
 
-  <target name="clean" depends="init">
+  <target name="clean">
     <echo message="Removing Intermediate Files Only"/>  
     <delete>
       <fileset dir="${BUILD_DIR}" includes="*.obj"/>
     </delete>
   </target>
 
-  <target name="cleanall" depends="init">
+  <target name="cleanall">
     <echo message="Removing Object Files and the Executable: ${ToolName}${ext_exe}"/>  
-    <delete dir="${BUILD_DIR}">
-      <fileset dir="${BIN_DIR}" includes="${ToolName}${ext_exe}"/>
+    <delete failonerror="false" quiet="true" includeEmptyDirs="true">
+      <fileset dir="${BUILD_DIR}"/>
+      <fileset file="${BIN_DIR}/${ToolName}${ext_exe}"/>
     </delete>
   </target>
 
diff --git a/Tools/Source/TianoTools/Pccts/antlr/build.xml b/Tools/Source/TianoTools/Pccts/antlr/build.xml
index 4c432c1f22..6f4a9179e2 100644
--- a/Tools/Source/TianoTools/Pccts/antlr/build.xml
+++ b/Tools/Source/TianoTools/Pccts/antlr/build.xml
@@ -21,51 +21,6 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
   <taskdef resource="net/sf/antcontrib/antlib.xml"/>
 
   <target name="init">
-    <echo message="The EDK Tool: ${ToolName}"/>
-    <if>
-      <equals arg1="${GCC}" arg2="cygwin"/>
-      <then>
-        <echo message="Cygwin Family"/>
-        <property name="ToolChain" value="gcc"/>
-      </then>
-    <elseif>
-      <os family="dos"/>
-      <then>
-        <echo message="Windows Family"/>
-        <property name="ToolChain" value="msvc"/>
-      </then>
-    </elseif>
-    <elseif>
-      <os family="unix"/>
-      <then>
-        <echo message="UNIX Family"/>
-        <property name="ToolChain" value="gcc"/>
-      </then>
-    </elseif>
-
-    <else>
-      <echo>
-        Unsupported Operating System
-        Please Contact Intel Corporation
-      </echo>
-    </else>
-    </if>
-		<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>
-          <property name="ext_static" value=".a"/>
-          <property name="ext_dynamic" value=".so"/>
-          <property name="ext_exe" value=""/>
-				</then>
-			</elseif>
-		</if>
 		<condition property="CheckDepends">
 		  <uptodate targetfile="${WORKSPACE}/Tools/bin/antlr.exe">
 			  <srcfiles dir="." includes="*.c *.h *.g"/>
@@ -76,67 +31,99 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
 			<then>
 				<echo message="Executable, antlr.exe, is up to date."/>
 			</then>
+      <else>
+        <echo message="Building the EDK Pccts Tool: ${ToolName}"/>
+      </else>
 		</if>
   </target>
 
   <target name="GenTool" depends="init" unless="CheckDepends">
-    <echo message="Building the EDK Tool: ${ToolName}"/>
     <if>
       <equals arg1="${ToolChain}" arg2="msvc"/>
 			<then>
-    	  <exec dir="${basedir}" executable="nmake" failonerror="TRUE">
+    	  <exec dir="${PACKAGE_DIR}/Pccts/antlr" executable="nmake" failonerror="TRUE">
 	    	  <arg line="-f AntlrMS.mak"/>
     		</exec>
 		  </then>
-		<elseif>
-      <equals arg1="${ToolChain}" arg2="gcc"/>
-			<then>
-    	  <exec dir="${basedir}" executable="make" failonerror="TRUE">
-	    	  <arg line="-f makefile"/>
-    		</exec>
-		  </then>
-		</elseif>
+	  	<elseif>
+        <istrue value="${cygwin}"/>
+		    <then>
+    	    <exec dir="${PACKAGE_DIR}/Pccts/antlr" executable="make" failonerror="TRUE">
+	      	  <arg line="-f makefile.cygwin"/>
+    	  	</exec>
+		    </then>
+      </elseif>
+      <elseif>
+        <istrue value="${gcc}"/>
+        <then>
+    	    <exec dir="${PACKAGE_DIR}/Pccts/antlr" executable="make" failonerror="TRUE">
+	      	  <arg line="-f makefile"/>
+    	  	</exec>
+        </then>
+		  </elseif>
 		</if>
+    <echo message="The EDK Tool: ${ToolName} build has completed!"/>
 	</target>
 
-  <target name="clean" depends="init">
+  <target name="clean">
     <echo message="Removing Intermediate Files Only"/>  
     <if>
       <equals arg1="${ToolChain}" arg2="msvc"/>
 			<then>
-    	  <exec dir="${basedir}" executable="nmake" failonerror="TRUE">
+    	  <exec dir="${PACKAGE_DIR}/Pccts/antlr" executable="nmake" failonerror="TRUE">
 	    	  <arg line="-f AntlrMS.mak clean"/>
     		</exec>
 		  </then>
+    <elseif>
+      <istrue value="${cygwin}"/>
+      <then>
+    	  <exec dir="${PACKAGE_DIR}/Pccts/antlr" executable="make" failonerror="TRUE">
+	    	  <arg line="-f makefile.cygwin clean"/>
+    		</exec>
+      </then>
+		</elseif>
 		<elseif>
-      <equals arg1="${ToolChain}" arg2="gcc"/>
-			<then>
-    	  <exec dir="${basedir}" executable="make" failonerror="TRUE">
+      <istrue value="${gcc}"/>
+      <then>
+    	  <exec dir="${PACKAGE_DIR}/Pccts/antlr" executable="make" failonerror="TRUE">
 	    	  <arg line="-f makefile clean"/>
     		</exec>
-		  </then>
+      </then>
 		</elseif>
 		</if>
   </target>
 
-  <target name="cleanall" depends="init">
+  <target name="cleanall">
     <echo message="Removing Object Files and the Executable: ${ToolName}${ext_exe}"/>  
     <if>
       <equals arg1="${ToolChain}" arg2="msvc"/>
 			<then>
-    	  <exec dir="${basedir}" executable="nmake" failonerror="FALSE">
+    	  <exec dir="${PACKAGE_DIR}/Pccts/antlr" executable="nmake" failonerror="FALSE">
 	    	  <arg line="-f AntlrMS.mak clean"/>
     		</exec>
 		  </then>
 		<elseif>
-      <equals arg1="${ToolChain}" arg2="gcc"/>
+      <istrue value="${cygwin}"/>
 			<then>
-    	  <exec dir="${basedir}" executable="make" failonerror="FALSE">
-	    	  <arg line="-f makefile clean"/>
+        <echo message="Building antlr with cygwin gcc"/>
+    	  <exec dir="${PACKAGE_DIR}/Pccts/antlr" executable="make" failonerror="FALSE">
+	    	  <arg line="-f makefile.cygwin clean"/>
     		</exec>
 		  </then>
 		</elseif>
+		<elseif>
+      <istrue value="${gcc}"/>
+      <then>
+        <echo message="Building antlr with gcc"/>
+    	  <exec dir="${PACKAGE_DIR}/Pccts/antlr" executable="make" failonerror="FALSE">
+	    	  <arg line="-f makefile clean"/>
+    		</exec>
+      </then>
+		</elseif>
 		</if>
+    <delete failonerror="false" quiet="true" includeEmptyDirs="true">
+      <fileset file="${BIN_DIR}/${ToolName}${ext_exe}"/>
+    </delete>
   </target>
 
 </project>
diff --git a/Tools/Source/TianoTools/Pccts/antlr/makefile b/Tools/Source/TianoTools/Pccts/antlr/makefile
index a528001bdf..ab64fc6123 100644
--- a/Tools/Source/TianoTools/Pccts/antlr/makefile
+++ b/Tools/Source/TianoTools/Pccts/antlr/makefile
@@ -166,8 +166,8 @@ PCCTS_H=../h
 #
 CC=gcc
 COPT=-O
-ANTLR=../bin/antlr
-DLG=../bin/dlg
+ANTLR=${BIN_DIR}/antlr
+DLG=${BIN_DIR}/dlg
 OBJ_EXT=o
 OUT_OBJ = -o
 CFLAGS= $(COPT) -I. -I$(SET) -I$(PCCTS_H) -DUSER_ZZSYN $(COTHER) -DZZLEXBUFSIZE=65536
@@ -179,7 +179,7 @@ OBJ=antlr.o scan.o err.o bits.o build.o fset2.o fset.o gen.o  \
         globals.o hash.o lex.o main.o misc.o set.o pred.o egman.o mrhoist.o fcache.o
 
 antlr : $(OBJ) $(SRC)
-		$(CC) $(CFLAGS) -o ${WORKSPACE}/Tools/bin/antlr $(OBJ)
+		$(CC) $(CFLAGS) -o ${PACKAGE_DIR}/antlr $(OBJ)
 
 # what files does PCCTS generate (both ANTLR and DLG)
 PCCTS_GEN=antlr.c scan.c err.c tokens.h mode.h parser.dlg stdpccts.h remap.h
diff --git a/Tools/Source/TianoTools/Pccts/antlr/makefile.cygwin b/Tools/Source/TianoTools/Pccts/antlr/makefile.cygwin
new file mode 100644
index 0000000000..cc590e47e5
--- /dev/null
+++ b/Tools/Source/TianoTools/Pccts/antlr/makefile.cygwin
@@ -0,0 +1,219 @@
+#
+# Makefile for ANTLR 1.33
+#
+# SOFTWARE RIGHTS
+#
+# We reserve no LEGAL rights to the Purdue Compiler Construction Tool
+# Set (PCCTS) -- PCCTS is in the public domain.  An individual or
+# company may do whatever they wish with source code distributed with
+# PCCTS or the code generated by PCCTS, including the incorporation of
+# PCCTS, or its output, into commerical software.
+# 
+# We encourage users to develop software with PCCTS.  However, we do ask
+# that credit is given to us for developing PCCTS.  By "credit",
+# we mean that if you incorporate our source code into one of your
+# programs (commercial product, research project, or otherwise) that you
+# acknowledge this fact somewhere in the documentation, research report,
+# etc...  If you like PCCTS and have developed a nice tool with the
+# output, please mention that you developed it using PCCTS.  In
+# addition, we ask that this header remain intact in our source code.
+# As long as these guidelines are kept, we expect to continue enhancing
+# this system and expect to make other tools available as they are
+# completed.
+#
+# ANTLR 1.33
+# Terence Parr
+# Parr Research Corporation
+# with Purdue University
+# and AHPCRC, University of Minnesota
+# 1989-1995
+#
+# Ported to Borland C++, IBM C-Set/2 and Microsoft 6.0 by
+# Ed Harfmann
+# Micro Data Base Systems
+# Lafayette, Indiana
+#
+SET=../support/set
+PCCTS_H=../h
+
+##
+## Uncomment the appropriate section to build
+## (both targets and 'make' variable definitions)
+## Note that UNIX is the default
+##
+
+#
+#   OS/2 & DOS 16 bit using MSC 6.0
+#
+#CC=cl
+#ANTLR=..\bin\antlr
+#DLG=..\bin\dlg
+#CFLAGS= -I. -I$(SET) -I$(PCCTS_H) /AL /Za /W3 -DPC -DUSER_ZZSYN
+#OUT_OBJ = -Fo
+#LIBS=/NOD:LLIBCE LLIBCEP
+#OBJ_EXT = obj
+#
+#antlr.exe: antlr.obj scan.obj err.obj bits.obj build.obj fset2.obj \
+#        fset.obj gen.obj globals.obj hash.obj lex.obj main.obj \
+#        misc.obj set.obj pred.obj egamn.obj
+#       link @<<
+#$** /NOI
+#$@ /STACK:14336
+#
+#$(LIBS: = +^
+#)
+#$(DEF_FILE) $(LFLAGS) ;
+#<<
+#        bind $@ c:\os2\doscalls.lib
+#        copy *.exe ..\bin
+#
+
+#
+#   Borland C++ for DOS
+#
+#CC=bcc
+#ANTLR=..\bin\antlr
+#DLG=..\bin\dlg
+#CFLAGS= -I. -I$(SET) -I$(PCCTS_H) -ml -ff- -w- -DPC -DUSER_ZZSYN
+#OUT_OBJ = -o
+#LIBS= emu mathl cl
+#OBJ_EXT = obj
+#
+#antlr.exe: antlr.obj scan.obj err.obj bits.obj build.obj fset2.obj \
+#        fset.obj gen.obj globals.obj hash.obj lex.obj main.obj \
+#        misc.obj set.obj pred.obj egman.obj mrhoist.obj fcache.obj
+#       tlink @&&|
+#C0L $**
+#$@ /Tde /c
+#
+#$(LIBS)
+#$(DEF_FILE) $(LFLAGS) ;
+#|
+#        copy *.exe ..\bin
+#
+
+#
+# C-Set/2 for OS/2
+#
+#CC=icc
+#CFLAGS= -I. -I$(SET) -I$(PCCTS_H) /Sa /W3 -DUSER_ZZSYN -D__STDC__
+#OUT_OBJ = -Fo
+#LIBS=
+#ANTLR=..\bin\antlr
+#DLG=..\bin\dlg
+#OBJ_EXT = obj
+#
+#antlr.exe: antlr.obj scan.obj err.obj bits.obj build.obj fset2.obj \
+#        fset.obj gen.obj globals.obj hash.obj lex.obj main.obj \
+#        misc.obj set.obj pred.obj egman.obj mrhoist.obj fcache.obj
+#        link386 @<<
+#$** /NOI
+#$@ /STACK:32768
+#
+#$(LIBS: = +^
+#)
+#$(DEF_FILE) $(LFLAGS) ;
+#<<
+#        copy *.exe ..\bin
+#
+
+#
+# Borland C++ for OS/2
+#
+#CC=bcc
+#CFLAGS= -I. -I$(SET) -I$(PCCTS_H) -w- -v -DUSER_ZZSYN
+#OUT_OBJ = -o
+#LIBS= c2 os2
+#
+#ANTLR=..\bin\antlr
+#DLG=..\bin\dlg
+#OBJ_EXT = obj
+#antlr.exe: antlr.obj scan.obj err.obj bits.obj build.obj fset2.obj \
+#        fset.obj gen.obj globals.obj hash.obj lex.obj main.obj \
+#        misc.obj set.obj pred.obj egman.obj mrhoist.obj fcache.obj
+#        tlink @&&|
+#c02 $** -c -v
+#antlr.exe
+#
+#C2 os2
+#
+#|
+#        copy *.exe ..\bin
+#
+
+# *********** Target list of PC machines ***********
+#
+# Don't worry about the ambiguity messages coming from antlr
+# for making antlr.c etc...  [should be 10 of them, I think]
+#
+#antlr.c stdpccts.h parser.dlg tokens.h err.c : antlr.g
+#	$(ANTLR) antlr.g
+#
+#antlr.$(OBJ_EXT): antlr.c mode.h tokens.h
+#
+#scan.$(OBJ_EXT): scan.c mode.h tokens.h
+#
+#scan.c mode.h: parser.dlg
+#	$(DLG) -C2 parser.dlg scan.c
+#
+#set.$(OBJ_EXT): $(SET)/set.c
+#	$(CC) $(CFLAGS) -c $(OUT_OBJ)set.$(OBJ_EXT) $(SET)/set.c
+
+
+
+#
+#   UNIX  (default)
+#
+BIN_DIR=../../../../bin
+CC=gcc
+COPT=-O
+ANTLR=${BIN_DIR}/antlr.exe
+DLG=${BIN_DIR}/dlg.exe
+OBJ_EXT=o
+OUT_OBJ = -o
+CFLAGS= $(COPT) -I. -I$(SET) -I$(PCCTS_H) -DUSER_ZZSYN $(COTHER) -DZZLEXBUFSIZE=65536
+#
+# SGI Users, use this CFLAGS
+#
+#CFLAGS= -O -I. -I$(SET) -I$(PCCTS_H) -DUSER_ZZSYN -woff 3262
+OBJ=antlr.o scan.o err.o bits.o build.o fset2.o fset.o gen.o  \
+        globals.o hash.o lex.o main.o misc.o set.o pred.o egman.o mrhoist.o fcache.o
+
+antlr : $(OBJ) $(SRC)
+		$(CC) $(CFLAGS) -o ${BIN_DIR}/antlr.exe $(OBJ)
+
+# what files does PCCTS generate (both ANTLR and DLG)
+PCCTS_GEN=antlr.c scan.c err.c tokens.h mode.h parser.dlg stdpccts.h remap.h
+
+SRC=antlr.c scan.c err.c bits.c build.c fset2.c fset.c gen.c globals.c \
+	hash.c lex.c main.c misc.c $(SET)/set.c pred.c egman.c mrhoist.c fcache.c
+
+#
+# Don't worry about the ambiguity messages coming from antlr
+# for making antlr.c etc...  [should be 10 of them, I think]
+#
+#antlr.c stdpccts.h parser.dlg tokens.h err.c : antlr.g
+#	$(ANTLR) -gh antlr.g
+
+antlr.o : antlr.c mode.h tokens.h
+
+scan.o : scan.c mode.h tokens.h
+
+#scan.c mode.h: parser.dlg
+#	$(DLG) -C2 parser.dlg scan.c
+
+set.o : $(SET)/set.c
+	$(CC) $(CFLAGS) -c -o set.o $(SET)/set.c
+
+
+#
+# ****** These next targets are common to UNIX and PC world ********
+#
+
+#clean up all the intermediate files
+clean:
+	rm -f *.$(OBJ_EXT) core
+
+#remove everything in clean plus the PCCTS files generated
+scrub:
+	rm -f $(PCCTS_GEN) *.$(OBJ_EXT) core
diff --git a/Tools/Source/TianoTools/Pccts/antlr/makefile1 b/Tools/Source/TianoTools/Pccts/antlr/makefile1
index 5c4a275d59..dffc709478 100644
--- a/Tools/Source/TianoTools/Pccts/antlr/makefile1
+++ b/Tools/Source/TianoTools/Pccts/antlr/makefile1
@@ -40,8 +40,8 @@ PCCTS_H=../h
 #   UNIX  (default)
 #
 CC=cc
-ANTLR=../bin/antlr
-DLG=../bin/dlg
+ANTLR=${WORKSPACE}/Tools/bin/antlr
+DLG=${WORKSPACE}/Tools/bin/dlg
 OBJ_EXT=o
 OUT_OBJ = -o
 ANSI=-ansi
@@ -57,7 +57,7 @@ OBJ=antlr.o scan.o err.o bits.o build.o fset2.o fset.o gen.o \
 
 antlr : $(OBJ) $(SRC)
 		$(CC) $(CFLAGS) -o antlr $(OBJ)
-		mv antlr ../bin
+		mv antlr ${WORKSPACE}/Tools/bin
 
 # what files does PCCTS generate (both ANTLR and DLG)
 PCCTS_GEN=antlr.c scan.c err.c tokens.h mode.h parser.dlg stdpccts.h remap.h
diff --git a/Tools/Source/TianoTools/Pccts/build.xml b/Tools/Source/TianoTools/Pccts/build.xml
index 355ed2ca54..4f4e0a9e7c 100644
--- a/Tools/Source/TianoTools/Pccts/build.xml
+++ b/Tools/Source/TianoTools/Pccts/build.xml
@@ -13,73 +13,36 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
 <!--
     EDK Pccts Tool
   Copyright (c) 2006, Intel Corporation
--->
   <property name="ToolName" value="Pccts"/>
+-->
 
   <taskdef resource="cpptasks.tasks"/>
   <typedef resource="cpptasks.types"/>
   <taskdef resource="net/sf/antcontrib/antlib.xml"/>
 
   <target name="init">
-    <echo message="The EDK Tool: ${ToolName}"/>
-    <if>
-      <equals arg1="${GCC}" arg2="cygwin"/>
-      <then>
-        <echo message="Cygwin Family"/>
-        <property name="ToolChain" value="gcc"/>
-      </then>
-    <elseif>
-      <os family="dos"/>
-      <then>
-        <echo message="Windows Family"/>
-        <property name="ToolChain" value="msvc"/>
-      </then>
-    </elseif>
-    <elseif>
-      <os family="unix"/>
-      <then>
-        <echo message="UNIX Family"/>
-        <property name="ToolChain" value="gcc"/>
-      </then>
-    </elseif>
+    <echo message="Building the EDK Pccts Tools"/>
+  </target>
 
-    <else>
-      <echo>
-        Unsupported Operating System
-        Please Contact Intel Corporation
-      </echo>
-    </else>
-    </if>
-    <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>
-          <property name="ext_static" value=".a"/>
-          <property name="ext_dynamic" value=".so"/>
-          <property name="ext_exe" value=""/>
-        </then>
-      </elseif>
-    </if>
+  <target name="GenTool" depends="init, Pccts">
+    <echo message="The EDK Pccts Tools build has completed!"/>
   </target>
 
-  <target name="GenTool" depends="init">
-    <echo message="Building the EDK Tool: ${ToolName}"/>
-    <ant dir="${PACKAGE_DIR}/Pccts/antlr" inheritAll="true"/>
-    <ant dir="${PACKAGE_DIR}/Pccts/dlg" inheritAll="true"/>
+  <target name="Pccts" depends="init">
+    <subant target="" inheritall="true">
+       <fileset dir="${PACKAGE_DIR}/Pccts/antlr" includes="build.xml"/>
+    </subant>
+    <subant target="" inheritall="true">
+      <fileset dir="${PACKAGE_DIR}/Pccts/dlg" includes="build.xml"/>
+    </subant>
   </target>
 
-  <target name="clean" depends="init">
+  <target name="clean">
     <ant dir="${PACKAGE_DIR}/Pccts/antlr" target="clean" inheritAll="true"/>
     <ant dir="${PACKAGE_DIR}/Pccts/dlg" target="clean" inheritAll="true"/>
   </target>
 
-  <target name="cleanall" depends="init">
+  <target name="cleanall">
     <ant dir="${PACKAGE_DIR}/Pccts/antlr" target="cleanall" inheritAll="true"/>
     <ant dir="${PACKAGE_DIR}/Pccts/dlg" target="cleanall" inheritAll="true"/>
   </target>
diff --git a/Tools/Source/TianoTools/Pccts/dlg/build.xml b/Tools/Source/TianoTools/Pccts/dlg/build.xml
index efdae432d8..89e7aaa22e 100644
--- a/Tools/Source/TianoTools/Pccts/dlg/build.xml
+++ b/Tools/Source/TianoTools/Pccts/dlg/build.xml
@@ -11,7 +11,7 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
 -->
 <project default="GenTool" basedir=".">
 <!--
-    EDK dlg Tool
+    EDK Pccts Tool: dlg
   Copyright (c) 2006, Intel Corporation
 -->
   <property name="ToolName" value="dlg"/>
@@ -23,51 +23,6 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
   <property name="PACKAGE_DIR" value="${WORKSPACE}/Tools"/>
 
   <target name="init">
-    <echo message="The EDK Tool: ${ToolName}"/>
-    <if>
-      <equals arg1="${GCC}" arg2="cygwin"/>
-      <then>
-        <echo message="Cygwin Family"/>
-        <property name="ToolChain" value="gcc"/>
-      </then>
-    <elseif>
-      <os family="dos"/>
-      <then>
-        <echo message="Windows Family"/>
-        <property name="ToolChain" value="msvc"/>
-      </then>
-    </elseif>
-    <elseif>
-      <os family="unix"/>
-      <then>
-        <echo message="UNIX Family"/>
-        <property name="ToolChain" value="gcc"/>
-      </then>
-    </elseif>
-
-    <else>
-      <echo>
-        Unsupported Operating System
-        Please Contact Intel Corporation
-      </echo>
-    </else>
-    </if>
-		<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>
-          <property name="ext_static" value=".a"/>
-          <property name="ext_dynamic" value=".so"/>
-          <property name="ext_exe" value=""/>
-				</then>
-			</elseif>
-		</if>
 		<condition property="CheckDepends">
 		  <uptodate targetfile="${WORKSPACE}/Tools/bin/dlg.exe">
 			  <srcfiles dir="." includes="*.c *.h *.g"/>
@@ -78,42 +33,61 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
 			<then>
 				<echo message="Executable, dlg.exe, is up to date."/>
 			</then>
+      <else>
+        <echo message="Building the EDK Pccts Tool: ${ToolName}"/>
+      </else>
 		</if>
   </target>
 
   <target name="GenTool" depends="init" unless="CheckDepends">
-    <echo message="Building the EDK Tool: ${ToolName}"/>
     <if>
       <equals arg1="${ToolChain}" arg2="msvc"/>
 			<then>
-    	  <exec dir="${basedir}" executable="nmake" failonerror="TRUE">
+    	  <exec dir="${PACKAGE_DIR}/Pccts/dlg" executable="nmake" failonerror="TRUE">
 	    	  <arg line="-f DlgMS.mak"/>
     		</exec>
 		  </then>
 		<elseif>
+      <istrue value="${cygwin}"/>
+      <then>
+    	  <exec dir="${PACKAGE_DIR}/Pccts/dlg" executable="make" failonerror="TRUE">
+	    	  <arg line="-f makefile.cygwin"/>
+    		</exec>
+      </then>
+    </elseif>
+		<elseif>
       <equals arg1="${ToolChain}" arg2="gcc"/>
 			<then>
-    	  <exec dir="${basedir}" executable="make" failonerror="TRUE">
+    	  <exec dir="${PACKAGE_DIR}/Pccts/dlg" executable="make" failonerror="TRUE">
 	    	  <arg line="-f makefile"/>
     		</exec>
 		  </then>
 		</elseif>
 		</if>
+    <echo message="The EDK Tool: ${ToolName} build has completed!"/>
 	</target>
 
-  <target name="clean" depends="init">
+  <target name="clean">
     <echo message="Removing Intermediate Files Only"/>  
     <if>
       <equals arg1="${ToolChain}" arg2="msvc"/>
 			<then>
-    	  <exec dir="${basedir}" executable="nmake" failonerror="TRUE">
+    	  <exec dir="${PACKAGE_DIR}/Pccts/dlg" executable="nmake" failonerror="TRUE">
 	    	  <arg line="-f DlgMS.mak clean"/>
     		</exec>
 		  </then>
+    <elseif>
+      <istrue value="${cygwin}"/>
+      <then>
+    	  <exec dir="${PACKAGE_DIR}/Pccts/dlg" executable="make" failonerror="TRUE">
+	    	  <arg line="-f makefile.cygwin clean"/>
+    		</exec>
+      </then>
+		</elseif>
 		<elseif>
       <equals arg1="${ToolChain}" arg2="gcc"/>
 			<then>
-    	  <exec dir="${basedir}" executable="make" failonerror="TRUE">
+    	  <exec dir="${PACKAGE_DIR}/Pccts/dlg" executable="make" failonerror="TRUE">
 	    	  <arg line="-f makefile clean"/>
     		</exec>
 		  </then>
@@ -121,24 +95,27 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
 		</if>
   </target>
 
-  <target name="cleanall" depends="init">
+  <target name="cleanall">
     <echo message="Removing Object Files and the Executable: ${ToolName}${ext_exe}"/>  
     <if>
       <equals arg1="${ToolChain}" arg2="msvc"/>
 			<then>
-    	  <exec dir="${basedir}" executable="nmake" failonerror="FALSE">
+    	  <exec dir="${PACKAGE_DIR}/Pccts/dlg" executable="nmake" failonerror="FALSE">
 	    	  <arg line="-f DlgMS.mak clean"/>
     		</exec>
 		  </then>
 		<elseif>
       <equals arg1="${ToolChain}" arg2="gcc"/>
 			<then>
-    	  <exec dir="${basedir}" executable="make" failonerror="FALSE">
+    	  <exec dir="${PACKAGE_DIR}/Pccts/dlg" executable="make" failonerror="FALSE">
 	    	  <arg line="-f makefile clean"/>
     		</exec>
 		  </then>
 		</elseif>
 		</if>
+    <delete failonerror="false" quiet="true" includeEmptyDirs="true">
+      <fileset file="${BIN_DIR}/${ToolName}${ext_exe}"/>
+    </delete>
   </target>
 
 </project>
diff --git a/Tools/Source/TianoTools/Pccts/dlg/makefile b/Tools/Source/TianoTools/Pccts/dlg/makefile
index 1658394130..d5cceb8be5 100644
--- a/Tools/Source/TianoTools/Pccts/dlg/makefile
+++ b/Tools/Source/TianoTools/Pccts/dlg/makefile
@@ -116,8 +116,8 @@ PCCTS_H=../h
 #
 CC=cc
 COPT=-O
-ANTLR=../bin/antlr
-DLG=../bin/dlg
+ANTLR=${BIN_DIR}/antlr
+DLG=${BIN_DIR}/dlg
 CFLAGS= $(COPT) -I. -I$(SET) -I$(PCCTS_H) -DUSER_ZZSYN -DZZLEXBUFSIZE=65536
 OBJ_EXT=o
 OUT_OBJ = -o
@@ -125,7 +125,7 @@ OBJ = dlg_p.o dlg_a.o main.o err.o set.o support.o output.o \
         relabel.o automata.o
 
 dlg : $(OBJ) $(SRC)
-		$(CC) $(CFLAGS) -o ${WORKSPACE}/Tools/bin/dlg $(OBJ)
+		$(CC) $(CFLAGS) -o ${BIN_DIR}/dlg $(OBJ)
 
 SRC = dlg_p.c dlg_a.c main.c err.c $(SET)/set.c support.c output.c \
         relabel.c automata.c
diff --git a/Tools/Source/TianoTools/Pccts/dlg/makefile.cygwin b/Tools/Source/TianoTools/Pccts/dlg/makefile.cygwin
new file mode 100644
index 0000000000..02e4c8994a
--- /dev/null
+++ b/Tools/Source/TianoTools/Pccts/dlg/makefile.cygwin
@@ -0,0 +1,157 @@
+#
+# Makefile for DLG 1.33
+# Terence Parr
+# Purdue University, U of MN, Parr Research Corporation
+# 1989-1994
+#
+# Ported to IBM C-Set/2 and Microsoft 6.0 by
+# Ed Harfmann
+# Micro Data Base Systems
+# Lafayette, Indiana
+#
+SET=../support/set
+PCCTS_H=../h
+
+##
+## Uncomment the appropriate section to build
+##
+
+#
+#   OS/2 & DOS 16 bit using MSC 6.0
+#
+#CC=cl
+#ANTLR=..\bin\antlr
+#DLG=..\bin\dlg
+#CFLAGS= -I. -I$(SET) -I$(PCCTS_H) /AL /Za /W3 -DPC -DUSER_ZZSYN
+#OUT_OBJ = -Fo
+#LIBS=/NOD:LLIBCE LLIBCEP
+#OBJ_EXT = obj
+#
+#dlg.exe : dlg_p.obj dlg_a.obj main.obj err.obj set.obj support.obj \
+#        output.obj relabel.obj automata.obj
+#        link @<<
+#$** /NOI
+#$@ /STACK:16384
+#
+#$(LIBS: = +^
+#)
+#$(DEF_FILE) $(LFLAGS) ;
+#<<
+#        bind $@ c:\os2\doscalls.lib
+#        copy *.exe ..\bin
+#
+
+#
+#   Borland C++ for DOS
+#
+#CC=bcc
+#ANTLR=..\bin\antlr
+#DLG=..\bin\dlg
+#CFLAGS= -I. -I$(SET) -I$(PCCTS_H) -ml -ff- -w- -DPC -DUSER_ZZSYN
+#OUT_OBJ = -o
+#LIBS= emu mathl cl
+#OBJ_EXT = obj
+#
+#dlg.exe : dlg_p.obj dlg_a.obj main.obj err.obj set.obj support.obj \
+#        output.obj relabel.obj automata.obj
+#       tlink @&&|
+#C0L $**
+#$@ /Tde /c
+#
+#$(LIBS)
+#$(DEF_FILE) $(LFLAGS) ;
+#|
+#        copy *.exe ..\bin
+#
+
+#
+# C-Set/2 for OS/2
+#
+#CC=icc
+#CFLAGS= -I. -I$(SET) -I$(PCCTS_H) /Sa /W3 /DUSER_ZZSYN
+#OUT_OBJ = -Fo
+#LIBS=
+#ANTLR=..\bin\antlr
+#DLG=..\bin\dlg
+#OBJ_EXT=obj
+#
+#dlg.exe : dlg_p.obj dlg_a.obj main.obj err.obj set.obj support.obj \
+#        output.obj relabel.obj automata.obj
+#        link386 @<<
+#$** /NOI
+#$@ /STACK:32768
+#
+#$(LIBS: = +^
+#)
+#$(DEF_FILE) $(LFLAGS) ;
+#<<
+#        copy *.exe ..\bin
+#
+
+#
+# Borland C++ for OS/2
+#
+#CC=bcc
+#CFLAGS= -I. -I$(SET) -I$(PCCTS_H) -w- -DUSER_ZZSYN
+#OUT_OBJ = -o
+#LIBS= c2 os2
+#
+#ANTLR=..\bin\antlr
+#DLG=..\bin\dlg
+#OBJ_EXT = obj
+#dlg.exe : dlg_p.obj dlg_a.obj main.obj err.obj set.obj support.obj \
+#        output.obj relabel.obj automata.obj
+#        tlink @&&|
+#c02 $** -c
+#dlg.exe
+#
+#C2 os2
+#
+#|
+#        copy *.exe ..\bin
+#
+
+#
+#   UNIX
+#
+BIN_DIR=../../../../bin
+CC=cc
+COPT=-O
+ANTLR=${BIN_DIR}/antlr.exe
+DLG=${BIN_DIR}/dlg.exe
+CFLAGS= $(COPT) -I. -I$(SET) -I$(PCCTS_H) -DUSER_ZZSYN -DZZLEXBUFSIZE=65536
+OBJ_EXT=o
+OUT_OBJ = -o
+OBJ = dlg_p.o dlg_a.o main.o err.o set.o support.o output.o \
+        relabel.o automata.o
+
+dlg : $(OBJ) $(SRC)
+		$(CC) $(CFLAGS) -o ${BIN_DIR}/dlg.exe $(OBJ)
+
+SRC = dlg_p.c dlg_a.c main.c err.c $(SET)/set.c support.c output.c \
+        relabel.c automata.c
+
+#dlg_p.c parser.dlg err.c tokens.h : dlg_p.g
+#	$(ANTLR) dlg_p.g
+
+#dlg_a.c mode.h : parser.dlg
+#	$(DLG) -C2 parser.dlg dlg_a.c
+
+dlg_p.$(OBJ_EXT) : dlg_p.c dlg.h tokens.h mode.h
+	$(CC) $(CFLAGS) -c dlg_p.c
+
+dlg_a.$(OBJ_EXT) : dlg_a.c dlg.h tokens.h mode.h
+	$(CC) $(CFLAGS) -c dlg_a.c
+
+main.$(OBJ_EXT) : main.c dlg.h
+	$(CC) $(CFLAGS) -c main.c
+
+set.$(OBJ_EXT) : $(SET)/set.c
+	$(CC) -c $(CFLAGS) $(SET)/set.c
+
+lint:
+	lint *.c
+
+#clean up all the intermediate files
+clean:
+	rm -f *.$(OBJ_EXT) core
diff --git a/Tools/Source/TianoTools/PeCoffLoader/build.xml b/Tools/Source/TianoTools/PeCoffLoader/build.xml
index e1b41ed3a4..26f52ac48f 100644
--- a/Tools/Source/TianoTools/PeCoffLoader/build.xml
+++ b/Tools/Source/TianoTools/PeCoffLoader/build.xml
@@ -24,60 +24,15 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
   <property name="BUILD_DIR_X64" value="${PACKAGE_DIR}/${LibName}/tmp/X64"/>
   <property name="BUILD_DIR_IPF" value="${PACKAGE_DIR}/${LibName}/tmp/Ipf"/>
 
-  <target name="GenTool" depends="init, Tool">
-    <echo message="Building the EDK Tool: ${LibName}"/>
+  <target name="GenTool" depends="init, PeCoffLoaderLib">
+    <echo message="The EDK Library: ${LibName} build has completed!"/>
   </target>
 
   <target name="init">
-    <echo message="The EDK Library: ${LibName}"/>
+    <echo message="Building the EDK Library: ${LibName}"/>
     <mkdir dir="${BUILD_DIR_IA32}"/>
     <mkdir dir="${BUILD_DIR_X64}"/>
     <mkdir dir="${BUILD_DIR_IPF}"/>
-    <if>
-      <equals arg1="${GCC}" arg2="cygwin"/>
-      <then>
-        <echo message="Cygwin Family"/>
-        <property name="ToolChain" value="gcc"/>
-      </then>
-    <elseif>
-      <os family="dos"/>
-      <then>
-        <echo message="Windows Family"/>
-        <property name="ToolChain" value="msvc"/>
-      </then>
-    </elseif>
-    <elseif>
-      <os family="unix"/>
-      <then>
-        <echo message="UNIX Family"/>
-        <property name="ToolChain" value="gcc"/>
-      </then>
-    </elseif>
-
-    <else>
-      <echo>
-        Unsupported Operating System
-        Please Contact Intel Corporation
-      </echo>
-    </else>
-    </if>
-        <property name="ToolChain" value="gcc"/>
-    <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>
-          <property name="ext_static" value=".a"/>
-          <property name="ext_dynamic" value=".so"/>
-          <property name="ext_exe" value=""/>
-        </then>
-      </elseif>
-    </if>
 
     <condition property="syslibdirs" value="">
       <os family="mac"/>
@@ -105,7 +60,7 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
     
   </target>
 
-  <target name="Tool" depends="init, PeCoffLoader_Ia32, PeCoffLoader_Ipf, PeCoffLoader_X64"/>
+  <target name="PeCoffLoaderLib" depends="init, PeCoffLoader_Ia32, PeCoffLoader_Ipf, PeCoffLoader_X64"/>
 
   <target name="PeCoffLoader_Ia32" >
     <cc name="${ToolChain}" objdir="${BUILD_DIR_IA32}" 
@@ -171,7 +126,7 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
   </target>
 
 
-  <target name="clean" depends="init">
+  <target name="clean">
     <echo message="Removing Intermediate Files Only"/>  
     <delete>
       <fileset dir="${BUILD_DIR_IA32}" includes="*.obj"/>
@@ -180,10 +135,16 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
     </delete>
   </target>
 
-  <target name="cleanall" depends="init">
+  <target name="cleanall">
     <echo message="Removing Object Files and the Executable: ${LibName}${ext_exe}"/>  
     <delete dir="${PACKAGE_DIR}/${LibName}/tmp">
     </delete>
+    <delete failonerror="false" quiet="true" includeEmptyDirs="true">
+      <fileset dir="${BUILD_DIR}"/>
+      <fileset file="${LIB_DIR}/${LibName}_Ia32${ext_static}"/>
+      <fileset file="${BIN_DIR}/${LibName}_X64${ext_static}"/>
+      <fileset file="${BIN_DIR}/${LibName}_IPF${ext_static}"/>
+    </delete>
   </target>
 
 </project>
diff --git a/Tools/Source/TianoTools/PeiRebase/build.xml b/Tools/Source/TianoTools/PeiRebase/build.xml
index 4da3cd8269..e9fb8e5cfb 100644
--- a/Tools/Source/TianoTools/PeiRebase/build.xml
+++ b/Tools/Source/TianoTools/PeiRebase/build.xml
@@ -25,58 +25,14 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
   <property name="BUILD_DIR" value="${PACKAGE_DIR}/${ToolName}/tmp"/>
 
   <target name="GenTool" depends="init, Tool">
-    <echo message="Building the EDK Tool: ${ToolName}"/>
+    <echo message="The EDK Tool: ${ToolName} build has completed"/>
   </target>
 
   <target name="Tool" depends="init, PeiRebase_Ia32, PeiRebase_Ipf, PeiRebase_X64"/>
 
   <target name="init">
-    <echo message="The EDK Tool: ${ToolName}"/>
+    <echo message="Building the EDK Tool: ${ToolName}"/>
     <mkdir dir="${BUILD_DIR}"/>
-    <if>
-      <equals arg1="${GCC}" arg2="cygwin"/>
-      <then>
-        <echo message="Cygwin Family"/>
-        <property name="ToolChain" value="gcc"/>
-      </then>
-    <elseif>
-      <os family="dos"/>
-      <then>
-        <echo message="Windows Family"/>
-        <property name="ToolChain" value="msvc"/>
-      </then>
-    </elseif>
-    <elseif>
-      <os family="unix"/>
-      <then>
-        <echo message="UNIX Family"/>
-        <property name="ToolChain" value="gcc"/>
-      </then>
-    </elseif>
-
-    <else>
-      <echo>
-        Unsupported Operating System
-        Please Contact Intel Corporation
-      </echo>
-    </else>
-    </if>
-    <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>
-          <property name="ext_static" value=".a"/>
-          <property name="ext_dynamic" value=".so"/>
-          <property name="ext_exe" value=""/>
-        </then>
-      </elseif>
-    </if>
   </target>
 
   <target name="PeiRebase_Ia32" depends="init">
@@ -127,17 +83,20 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
     </cc>
   </target>
 
-  <target name="clean" depends="init">
+  <target name="clean">
     <echo message="Removing Intermediate Files Only"/>  
     <delete>
       <fileset dir="${BUILD_DIR}" includes="*.obj"/>
     </delete>
   </target>
 
-  <target name="cleanall" depends="init">
-    <echo message="Removing Object Files and the Executable: ${ToolName}${ext_exe}"/>  
-    <delete dir="${BUILD_DIR}">
-      <fileset dir="${BIN_DIR}" includes="${ToolName}${ext_exe}"/>
+  <target name="cleanall">
+    <echo message="Removing Object Files and the Executable: ${ToolName}_*${ext_exe}"/>  
+    <delete failonerror="false" quiet="true" includeEmptyDirs="true">
+      <fileset dir="${BUILD_DIR}"/>
+      <fileset file="${BIN_DIR}/${ToolName}_Ia32${ext_exe}"/>
+      <fileset file="${BIN_DIR}/${ToolName}_Ipf${ext_exe}"/>
+      <fileset file="${BIN_DIR}/${ToolName}_X64${ext_exe}"/>
     </delete>
   </target>
 
diff --git a/Tools/Source/TianoTools/SecApResetVectorFixup/build.xml b/Tools/Source/TianoTools/SecApResetVectorFixup/build.xml
index 34b0383981..2632575f38 100644
--- a/Tools/Source/TianoTools/SecApResetVectorFixup/build.xml
+++ b/Tools/Source/TianoTools/SecApResetVectorFixup/build.xml
@@ -25,63 +25,18 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
   <property name="BUILD_DIR" value="${PACKAGE_DIR}/${ToolName}/tmp"/>
 
   <target name="GenTool" depends="init, Tool">
-    <echo message="Building the EDK Tool: ${ToolName}"/>
+    <echo message="The EDK Tool: ${ToolName} build has completed"/>
   </target>
 
   <target name="init">
-    <echo message="The EDK Tool: ${ToolName}"/>
+    <echo message="Building the EDK Tool: ${ToolName}"/>
     <mkdir dir="${BUILD_DIR}"/>
-    <if>
-      <equals arg1="${GCC}" arg2="cygwin"/>
-      <then>
-        <echo message="Cygwin Family"/>
-        <property name="ToolChain" value="gcc"/>
-      </then>
-    <elseif>
-      <os family="dos"/>
-      <then>
-        <echo message="Windows Family"/>
-        <property name="ToolChain" value="msvc"/>
-      </then>
-    </elseif>
-    <elseif>
-      <os family="unix"/>
-      <then>
-        <echo message="UNIX Family"/>
-        <property name="ToolChain" value="gcc"/>
-      </then>
-    </elseif>
-
-    <else>
-      <echo>
-        Unsupported Operating System
-        Please Contact Intel Corporation
-      </echo>
-    </else>
-    </if>
-    <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>
-          <property name="ext_static" value=".a"/>
-          <property name="ext_dynamic" value=".so"/>
-          <property name="ext_exe" value=""/>
-        </then>
-      </elseif>
-    </if>
   </target>
 
   <target name="Tool" depends="init">
     <cc name="${ToolChain}" objdir="${BUILD_DIR}" 
         outfile="${BIN_DIR}/${ToolName}"
         outtype="executable"
-        libtool="${haveLibtool}"
         debug="false">
 
       <fileset dir="${basedir}/${ToolName}" 
@@ -96,17 +51,18 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
     </cc>
   </target>
 
-  <target name="clean" depends="init">
+  <target name="clean">
     <echo message="Removing Intermediate Files Only"/>  
     <delete>
       <fileset dir="${BUILD_DIR}" includes="*.obj"/>
     </delete>
   </target>
 
-  <target name="cleanall" depends="init">
+  <target name="cleanall">
     <echo message="Removing Object Files and the Executable: ${ToolName}${ext_exe}"/>  
-    <delete dir="${BUILD_DIR}">
-      <fileset dir="${BIN_DIR}" includes="${ToolName}${ext_exe}"/>
+    <delete failonerror="false" quiet="true" includeEmptyDirs="true">
+      <fileset dir="${BUILD_DIR}"/>
+      <fileset file="${BIN_DIR}/${ToolName}${ext_exe}"/>
     </delete>
   </target>
 
diff --git a/Tools/Source/TianoTools/SecFixup/build.xml b/Tools/Source/TianoTools/SecFixup/build.xml
index 2df362a62d..08a1118a8a 100644
--- a/Tools/Source/TianoTools/SecFixup/build.xml
+++ b/Tools/Source/TianoTools/SecFixup/build.xml
@@ -25,63 +25,18 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
   <property name="BUILD_DIR" value="${PACKAGE_DIR}/${ToolName}/tmp"/>
 
   <target name="GenTool" depends="init, Tool">
-    <echo message="Building the EDK Tool: ${ToolName}"/>
+    <echo message="The EDK Tool: ${ToolName} build has completed!"/>
   </target>
 
   <target name="init">
-    <echo message="The EDK Tool: ${ToolName}"/>
+    <echo message="Building the EDK Tool: ${ToolName}"/>
     <mkdir dir="${BUILD_DIR}"/>
-    <if>
-      <equals arg1="${GCC}" arg2="cygwin"/>
-      <then>
-        <echo message="Cygwin Family"/>
-        <property name="ToolChain" value="gcc"/>
-      </then>
-    <elseif>
-      <os family="dos"/>
-      <then>
-        <echo message="Windows Family"/>
-        <property name="ToolChain" value="msvc"/>
-      </then>
-    </elseif>
-    <elseif>
-      <os family="unix"/>
-      <then>
-        <echo message="UNIX Family"/>
-        <property name="ToolChain" value="gcc"/>
-      </then>
-    </elseif>
-
-    <else>
-      <echo>
-        Unsupported Operating System
-        Please Contact Intel Corporation
-      </echo>
-    </else>
-    </if>
-    <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>
-          <property name="ext_static" value=".a"/>
-          <property name="ext_dynamic" value=".so"/>
-          <property name="ext_exe" value=""/>
-        </then>
-      </elseif>
-    </if>
   </target>
 
   <target name="Tool" depends="init">
     <cc name="${ToolChain}" objdir="${BUILD_DIR}" 
         outfile="${BIN_DIR}/${ToolName}"
         outtype="executable"
-        libtool="${haveLibtool}"
         debug="false">
 
       <fileset dir="${basedir}/${ToolName}" 
@@ -96,17 +51,18 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
     </cc>
   </target>
 
-  <target name="clean" depends="init">
+  <target name="clean">
     <echo message="Removing Intermediate Files Only"/>  
     <delete>
       <fileset dir="${BUILD_DIR}" includes="*.obj"/>
     </delete>
   </target>
 
-  <target name="cleanall" depends="init">
+  <target name="cleanall">
     <echo message="Removing Object Files and the Executable: ${ToolName}${ext_exe}"/>  
-    <delete dir="${BUILD_DIR}">
-      <fileset dir="${BIN_DIR}" includes="${ToolName}${ext_exe}"/>
+    <delete failonerror="false" quiet="true" includeEmptyDirs="true">
+      <fileset dir="${BUILD_DIR}"/>
+      <fileset file="${BIN_DIR}/${ToolName}${ext_exe}"/>
     </delete>
   </target>
 
diff --git a/Tools/Source/TianoTools/SetStamp/build.xml b/Tools/Source/TianoTools/SetStamp/build.xml
index 6b47bb8581..792ebe2e12 100644
--- a/Tools/Source/TianoTools/SetStamp/build.xml
+++ b/Tools/Source/TianoTools/SetStamp/build.xml
@@ -25,63 +25,18 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
   <property name="BUILD_DIR" value="${PACKAGE_DIR}/${ToolName}/tmp"/>
 
   <target name="GenTool" depends="init, Tool">
-    <echo message="Building the EDK Tool: ${ToolName}"/>
+    <echo message="The EDK Tool: ${ToolName} build has completed!"/>
   </target>
 
   <target name="init">
-    <echo message="The EDK Tool: ${ToolName}"/>
+    <echo message="Building the EDK Tool: ${ToolName}"/>
     <mkdir dir="${BUILD_DIR}"/>
-    <if>
-      <equals arg1="${GCC}" arg2="cygwin"/>
-      <then>
-        <echo message="Cygwin Family"/>
-        <property name="ToolChain" value="gcc"/>
-      </then>
-    <elseif>
-      <os family="dos"/>
-      <then>
-        <echo message="Windows Family"/>
-        <property name="ToolChain" value="msvc"/>
-      </then>
-    </elseif>
-    <elseif>
-      <os family="unix"/>
-      <then>
-        <echo message="UNIX Family"/>
-        <property name="ToolChain" value="gcc"/>
-      </then>
-    </elseif>
-
-    <else>
-      <echo>
-        Unsupported Operating System
-        Please Contact Intel Corporation
-      </echo>
-    </else>
-    </if>
-    <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>
-          <property name="ext_static" value=".a"/>
-          <property name="ext_dynamic" value=".so"/>
-          <property name="ext_exe" value=""/>
-        </then>
-      </elseif>
-    </if>
   </target>
 
   <target name="Tool" depends="init">
     <cc name="${ToolChain}" objdir="${BUILD_DIR}" 
         outfile="${BIN_DIR}/${ToolName}"
         outtype="executable"
-        libtool="${haveLibtool}"
         optimize="speed">
 
       <fileset dir="${basedir}/${ToolName}" 
@@ -96,17 +51,18 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
     </cc>
   </target>
 
-  <target name="clean" depends="init">
+  <target name="clean">
     <echo message="Removing Intermediate Files Only"/>  
     <delete>
       <fileset dir="${BUILD_DIR}" includes="*.obj"/>
     </delete>
   </target>
 
-  <target name="cleanall" depends="init">
+  <target name="cleanall">
     <echo message="Removing Object Files and the Executable: ${ToolName}${ext_exe}"/>  
-    <delete dir="${BUILD_DIR}">
-      <fileset dir="${BIN_DIR}" includes="${ToolName}${ext_exe}"/>
+    <delete failonerror="false" quiet="true" includeEmptyDirs="true">
+      <fileset dir="${BUILD_DIR}"/>
+      <fileset file="${BIN_DIR}/${ToolName}${ext_exe}"/>
     </delete>
   </target>
 
diff --git a/Tools/Source/TianoTools/SplitFile/build.xml b/Tools/Source/TianoTools/SplitFile/build.xml
index f4dbae920b..135747c629 100644
--- a/Tools/Source/TianoTools/SplitFile/build.xml
+++ b/Tools/Source/TianoTools/SplitFile/build.xml
@@ -25,63 +25,18 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
   <property name="BUILD_DIR" value="${PACKAGE_DIR}/${ToolName}/tmp"/>
 
   <target name="GenTool" depends="init, Tool">
-    <echo message="Building the EDK Tool: ${ToolName}"/>
+    <echo message="The EDK Tool: ${ToolName} build has completed!"/>
   </target>
 
   <target name="init">
-    <echo message="The EDK Tool: ${ToolName}"/>
+    <echo message="Building the EDK Tool: ${ToolName}"/>
     <mkdir dir="${BUILD_DIR}"/>
-    <if>
-      <equals arg1="${GCC}" arg2="cygwin"/>
-      <then>
-        <echo message="Cygwin Family"/>
-        <property name="ToolChain" value="gcc"/>
-      </then>
-    <elseif>
-      <os family="dos"/>
-      <then>
-        <echo message="Windows Family"/>
-        <property name="ToolChain" value="msvc"/>
-      </then>
-    </elseif>
-    <elseif>
-      <os family="unix"/>
-      <then>
-        <echo message="UNIX Family"/>
-        <property name="ToolChain" value="gcc"/>
-      </then>
-    </elseif>
-
-    <else>
-      <echo>
-        Unsupported Operating System
-        Please Contact Intel Corporation
-      </echo>
-    </else>
-    </if>
-    <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>
-          <property name="ext_static" value=".a"/>
-          <property name="ext_dynamic" value=".so"/>
-          <property name="ext_exe" value=""/>
-        </then>
-      </elseif>
-    </if>
   </target>
 
   <target name="Tool" depends="init">
     <cc name="${ToolChain}" objdir="${BUILD_DIR}" 
         outfile="${BIN_DIR}/${ToolName}"
         outtype="executable"
-        libtool="${haveLibtool}"
         debug="false">
 
       <fileset dir="${basedir}/${ToolName}" 
@@ -95,17 +50,18 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
     </cc>
   </target>
 
-  <target name="clean" depends="init">
+  <target name="clean">
     <echo message="Removing Intermediate Files Only"/>  
     <delete>
       <fileset dir="${BUILD_DIR}" includes="*.obj"/>
     </delete>
   </target>
 
-  <target name="cleanall" depends="init">
+  <target name="cleanall">
     <echo message="Removing Object Files and the Executable: ${ToolName}${ext_exe}"/>  
-    <delete dir="${BUILD_DIR}">
-      <fileset dir="${BIN_DIR}" includes="${ToolName}${ext_exe}"/>
+    <delete failonerror="false" quiet="true" includeEmptyDirs="true">
+      <fileset dir="${BUILD_DIR}"/>
+      <fileset file="${BIN_DIR}/${ToolName}${ext_exe}"/>
     </delete>
   </target>
 
diff --git a/Tools/Source/TianoTools/StrGather/build.xml b/Tools/Source/TianoTools/StrGather/build.xml
index 98ace14756..7e4a96731d 100644
--- a/Tools/Source/TianoTools/StrGather/build.xml
+++ b/Tools/Source/TianoTools/StrGather/build.xml
@@ -25,63 +25,18 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
   <property name="BUILD_DIR" value="${PACKAGE_DIR}/${ToolName}/tmp"/>
 
   <target name="GenTool" depends="init, Tool">
-    <echo message="Building the EDK Tool: ${ToolName}"/>
+    <echo message="The EDK Tool: ${ToolName} build has completed!"/>
   </target>
 
   <target name="init">
-    <echo message="The EDK Tool: ${ToolName}"/>
+    <echo message="Building the EDK Tool: ${ToolName}"/>
     <mkdir dir="${BUILD_DIR}"/>
-    <if>
-      <equals arg1="${GCC}" arg2="cygwin"/>
-      <then>
-        <echo message="Cygwin Family"/>
-        <property name="ToolChain" value="gcc"/>
-      </then>
-    <elseif>
-      <os family="dos"/>
-      <then>
-        <echo message="Windows Family"/>
-        <property name="ToolChain" value="msvc"/>
-      </then>
-    </elseif>
-    <elseif>
-      <os family="unix"/>
-      <then>
-        <echo message="UNIX Family"/>
-        <property name="ToolChain" value="gcc"/>
-      </then>
-    </elseif>
-
-    <else>
-      <echo>
-        Unsupported Operating System
-        Please Contact Intel Corporation
-      </echo>
-    </else>
-    </if>
-    <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>
-          <property name="ext_static" value=".a"/>
-          <property name="ext_dynamic" value=".so"/>
-          <property name="ext_exe" value=""/>
-        </then>
-      </elseif>
-    </if>
   </target>
 
   <target name="Tool" depends="init">
     <cc name="${ToolChain}" objdir="${BUILD_DIR}" 
         outfile="${BIN_DIR}/${ToolName}"
         outtype="executable"
-        libtool="${haveLibtool}"
         debug="false">
 
       <compilerarg value="-fshort-wchar" if="gcc"/>
@@ -98,17 +53,18 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
     </cc>
   </target>
 
-  <target name="clean" depends="init">
+  <target name="clean">
     <echo message="Removing Intermediate Files Only"/>  
     <delete>
       <fileset dir="${BUILD_DIR}" includes="*.obj"/>
     </delete>
   </target>
 
-  <target name="cleanall" depends="init">
+  <target name="cleanall">
     <echo message="Removing Object Files and the Executable: ${ToolName}${ext_exe}"/>  
-    <delete dir="${BUILD_DIR}">
-      <fileset dir="${BIN_DIR}" includes="${ToolName}${ext_exe}"/>
+    <delete failonerror="false" quiet="true" includeEmptyDirs="true">
+      <fileset dir="${BUILD_DIR}"/>
+      <fileset file="${BIN_DIR}/${ToolName}${ext_exe}"/>
     </delete>
   </target>
 
diff --git a/Tools/Source/TianoTools/String/build.xml b/Tools/Source/TianoTools/String/build.xml
index 06c0975a00..f238a8712b 100644
--- a/Tools/Source/TianoTools/String/build.xml
+++ b/Tools/Source/TianoTools/String/build.xml
@@ -23,57 +23,12 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
   <property name="BUILD_DIR" value="${PACKAGE_DIR}/${LibName}/tmp"/>
 
   <target name="GenTool" depends="init, String">
-    <echo message="Building the EDK Tool: ${LibName}"/>
+    <echo message="The EDK Library: ${LibName} build has completed!"/>
   </target>
 
   <target name="init">
-    <echo message="The EDK Library: ${LibName}"/>
+    <echo message="Building the EDK Library: ${LibName}"/>
     <mkdir dir="${BUILD_DIR}"/>
-    <if>
-      <equals arg1="${GCC}" arg2="cygwin"/>
-      <then>
-        <echo message="Cygwin Family"/>
-        <property name="ToolChain" value="gcc"/>
-      </then>
-    <elseif>
-      <os family="dos"/>
-      <then>
-        <echo message="Windows Family"/>
-        <property name="ToolChain" value="msvc"/>
-      </then>
-    </elseif>
-    <elseif>
-      <os family="unix"/>
-      <then>
-        <echo message="UNIX Family"/>
-        <property name="ToolChain" value="gcc"/>
-      </then>
-    </elseif>
-
-    <else>
-      <echo>
-        Unsupported Operating System
-        Please Contact Intel Corporation
-      </echo>
-    </else>
-    </if>
-        <property name="ToolChain" value="gcc"/>
-    <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>
-          <property name="ext_static" value=".a"/>
-          <property name="ext_dynamic" value=".so"/>
-          <property name="ext_exe" value=""/>
-        </then>
-      </elseif>
-    </if>
 
     <condition property="syslibdirs" value="">
       <os family="mac"/>
@@ -121,17 +76,21 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
   </target>
 
 
-  <target name="clean" depends="init">
+  <target name="clean">
     <echo message="Removing Intermediate Files Only"/>  
     <delete>
       <fileset dir="${BUILD_DIR}" includes="*.obj"/>
     </delete>
   </target>
 
-  <target name="cleanall" depends="init">
-    <echo message="Removing Object Files and the Executable: ${LibName}${ext_exe}"/>  
+  <target name="cleanall">
+    <echo message="Removing Object Files and the Library: ${LibName}${ext_static}"/>  
     <delete dir="${PACKAGE_DIR}/${LibName}/tmp">
     </delete>
+    <delete failonerror="false" quiet="true" includeEmptyDirs="true">
+      <fileset dir="${BUILD_DIR}"/>
+      <fileset file="${LIB_DIR}/${LibName}${ext_static}"/>
+    </delete>
   </target>
 
 </project>
diff --git a/Tools/Source/TianoTools/Strip/build.xml b/Tools/Source/TianoTools/Strip/build.xml
index 50bf76f253..6b9959ca29 100644
--- a/Tools/Source/TianoTools/Strip/build.xml
+++ b/Tools/Source/TianoTools/Strip/build.xml
@@ -25,63 +25,18 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
   <property name="BUILD_DIR" value="${PACKAGE_DIR}/${ToolName}/tmp"/>
 
   <target name="GenTool" depends="init, Tool">
-    <echo message="Building the EDK Tool: ${ToolName}"/>
+    <echo message="The EDK Tool: ${ToolName} build has completed!"/>
   </target>
 
   <target name="init">
-    <echo message="The EDK Tool: ${ToolName}"/>
+    <echo message="Building the EDK Tool: ${ToolName}"/>
     <mkdir dir="${BUILD_DIR}"/>
-    <if>
-      <equals arg1="${GCC}" arg2="cygwin"/>
-      <then>
-        <echo message="Cygwin Family"/>
-        <property name="ToolChain" value="gcc"/>
-      </then>
-    <elseif>
-      <os family="dos"/>
-      <then>
-        <echo message="Windows Family"/>
-        <property name="ToolChain" value="msvc"/>
-      </then>
-    </elseif>
-    <elseif>
-      <os family="unix"/>
-      <then>
-        <echo message="UNIX Family"/>
-        <property name="ToolChain" value="gcc"/>
-      </then>
-    </elseif>
-
-    <else>
-      <echo>
-        Unsupported Operating System
-        Please Contact Intel Corporation
-      </echo>
-    </else>
-    </if>
-    <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>
-          <property name="ext_static" value=".a"/>
-          <property name="ext_dynamic" value=".so"/>
-          <property name="ext_exe" value=""/>
-        </then>
-      </elseif>
-    </if>
   </target>
 
   <target name="Tool" depends="init">
     <cc name="${ToolChain}" objdir="${BUILD_DIR}" 
         outfile="${BIN_DIR}/${ToolName}"
         outtype="executable"
-        libtool="${haveLibtool}"
         debug="false">
 
       <fileset dir="${basedir}/${ToolName}" 
@@ -95,17 +50,18 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
     </cc>
   </target>
 
-  <target name="clean" depends="init">
+  <target name="clean">
     <echo message="Removing Intermediate Files Only"/>  
     <delete>
       <fileset dir="${BUILD_DIR}" includes="*.obj"/>
     </delete>
   </target>
 
-  <target name="cleanall" depends="init">
+  <target name="cleanall">
     <echo message="Removing Object Files and the Executable: ${ToolName}${ext_exe}"/>  
-    <delete dir="${BUILD_DIR}">
-      <fileset dir="${BIN_DIR}" includes="${ToolName}${ext_exe}"/>
+    <delete failonerror="false" quiet="true" includeEmptyDirs="true">
+      <fileset dir="${BUILD_DIR}"/>
+      <fileset file="${BIN_DIR}/${ToolName}${ext_exe}"/>
     </delete>
   </target>
 
diff --git a/Tools/Source/TianoTools/TianoTools.msa b/Tools/Source/TianoTools/TianoTools.msa
index 805a022361..2e4b27c19d 100644
--- a/Tools/Source/TianoTools/TianoTools.msa
+++ b/Tools/Source/TianoTools/TianoTools.msa
@@ -6,25 +6,24 @@
     <GuidValue>A169C678-3F55-4b6a-80BF-FD8B8DCAB883</GuidValue>
     <Version>2.0</Version>
     <Abstract>This is the TianoTools Module</Abstract>
-    <Description>This Module provides the EFI/Tiano Tools that are used to create EFI/Tiano
-      Modules and Platform Binary Files (PBF)
-      These tools require compilation only once if the Developer Workstation and
-      the Developer's choice of HOST tool chain are stable.  If the developer
+    <Description>This Module provides the EFI/Tiano Tools that are used to create EFI/Tiano
+      Modules and Platform Binary Files (PBF)
+      These tools require compilation only once if the Developer Workstation and
+      the Developer's choice of HOST tool chain are stable.  If the developer
       updates either the OS or the HOST tool chain, these tools should be rebuilt.</Description>
     <Copyright>Copyright 2006, Intel Corporation</Copyright>
-    <License>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,
+    <License URL="http://opensource.org/licenses/bsd-license.php">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.</License>
     <Specification>FRAMEWORK_BUILD_PACKAGING_SPECIFICATION   0x00000052</Specification>
   </MsaHeader>
   <ModuleDefinitions>
-    <SupportedArchitectures>IA32 X64 IPF EBC</SupportedArchitectures>
+    <SupportedArchitectures>EBC IA32 X64 IPF</SupportedArchitectures>
     <BinaryModule>false</BinaryModule>
     <OutputFileBasename>NULL</OutputFileBasename>
   </ModuleDefinitions>
@@ -314,4 +313,4 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.</L
     <Filename>ZeroDebugData/build.xml</Filename>
     <Filename>ZeroDebugData/ZeroDebugData.c</Filename>
   </SourceFiles>
-</ModuleSurfaceArea>
+</ModuleSurfaceArea>
\ No newline at end of file
diff --git a/Tools/Source/TianoTools/VfrCompile/VfrCompile.g b/Tools/Source/TianoTools/VfrCompile/VfrCompile.g
index db0ba95582..44820bc31b 100644
--- a/Tools/Source/TianoTools/VfrCompile/VfrCompile.g
+++ b/Tools/Source/TianoTools/VfrCompile/VfrCompile.g
@@ -62,6 +62,7 @@ public:
   { 
     printf ("unrecognized input '%s'\n", Text); 
   }
+
 };
 
 //
diff --git a/Tools/Source/TianoTools/VfrCompile/build.xml b/Tools/Source/TianoTools/VfrCompile/build.xml
index 67442dfed3..995cf7d6a5 100644
--- a/Tools/Source/TianoTools/VfrCompile/build.xml
+++ b/Tools/Source/TianoTools/VfrCompile/build.xml
@@ -9,7 +9,7 @@ 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.
 -->
-<project default="GenTool" basedir=".">
+<project default="GenTool" basedir="." name="VfrCompile">
 <!--
     EDK VfrCompile Tool
   Copyright (c) 2006, Intel Corporation
@@ -25,90 +25,58 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
   <property name="BUILD_DIR" value="${PACKAGE_DIR}/${ToolName}/tmp"/>
 
   <target name="GenTool" depends="init, Antlr, Dlg, Tool">
-    <echo message="Building the EDK Tool: ${ToolName}"/>
+    <echo message="The EDK Tool: ${ToolName} build has completed"/>
   </target>
 
   <target name="init">
-    <echo message="The EDK Tool: ${ToolName}"/>
+
+    <echo message="Building the EDK Tool: ${ToolName}"/>
     <mkdir dir="${BUILD_DIR}"/>
-    <if>
-      <equals arg1="${GCC}" arg2="cygwin"/>
-      <then>
-        <echo message="Cygwin Family"/>
-        <property name="ToolChain" value="gcc"/>
-      </then>
-    <elseif>
-      <os family="dos"/>
-      <then>
-        <echo message="Windows Family"/>
-        <property name="ToolChain" value="msvc"/>
-      </then>
-    </elseif>
-    <elseif>
-      <os family="unix"/>
-      <then>
-        <echo message="UNIX Family"/>
-        <property name="ToolChain" value="gcc"/>
-      </then>
-    </elseif>
-
-    <else>
-      <echo>
-        Unsupported Operating System
-        Please Contact Intel Corporation
-      </echo>
-    </else>
-    </if>
-    <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>
-          <property name="ext_static" value=".a"/>
-          <property name="ext_dynamic" value=".so"/>
-          <property name="ext_exe" value=""/>
-        </then>
-      </elseif>
-    </if>
+
+    <condition property="AntlrDepends">
+      <uptodate targetfile="${PACKAGE_DIR}/VfrCompile/parser.dlg" srcfile="${PACKAGE_DIR}/VfrCompile/VfrCompile.g" value="true"/>
+    </condition>
+
+    <condition property="DlgDepends">
+      <uptodate targetfile="${PACKAGE_DIR}/VfrCompile/DLGLexer.cpp" srcfile="${PACKAGE_DIR}/VfrCompile/parser.dlg" value="true"/>
+    </condition>
+
     <condition property="CheckDepends">
-      <uptodate targetfile="${WORKSPACE}/Tools/bin/VfrCompile${ext_exe}">
-        <srcfiles dir="${WORKSPACE}/Tools/Source/TianoTools/VfrCompile" 
-        includes="EfiVfrParser.cpp DLGLexer.cpp VfrCompile.cpp VfrCompile.g VfrServices.cpp parser.dlg"/>
-      </uptodate>
+      <or>
+        <isset property="AntlrDepends"/>
+        <isset property="DlgDepends"/>
+      </or>
     </condition>
 
     <condition property="gxx_extra_libs" value="stdc++ System gcc_s.10.4 gcc">
       <os family="mac"/>
-  </condition>
+    </condition>
     
     <condition property="gxx_extra_libs" value="stdc++">
       <os name="linux"/>
-  </condition>
+    </condition>
     
     <condition property="gxx_extra_libs" value="stdc++">
       <os family="windows"/>
-  </condition>
+    </condition>
     
   </target>
 
-  <target name="Antlr" depends="init" unless="CheckDepends">
+  <target name="Antlr" depends="init" unless="AntlrDepends">
+    <echo message="Executing ANTLR"/>
     <exec dir="${basedir}/${ToolName}" executable="${env.FRAMEWORK_TOOLS_PATH}/antlr" failonerror="TRUE">
       <arg line="-CC -e3 -ck 3 -o . VfrCompile.g"/>
     </exec>
   </target>
 
-  <target name="Dlg" depends="Antlr" unless="CheckDepends">
+  <target name="Dlg" depends="Antlr" unless="DlgDepends">
+    <echo message="Executing DLG"/>
     <exec dir="${basedir}/${ToolName}" executable="${env.FRAMEWORK_TOOLS_PATH}/dlg" failonerror="TRUE">
       <arg line="-C2 -i -CC -o . parser.dlg"/>
     </exec>
   </target>
 
-  <target name="Tool" depends="init, Dlg">
+  <target name="Tool" depends="init">
     <cc name="${ToolChain}" objdir="${BUILD_DIR}" 
         outfile="${BIN_DIR}/${ToolName}"
         outtype="executable"
@@ -129,17 +97,25 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
     </cc>
   </target>
 
-  <target name="clean" depends="init">
+  <target name="clean">
     <echo message="Removing Intermediate Files Only"/>
     <delete>
       <fileset dir="${BUILD_DIR}" includes="*.obj"/>
     </delete>
   </target>
 
-  <target name="cleanall" depends="init">
+  <target name="cleanall">
     <echo message="Removing Object Files and the Executable: ${ToolName}${ext_exe}"/>
-    <delete dir="${BUILD_DIR}">
-      <fileset dir="${BIN_DIR}" includes="${ToolName}${ext_exe}"/>
+    <delete failonerror="false" quiet="true" includeEmptyDirs="true">
+      <fileset dir="${BUILD_DIR}"/>
+      <fileset file="${basedir}/${ToolName}/DLGLexer.cpp"/>
+      <fileset file="${basedir}/${ToolName}/DLGLexer.h"/>
+      <fileset file="${basedir}/${ToolName}/EfiVfrParser.cpp"/>
+      <fileset file="${basedir}/${ToolName}/EfiVfrParser.h"/>
+      <fileset file="${basedir}/${ToolName}/parser.dlg"/>
+      <fileset file="${basedir}/${ToolName}/tokens.h"/>
+      <fileset file="${basedir}/${ToolName}/VfrCompile.cpp"/>
+      <fileset file="${BIN_DIR}/${ToolName}${ext_exe}"/>
     </delete>
   </target>
 
diff --git a/Tools/Source/TianoTools/ZeroDebugData/build.xml b/Tools/Source/TianoTools/ZeroDebugData/build.xml
index 0c11f5c03d..9d60609fb2 100644
--- a/Tools/Source/TianoTools/ZeroDebugData/build.xml
+++ b/Tools/Source/TianoTools/ZeroDebugData/build.xml
@@ -25,63 +25,18 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
   <property name="BUILD_DIR" value="${PACKAGE_DIR}/${ToolName}/tmp"/>
 
   <target name="GenTool" depends="init, Tool">
-    <echo message="Building the EDK Tool: ${ToolName}"/>
+    <echo message="The EDK Tool: ${ToolName} build  has completed"/>
   </target>
 
   <target name="init">
-    <echo message="The EDK Tool: ${ToolName}"/>
+    <echo message="Building the EDK Tool: ${ToolName}"/>
     <mkdir dir="${BUILD_DIR}"/>
-    <if>
-      <equals arg1="${GCC}" arg2="cygwin"/>
-      <then>
-        <echo message="Cygwin Family"/>
-        <property name="ToolChain" value="gcc"/>
-      </then>
-    <elseif>
-      <os family="dos"/>
-      <then>
-        <echo message="Windows Family"/>
-        <property name="ToolChain" value="msvc"/>
-      </then>
-    </elseif>
-    <elseif>
-      <os family="unix"/>
-      <then>
-        <echo message="UNIX Family"/>
-        <property name="ToolChain" value="gcc"/>
-      </then>
-    </elseif>
-
-    <else>
-      <echo>
-        Unsupported Operating System
-        Please Contact Intel Corporation
-      </echo>
-    </else>
-    </if>
-    <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>
-          <property name="ext_static" value=".a"/>
-          <property name="ext_dynamic" value=".so"/>
-          <property name="ext_exe" value=""/>
-        </then>
-      </elseif>
-    </if>
   </target>
 
   <target name="Tool" depends="init">
     <cc name="${ToolChain}" objdir="${BUILD_DIR}" 
         outfile="${BIN_DIR}/${ToolName}"
         outtype="executable"
-        libtool="${haveLibtool}"
         debug="false">
 
       <fileset dir="${basedir}/${ToolName}" 
@@ -95,17 +50,18 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
     </cc>
   </target>
 
-  <target name="clean" depends="init">
+  <target name="clean">
     <echo message="Removing Intermediate Files Only"/>  
-    <delete>
-      <fileset dir="${BUILD_DIR}" includes="*.obj"/>
+    <delete failonerror="false" quiet="true" includeEmptyDirs="true">
+      <fileset dir="${BUILD_DIR}"/>
     </delete>
   </target>
 
-  <target name="cleanall" depends="init">
+  <target name="cleanall">
     <echo message="Removing Object Files and the Executable: ${ToolName}${ext_exe}"/>  
-    <delete dir="${BUILD_DIR}">
-      <fileset dir="${BIN_DIR}" includes="${ToolName}${ext_exe}"/>
+    <delete failonerror="false" quiet="true" includeEmptyDirs="true">
+      <fileset dir="${BUILD_DIR}"/>
+      <fileset file="${BIN_DIR}/${ToolName}${ext_exe}"/>
     </delete>
   </target>
 
diff --git a/Tools/Source/TianoTools/build.xml b/Tools/Source/TianoTools/build.xml
index 065cb6c33c..d304f0a014 100644
--- a/Tools/Source/TianoTools/build.xml
+++ b/Tools/Source/TianoTools/build.xml
@@ -9,21 +9,15 @@ 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.
 -->
-<project default="all" basedir=".">
+<project default="all" basedir="." name="C_Code">
 <!-- Copyright (c) 2006, Intel Corporation -->
 <!-- Filename: Tools/Source/build.xml -->
 
   <taskdef resource="net/sf/antcontrib/antlib.xml"/>
+
+  <property name="ReallyVerbose" value="false"/>
   <property environment="env" />
-  <condition property="HostArch" value="x64">
-    <os arch="amd64"/>
-  </condition>
-  <condition property="HostArch" value="Ia32">
-    <os arch="x86"/>
-  </condition>
-  <condition property="HostArch" value="Ia32">
-    <os arch="i386"/>
-  </condition>
+
   <property name="WORKSPACE" value="${env.WORKSPACE}" />
   <property name="WORKSPACE_DIR" value="${WORKSPACE}" />
   <property name="PACKAGE" value="Tools" />
@@ -32,7 +26,7 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
   <property name="BIN_DIR" value="${WORKSPACE}/Tools/bin" />
   <property name="BUILD_MODE" value="PACKAGE" />
   <property name="Libs" 
-    value="String/build.xml Common/build.xml CustomizedCompress/build.xml PeCoffLoader/build.xml"/>
+    value="Common/build.xml CustomizedCompress/build.xml PeCoffLoader/build.xml String/build.xml"/>
 
   <import file="${WORKSPACE_DIR}/Tools/Conf/BuildMacro.xml" />
 
@@ -41,46 +35,71 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
     <fileset dir="${env.XMLBEANS_HOME}/lib" includes="*.jar"/>
   </path>
 
-  <target name="all" depends="init, Tools" />
-  
-  <target name="init">
-    <taskdef classpathref="classpath" resource="GenBuild.tasks" />
-    <taskdef classpathref="classpath" resource="net/sf/antcontrib/antlib.xml" />
+  <taskdef classpathref="classpath" resource="GenBuild.tasks" />
+  <taskdef classpathref="classpath" resource="net/sf/antcontrib/antlib.xml" />
 
-    <taskdef classpathref="classpath" resource="cpptasks.tasks"/>
-    <typedef classpathref="classpath" resource="cpptasks.types"/>
+  <taskdef classpathref="classpath" resource="cpptasks.tasks"/>
+  <typedef classpathref="classpath" resource="cpptasks.types"/>
 
+  <target name="all" depends="init, Tools">
+    <echo message="The EDK II C Tools build complete!"/>
+  </target>
+  
+  <target name="init">
+    <echo message="EDK C Code Tools, build initialization"/>
     <mkdir dir="${BIN_DIR}" />
     <mkdir dir="${LIB_DIR}" />
+
+    <condition property="HostArch" value="X64">
+      <os arch="amd64"/>
+    </condition>
+    <condition property="HostArch" value="Ia32">
+      <or>
+        <os arch="x86"/>
+        <os arch="i386"/>
+      </or>
+    </condition>
+    <condition property="HostArch" value="Ia32">
+      <os arch="i386"/>
+    </condition> 
+
     <if>
       <os family="unix" />
       <then>
-        <echo message="OS Family UNIX" />
+        <echo message="OS Family UNIX, ${HostArch}" />
       </then>
       <elseif>
         <os family="dos" />
         <then>
-          <echo message="OS Family DOS" />
+          <echo message="OS Family DOS, ${HostArch}" />
         </then>
       </elseif>
       <elseif>
         <os family="mac" />
         <then>
-          <echo message="OS Family OS X" />
+          <echo message="OS Family OS X, ${HostArch}" />
         </then>
       </elseif>
       <else>
-        <echo message="OS Family Unsupported" />
+        <fail message="OS Family Unsupported, ${HostArch}" />
       </else>
     </if>
 
     <if>
-        <isset property="env.TOOL_CHAIN" />
+      <not>
+        <isset property="ToolChain" />
+      </not>
       <then>
-        <property name="ToolChain" value="${env.TOOL_CHAIN}"/>
-        <condition property="gcc">
-          <equals arg1="${ToolChain}" arg2="gcc"/>
-        </condition>
+        <if>
+          <isset property="env.TOOL_CHAIN" />
+          <then>
+            <property name="ToolChain" value="${env.TOOL_CHAIN}"/>
+          </then>
+          <else>
+            <!-- Default Tool Chain is Microsoft Visual Studio -->
+            <property name="ToolChain" value="msvc"/>
+          </else>
+        </if>
       </then>
     </if>
 
@@ -88,10 +107,37 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
       <os name="Linux"/>
     </condition>
     
+    <condition property="intel_win">
+      <and>
+        <os family="dos"/>
+        <equals arg1="${ToolChain}" arg2="intel"/>
+      </and>
+    </condition>
+    
+    <condition property="intel_linux">
+      <and>
+        <os name="Linux"/>
+        <equals arg1="${ToolChain}" arg2="intel"/>
+      </and>
+    </condition>
+    
+    <condition property="intel_mac">
+      <and>
+        <os family="mac"/>
+        <equals arg1="${ToolChain}" arg2="intel"/>
+      </and>
+    </condition>
+    
+    <condition property="gcc">
+      <and>
+        <equals arg1="${ToolChain}" arg2="gcc"/>
+      </and>
+    </condition>
+
     <condition property="cygwin">
       <and>
         <os family="dos"/>
-        <istrue value="${gcc}"/>
+        <equals arg1="${ToolChain}" arg2="gcc"/>
       </and>
     </condition>
     
@@ -109,10 +155,74 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
     <condition property="OSX" value="true">
       <os family="Mac"/>
     </condition>
-    
+
+    <condition property="cyglinux">
+      <or>
+        <istrue value="linux"/>
+        <istrue value="${cygwin}"/>
+      </or>
+    </condition>
+
+    <!-- msft is a family, used by both Microsoft and Intel Windows compiler tool chains -->
+    <condition property="msft">
+      <isfalse value="${gcc}"/>
+    </condition>
+
+    <if>
+      <istrue value="${ReallyVerbose}"/>
+      <then>
+        <echo message="Test property msvc:         ${msvc}"/> 
+        <echo message="Test property gcc:          ${gcc}"/> 
+        <echo message="Test property intel_win:    ${intel_win}"/> 
+        <echo message="Test property intel_linux:  ${intel_linux}"/> 
+        <echo message="Test property intel_mac:    ${intel_mac}"/> 
+        <echo message="Test property msft:         ${msft}"/> 
+        <echo message="Test property cygwin:       ${cygwin}"/> 
+        <echo message="Test property cyglinux:     ${cyglinux}"/> 
+        <echo message="Test property windows:      ${windows}"/> 
+        <echo message="Test property linux:        ${linux}"/> 
+        <echo message="Test property OSX:          ${OSX}"/> 
+        <echo message="Test property x86_64_linux: ${x86_64_linux}"/> 
+       </then>
+    </if>
+
+    <property name="haveLibtool" value="false"/>
+    <if>
+      <and>
+        <not>
+          <isset property="env.CYGWIN_HOME"/>
+        </not>
+          <isset property="cygwin"/>
+      </and>
+      <then>
+        <fail message="You must set the environment variable: CYGWIN_HOME"/>
+      </then>
+    </if>
+
+    <if>
+        <istrue value="${gcc}"/>
+      <then>
+        <property name="ext_static" value=".a"/>
+        <property name="ext_dynamic" value=".so"/>
+        <if>
+          <istrue value="${cygwin}"/>
+          <then>
+            <property name="ext_exe" value=".exe"/>
+          </then>
+          <else>
+            <property name="ext_exe" value=""/>
+          </else>
+        </if>
+      </then>
+      <else>
+        <property name="ext_static" value=".lib"/>
+        <property name="ext_dynamic" value=".dll"/>
+        <property name="ext_exe" value=".exe"/>
+      </else>
+    </if>
   </target>
-  
-  <target name="Libraries">
+
+  <target name="Libraries" depends="init">
     <subant target="" inheritall="true">
       <fileset dir="${PACKAGE_DIR}" 
         includes="${Libs}"/>
@@ -126,13 +236,13 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
     </subant>
   </target>
 
-  <target name="clean">
+  <target name="clean" depends="init">
     <subant target="clean" inheritall="true">
       <fileset dir="${PACKAGE_DIR}" includes="*/build.xml"/>
     </subant>
   </target>
 
-  <target name="cleanall">
+  <target name="cleanall" depends="init">
     <subant target="cleanall" inheritall="true">
       <fileset dir="${PACKAGE_DIR}" includes="*/build.xml"/>
     </subant>
-- 
cgit v1.2.3