1 files changed, 13 insertions, 56 deletions
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>