X-Git-Url: https://git.proxmox.com/?p=mirror_edk2.git;a=blobdiff_plain;f=Tools%2FSource%2FTianoTools%2FGenDepex%2Fbuild.xml;h=9b4b8952dbf097b9c66c93a77f979f7348d35d0b;hp=9135694d2f8df7fcc1c0b740744fb9062f7b0072;hb=e4c48f4ca5a10dc691ec7bce465ec82ad18fb286;hpb=878ddf1fc3540a715f63594ed22b6929e881afb4

diff --git a/Tools/Source/TianoTools/GenDepex/build.xml b/Tools/Source/TianoTools/GenDepex/build.xml
index 9135694d2f..9b4b8952db 100644
--- a/Tools/Source/TianoTools/GenDepex/build.xml
+++ b/Tools/Source/TianoTools/GenDepex/build.xml
@@ -15,9 +15,7 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
   Copyright (c) 2006, Intel Corporation
 -->
   <property name="ToolName" value="GenDepex"/>
-  <property name="LibName" value="DepexParser"/>
-  <property name="FileSet" value="GenDepex.c GenDepex.h"/>
-	<property name="LibFileSet" value="DepexParser.c DepexParser.h" />
+  <property name="FileSet" value="DepexParser.c GenDepex.c GenDepex.h"/>
 
   <taskdef resource="cpptasks.tasks"/>
   <typedef resource="cpptasks.types"/>
@@ -28,7 +26,7 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
   <property name="LINK_OUTPUT_TYPE" value="static"/>
   <property name="BUILD_DIR" value="${PACKAGE_DIR}/${ToolName}/tmp"/>
 
-  <target name="GenTool" depends="init, Lib, Tool">
+  <target name="GenTool" depends="init, Tool">
     <echo message="Building the EDK Tool: ${ToolName}"/>
   </target>
 
@@ -81,54 +79,24 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
 		</if>
   </target>
 
-  <target name="Tool" depends="init, Lib">
+  <target name="Tool" depends="init">
     <cc name="${ToolChain}" objdir="${BUILD_DIR}" 
         outfile="${BIN_DIR}/${ToolName}"
         outtype="executable"
-        libtool="${haveLibtool}"
+        debug="false"
         optimize="speed">
 
       <fileset dir="${basedir}/${ToolName}" 
-        includes="${FileSet}" 
-        defaultexcludes="TRUE" 
-        excludes="*.xml *.inf"/>
+        includes="${FileSet}" />
 
       <includepath path="${env.WORKSPACE}/MdePkg/Include"/>
       <includepath path="${env.WORKSPACE}/MdePkg/Include/Common"/>
       <includepath path="${env.WORKSPACE}/MdePkg/Include/Ia32"/>
       <includepath path="${PACKAGE_DIR}/Common"/>
-			<linkerarg value="${LIB_DIR}/CommonTools${ext_static}"/>
-			<linkerarg value="${LIB_DIR}/${LibName}${ext_static}"/>
+			<libset dir="${LIB_DIR}" libs="CommonTools"/>
     </cc>
 	</target>
 
-	<target name="Lib" depends="init">
-    <cc name="${ToolChain}" objdir="${BUILD_DIR}" 
-        outfile="${LIB_DIR}/${LibName}"
-        outtype="static"
-        libtool="${haveLibtool}"
-        optimize="speed">
-
-      <fileset dir="${basedir}/${ToolName}" 
-        includes="${LibFileSet}" 
-        defaultexcludes="TRUE" 
-        excludes="*.xml *.inf"/>
-
-      <includepath path="${env.WORKSPACE}/MdePkg/Include"/>
-      <includepath path="${env.WORKSPACE}/MdePkg/Include/Ia32"/>
-      <includepath path="${env.WORKSPACE}/MdePkg/Include/Common"/>
-      <includepath path="${PACKAGE_DIR}/Common"/>
-		</cc>
-      <if>
-        <os family="dos"/>
-        <then>
-          <exec dir="${BUILD_DIR}" executable="lib" failonerror="false">
-            <arg line="/NOLOGO *.lib /OUT:${LIB_DIR}/${LibName}${ext_static}"/>
-          </exec>
-        </then>
-      </if>
-  </target>
-	
   <target name="clean" depends="init">
     <echo message="Removing Intermediate Files Only"/>  
     <delete>