removed extra taskdef and taskref definitions that caused some warning messages when...
authorlhauch <lhauch@de2fecce-e211-0410-80a6-f3fac2684e05>
Mon, 9 Oct 2006 22:03:52 +0000 (22:03 +0000)
committerlhauch <lhauch@de2fecce-e211-0410-80a6-f3fac2684e05>
Mon, 9 Oct 2006 22:03:52 +0000 (22:03 +0000)
git-svn-id: https://edk2.tianocore.org/svn/edk2/trunk@1694 de2fecce-e211-0410-80a6-f3fac2684e05

34 files changed:
edk2/Tools/CCode/Source/Common/build.xml
edk2/Tools/CCode/Source/CompressDll/build.xml
edk2/Tools/CCode/Source/CreateMtFile/build.xml
edk2/Tools/CCode/Source/CustomizedCompress/build.xml
edk2/Tools/CCode/Source/EfiCompress/build.xml
edk2/Tools/CCode/Source/EfiRom/build.xml
edk2/Tools/CCode/Source/FlashMap/build.xml
edk2/Tools/CCode/Source/FwImage/build.xml
edk2/Tools/CCode/Source/GenAcpiTable/build.xml
edk2/Tools/CCode/Source/GenCRC32Section/build.xml
edk2/Tools/CCode/Source/GenCapsuleHdr/build.xml
edk2/Tools/CCode/Source/GenDepex/build.xml
edk2/Tools/CCode/Source/GenFfsFile/build.xml
edk2/Tools/CCode/Source/GenFvImage/build.xml
edk2/Tools/CCode/Source/GenSection/build.xml
edk2/Tools/CCode/Source/GenTEImage/build.xml
edk2/Tools/CCode/Source/GuidChk/build.xml
edk2/Tools/CCode/Source/MakeDeps/build.xml
edk2/Tools/CCode/Source/ModifyInf/build.xml
edk2/Tools/CCode/Source/Pccts/antlr/build.xml
edk2/Tools/CCode/Source/Pccts/build.xml
edk2/Tools/CCode/Source/Pccts/dlg/build.xml
edk2/Tools/CCode/Source/PeCoffLoader/build.xml
edk2/Tools/CCode/Source/PeiRebase/build.xml
edk2/Tools/CCode/Source/SecApResetVectorFixup/build.xml
edk2/Tools/CCode/Source/SecFixup/build.xml
edk2/Tools/CCode/Source/SetStamp/build.xml
edk2/Tools/CCode/Source/SplitFile/build.xml
edk2/Tools/CCode/Source/StrGather/build.xml
edk2/Tools/CCode/Source/String/build.xml
edk2/Tools/CCode/Source/Strip/build.xml
edk2/Tools/CCode/Source/VfrCompile/build.xml
edk2/Tools/CCode/Source/ZeroDebugData/build.xml
edk2/Tools/CCode/Source/build.xml

index 902f677..38ae477 100644 (file)
@@ -15,8 +15,6 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
   Copyright (c) 2006, Intel Corporation\r
 -->\r
 \r
-  <taskdef resource="cpptasks.tasks"/>\r
-  <typedef resource="cpptasks.types"/>\r
   <taskdef resource="net/sf/antcontrib/antlib.xml"/>\r
 \r
   <property name="tmp" value="tmp"/>\r
index 124255b..6f591b3 100644 (file)
@@ -20,8 +20,6 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
   <property name="FileSet" value="CompressDll.c CompressDll.h"/>\r
   <property name="LibFileSet" value="CompressDll.c DepexParser.h"/>\r
 \r
-  <taskdef resource="cpptasks.tasks"/>\r
-  <typedef resource="cpptasks.types"/>\r
   <taskdef resource="net/sf/antcontrib/antlib.xml"/>\r
 \r
   <property name="LINK_OUTPUT_TYPE" value="static"/>\r
@@ -71,7 +69,7 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
   </target>\r
 \r
   <target name="cleanall">\r
-    <echo message="Removing Object Files and the Executable: ${LibName}${ext_shared}"/>\r
+    <echo message="Removing Object Files and the Executable: ${LibName}${ext_dynamic}"/>\r
     <delete failonerror="false" quiet="true" includeEmptyDirs="true">\r
       <fileset dir="${BUILD_DIR}"/>\r
       <fileset file="${BIN_DIR}/${LibName}.*"/>\r
index b227224..4c08a0f 100644 (file)
@@ -17,8 +17,6 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
   <property name="ToolName" value="CreateMtFile"/>\r
   <property name="FileSet" value="*.c"/>\r
 \r
-  <taskdef resource="cpptasks.tasks"/>\r
-  <typedef resource="cpptasks.types"/>\r
   <taskdef resource="net/sf/antcontrib/antlib.xml"/>\r
 \r
   <property name="LINK_OUTPUT_TYPE" value="static"/>\r
index 4664a95..35bffa4 100644 (file)
@@ -15,8 +15,6 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
   Copyright (c) 2006, Intel Corporation\r
 -->\r
 \r
-  <taskdef resource="cpptasks.tasks"/>\r
-  <typedef resource="cpptasks.types"/>\r
   <taskdef resource="net/sf/antcontrib/antlib.xml"/>\r
 \r
   <property name="LibName" value="CustomizedCompress"/>\r
index 94f6055..d08e985 100644 (file)
@@ -17,8 +17,6 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
   <property name="ToolName" value="EfiCompress"/>\r
   <property name="FileSet" value="*.c"/>\r
 \r
-  <taskdef resource="cpptasks.tasks"/>\r
-  <typedef resource="cpptasks.types"/>\r
   <taskdef resource="net/sf/antcontrib/antlib.xml"/>\r
 \r
   <property name="LINK_OUTPUT_TYPE" value="static"/>\r
index acb94a4..a732950 100644 (file)
@@ -17,8 +17,6 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
   <property name="ToolName" value="EfiRom"/>\r
   <property name="FileSet" value="*.c"/>\r
 \r
-  <taskdef resource="cpptasks.tasks"/>\r
-  <typedef resource="cpptasks.types"/>\r
   <taskdef resource="net/sf/antcontrib/antlib.xml"/>\r
 \r
   <property name="LINK_OUTPUT_TYPE" value="static"/>\r
index 680c182..a3e6547 100644 (file)
@@ -17,8 +17,6 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
   <property name="ToolName" value="FlashMap"/>\r
   <property name="FileSet" value="*.c"/>\r
 \r
-  <taskdef resource="cpptasks.tasks"/>\r
-  <typedef resource="cpptasks.types"/>\r
   <taskdef resource="net/sf/antcontrib/antlib.xml"/>\r
 \r
   <property name="LINK_OUTPUT_TYPE" value="static"/>\r
index b52c576..42f4b47 100644 (file)
@@ -17,8 +17,6 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
   <property name="ToolName" value="FwImage"/>\r
   <property name="FileSet" value="fwimage.c"/>\r
 \r
-  <taskdef resource="cpptasks.tasks"/>\r
-  <typedef resource="cpptasks.types"/>\r
   <taskdef resource="net/sf/antcontrib/antlib.xml"/>\r
 \r
   <property name="LINK_OUTPUT_TYPE" value="static"/>\r
index 8c8c5eb..bf4919c 100644 (file)
@@ -17,8 +17,6 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
   <property name="ToolName" value="GenAcpiTable"/>\r
   <property name="FileSet" value="*.c"/>\r
 \r
-  <taskdef resource="cpptasks.tasks"/>\r
-  <typedef resource="cpptasks.types"/>\r
   <taskdef resource="net/sf/antcontrib/antlib.xml"/>\r
 \r
   <property name="LINK_OUTPUT_TYPE" value="static"/>\r
index bbb0f71..788001a 100644 (file)
@@ -17,8 +17,6 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
   <property name="ToolName" value="GenCRC32Section"/>\r
   <property name="FileSet" value="GenCRC32Section.c GenCRC32Section.h"/>\r
 \r
-  <taskdef resource="cpptasks.tasks"/>\r
-  <typedef resource="cpptasks.types"/>\r
   <taskdef resource="net/sf/antcontrib/antlib.xml"/>\r
 \r
   <property name="LINK_OUTPUT_TYPE" value="static"/>\r
index 7c43d0a..a16409a 100644 (file)
@@ -17,8 +17,6 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
   <property name="ToolName" value="GenCapsuleHdr"/>\r
   <property name="FileSet" value="GenCapsuleHdr.c"/>\r
 \r
-  <taskdef resource="cpptasks.tasks"/>\r
-  <typedef resource="cpptasks.types"/>\r
   <taskdef resource="net/sf/antcontrib/antlib.xml"/>\r
 \r
   <property name="LINK_OUTPUT_TYPE" value="static"/>\r
index 568177a..18f85ac 100644 (file)
@@ -17,8 +17,6 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
   <property name="ToolName" value="GenDepex"/>\r
   <property name="FileSet" value="DepexParser.c GenDepex.c GenDepex.h"/>\r
 \r
-  <taskdef resource="cpptasks.tasks"/>\r
-  <typedef resource="cpptasks.types"/>\r
   <taskdef resource="net/sf/antcontrib/antlib.xml"/>\r
 \r
   <property name="LINK_OUTPUT_TYPE" value="static"/>\r
index b7f8681..de4d6a6 100644 (file)
@@ -17,8 +17,6 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
   <property name="ToolName" value="GenFfsFile"/>\r
   <property name="FileSet" value="GenFfsFile.c"/>\r
 \r
-  <taskdef resource="cpptasks.tasks"/>\r
-  <typedef resource="cpptasks.types"/>\r
   <taskdef resource="net/sf/antcontrib/antlib.xml"/>\r
 \r
   <property name="LINK_OUTPUT_TYPE" value="static"/>\r
index ae930b0..398b862 100644 (file)
@@ -17,8 +17,6 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
   <property name="ToolName" value="GenFvImage"/>\r
   <property name="FileSet" value="GenFvImageLib.c GenFvImageExe.c"/>\r
 \r
-  <taskdef resource="cpptasks.tasks"/>\r
-  <typedef resource="cpptasks.types"/>\r
   <taskdef resource="net/sf/antcontrib/antlib.xml"/>\r
 \r
   <property name="LINK_OUTPUT_TYPE" value="static"/>\r
index 63ffccd..2f6baa2 100644 (file)
@@ -17,8 +17,6 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
   <property name="ToolName" value="GenSection"/>\r
   <property name="FileSet" value="GenSection.c"/>\r
 \r
-  <taskdef resource="cpptasks.tasks"/>\r
-  <typedef resource="cpptasks.types"/>\r
   <taskdef resource="net/sf/antcontrib/antlib.xml"/>\r
 \r
   <property name="LINK_OUTPUT_TYPE" value="static"/>\r
index e79f957..da485cf 100644 (file)
@@ -17,8 +17,6 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
   <property name="ToolName" value="GenTEImage"/>\r
   <property name="FileSet" value="*.c"/>\r
 \r
-  <taskdef resource="cpptasks.tasks"/>\r
-  <typedef resource="cpptasks.types"/>\r
   <taskdef resource="net/sf/antcontrib/antlib.xml"/>\r
 \r
 \r
index aec3ad1..cadd603 100644 (file)
@@ -17,8 +17,6 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
   <property name="ToolName" value="GuidChk"/>\r
   <property name="FileSet" value="*.c *.h"/>\r
 \r
-  <taskdef resource="cpptasks.tasks"/>\r
-  <typedef resource="cpptasks.types"/>\r
   <taskdef resource="net/sf/antcontrib/antlib.xml"/>\r
 \r
   <property name="LINK_OUTPUT_TYPE" value="static"/>\r
index 60c34c2..4e27203 100755 (executable)
@@ -17,8 +17,6 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
   <property name="ToolName" value="MakeDeps"/>\r
   <property name="FileSet" value="*.c *.h"/>\r
 \r
-  <taskdef resource="cpptasks.tasks"/>\r
-  <typedef resource="cpptasks.types"/>\r
   <taskdef resource="net/sf/antcontrib/antlib.xml"/>\r
 \r
   <property name="LINK_OUTPUT_TYPE" value="static"/>\r
index a695ae0..a7a26f4 100644 (file)
@@ -17,8 +17,6 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
   <property name="ToolName" value="ModifyInf"/>\r
   <property name="FileSet" value="ModifyInf.c"/>\r
 \r
-  <taskdef resource="cpptasks.tasks"/>\r
-  <typedef resource="cpptasks.types"/>\r
   <taskdef resource="net/sf/antcontrib/antlib.xml"/>\r
 \r
   <property name="LINK_OUTPUT_TYPE" value="static"/>\r
index dfc1455..5280085 100644 (file)
@@ -16,8 +16,6 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
 -->\r
   <property name="ToolName" value="antlr"/>\r
 \r
-  <taskdef resource="cpptasks.tasks"/>\r
-  <typedef resource="cpptasks.types"/>\r
   <taskdef resource="net/sf/antcontrib/antlib.xml"/>\r
 \r
   <target name="init">\r
index 4f4e0a9..d6ed074 100644 (file)
@@ -16,8 +16,6 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
   <property name="ToolName" value="Pccts"/>\r
 -->\r
 \r
-  <taskdef resource="cpptasks.tasks"/>\r
-  <typedef resource="cpptasks.types"/>\r
   <taskdef resource="net/sf/antcontrib/antlib.xml"/>\r
 \r
   <target name="init">\r
index 4195950..3a8a9ee 100644 (file)
@@ -16,8 +16,6 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
 -->\r
   <property name="ToolName" value="dlg"/>\r
 \r
-  <taskdef resource="cpptasks.tasks"/>\r
-  <typedef resource="cpptasks.types"/>\r
   <taskdef resource="net/sf/antcontrib/antlib.xml"/>\r
 \r
   <property name="PACKAGE_DIR" value="${WORKSPACE}/Tools"/>\r
index db37829..912a545 100644 (file)
@@ -14,8 +14,6 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
     EDK PeCoffLoader\r
   Copyright (c) 2006, Intel Corporation\r
 -->\r
-  <taskdef resource="cpptasks.tasks"/>\r
-  <typedef resource="cpptasks.types"/>\r
   <taskdef resource="net/sf/antcontrib/antlib.xml"/>\r
 \r
   <property name="LibName" value="PeCoffLoader"/>\r
index 7174441..329a743 100644 (file)
@@ -17,8 +17,6 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
   <property name="ToolName" value="PeiRebase"/>\r
   <property name="FileSet" value="*.c"/>\r
 \r
-  <taskdef resource="cpptasks.tasks"/>\r
-  <typedef resource="cpptasks.types"/>\r
   <taskdef resource="net/sf/antcontrib/antlib.xml"/>\r
 \r
   <property name="LINK_OUTPUT_TYPE" value="static"/>\r
index f615b2a..3550dc5 100644 (file)
@@ -17,8 +17,6 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
   <property name="ToolName" value="SecApResetVectorFixup"/>\r
   <property name="FileSet" value="*.c"/>\r
 \r
-  <taskdef resource="cpptasks.tasks"/>\r
-  <typedef resource="cpptasks.types"/>\r
   <taskdef resource="net/sf/antcontrib/antlib.xml"/>\r
 \r
   <property name="LINK_OUTPUT_TYPE" value="static"/>\r
index ebc408b..99f78e0 100644 (file)
@@ -17,8 +17,6 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
   <property name="ToolName" value="SecFixup"/>\r
   <property name="FileSet" value="*.c"/>\r
 \r
-  <taskdef resource="cpptasks.tasks"/>\r
-  <typedef resource="cpptasks.types"/>\r
   <taskdef resource="net/sf/antcontrib/antlib.xml"/>\r
 \r
   <property name="LINK_OUTPUT_TYPE" value="static"/>\r
index 9425797..5219bd6 100644 (file)
@@ -17,8 +17,6 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
   <property name="ToolName" value="SetStamp"/>\r
   <property name="FileSet" value="SetStamp.c"/>\r
 \r
-  <taskdef resource="cpptasks.tasks"/>\r
-  <typedef resource="cpptasks.types"/>\r
   <taskdef resource="net/sf/antcontrib/antlib.xml"/>\r
 \r
   <property name="LINK_OUTPUT_TYPE" value="static"/>\r
index 6fa9b57..0666a1f 100644 (file)
@@ -17,8 +17,6 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
   <property name="ToolName" value="SplitFile"/>\r
   <property name="FileSet" value="*.c"/>\r
 \r
-  <taskdef resource="cpptasks.tasks"/>\r
-  <typedef resource="cpptasks.types"/>\r
   <taskdef resource="net/sf/antcontrib/antlib.xml"/>\r
 \r
   <property name="LINK_OUTPUT_TYPE" value="static"/>\r
index f011177..cac016e 100644 (file)
@@ -17,8 +17,6 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
   <property name="ToolName" value="StrGather"/>\r
   <property name="FileSet" value="*.c *.h"/>\r
 \r
-  <taskdef resource="cpptasks.tasks"/>\r
-  <typedef resource="cpptasks.types"/>\r
   <taskdef resource="net/sf/antcontrib/antlib.xml"/>\r
 \r
   <property name="LINK_OUTPUT_TYPE" value="static"/>\r
index 933cb5c..b42504e 100644 (file)
@@ -14,8 +14,6 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
     EDK String\r
   Copyright (c) 2006, Intel Corporation\r
 -->\r
-  <taskdef resource="cpptasks.tasks"/>\r
-  <typedef resource="cpptasks.types"/>\r
   <taskdef resource="net/sf/antcontrib/antlib.xml"/>\r
 \r
   <property name="LibName" value="String"/>\r
index 9ead28d..6c34d95 100644 (file)
@@ -17,8 +17,6 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
   <property name="ToolName" value="Strip"/>\r
   <property name="FileSet" value="*.c"/>\r
 \r
-  <taskdef resource="cpptasks.tasks"/>\r
-  <typedef resource="cpptasks.types"/>\r
   <taskdef resource="net/sf/antcontrib/antlib.xml"/>\r
 \r
   <property name="LINK_OUTPUT_TYPE" value="static"/>\r
index 247f0d2..da857df 100644 (file)
@@ -17,8 +17,6 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
   <property name="ToolName" value="VfrCompile"/>\r
   <property name="FileSet" value="*.cpp"/>\r
   <property name="FileSetPccts" value="ATokenBuffer.cpp DLexerBase.cpp AParser.cpp"/>\r
-  <taskdef resource="cpptasks.tasks"/>\r
-  <typedef resource="cpptasks.types"/>\r
   <taskdef resource="net/sf/antcontrib/antlib.xml"/>\r
 \r
   <property name="LINK_OUTPUT_TYPE" value="static"/>\r
index 2a85fc1..efdf002 100644 (file)
@@ -17,8 +17,6 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
   <property name="ToolName" value="ZeroDebugData"/>\r
   <property name="FileSet" value="*.c"/>\r
 \r
-  <taskdef resource="cpptasks.tasks"/>\r
-  <typedef resource="cpptasks.types"/>\r
   <taskdef resource="net/sf/antcontrib/antlib.xml"/>\r
 \r
   <property name="LINK_OUTPUT_TYPE" value="static"/>\r
index bbe5456..f222b4a 100644 (file)
@@ -35,21 +35,24 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
     <fileset dir="${env.XMLBEANS_HOME}/lib" includes="*.jar"/>\r
   </path>\r
 \r
-  <taskdef classpathref="classpath" resource="GenBuild.tasks" />\r
   <taskdef classpathref="classpath" resource="net/sf/antcontrib/antlib.xml" />\r
 \r
-  <taskdef classpathref="classpath" resource="cpptasks.tasks"/>\r
-  <typedef classpathref="classpath" resource="cpptasks.types"/>\r
 \r
-  <target name="all" depends="init, Tools">\r
+  <target name="all" depends="initArch, init, Tools">\r
     <echo message="The EDK II C Tools build complete!"/>\r
   </target>\r
   \r
   <target name="init">\r
     <echo message="EDK C Code Tools, build initialization"/>\r
+    <taskdef classpathref="classpath" resource="GenBuild.tasks" />\r
+    <taskdef classpathref="classpath" resource="cpptasks.tasks"/>\r
+    <typedef classpathref="classpath" resource="cpptasks.types"/>\r
     <mkdir dir="${BIN_DIR}" />\r
     <mkdir dir="${LIB_DIR}" />\r
 \r
+  </target>\r
+\r
+  <target name="initArch">\r
     <condition property="HostArch" value="X64">\r
       <os arch="amd64"/>\r
     </condition>\r
@@ -240,7 +243,7 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
     </if>\r
   </target>\r
 \r
-  <target name="Libraries" depends="init">\r
+  <target name="Libraries" depends="initArch, init">\r
     <subant target="" inheritall="true">\r
       <fileset dir="${PACKAGE_DIR}" \r
         includes="${Libs}"/>\r
@@ -254,13 +257,13 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
     </subant>\r
   </target>\r
 \r
-  <target name="clean" depends="init">\r
+  <target name="clean" depends="initArch">\r
     <subant target="clean" inheritall="true">\r
       <fileset dir="${PACKAGE_DIR}" includes="*/build.xml"/>\r
     </subant>\r
   </target>\r
 \r
-  <target name="cleanall" depends="init">\r
+  <target name="cleanall" depends="initArch">\r
     <subant target="cleanall" inheritall="true">\r
       <fileset dir="${PACKAGE_DIR}" includes="*/build.xml"/>\r
     </subant>\r