X-Git-Url: https://git.proxmox.com/?a=blobdiff_plain;f=Tools%2Fbuild.xml;h=e7f10311c44d3a36b99c0d4f613848a106874c48;hb=194479d645de05c67f38f29a4382de114f952f50;hp=ea6a2501d3b341b3485e4764895b3af8bf9a2eb1;hpb=e5890ee5f8a41818cc787ec63e3a65ac6a46e3fe;p=mirror_edk2.git

diff --git a/Tools/build.xml b/Tools/build.xml
index ea6a2501d3..e7f10311c4 100644
--- a/Tools/build.xml
+++ b/Tools/build.xml
@@ -40,6 +40,7 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
           Source/FrameworkWizard/build.xml
           Source/MigrationTools/build.xml
           Source/ContextTool/build.xml
+          Source/Merge/build.xml
           "/>
     </subant>
     <echo message="The EDK II Java Tools build has completed!"/>
@@ -55,6 +56,15 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
     </subant>
   </target>
 
+  <target name="Merge" depends="SurfaceArea">
+    <subant target="" verbose="true" inheritall="false">
+      <filelist dir="."
+        files="
+          Source/Merge/build.xml
+          "/>
+    </subant>
+  </target>
+
   <target name="SurfaceArea" depends="makeCatalog">
     <subant target="" verbose="true" inheritall="false">
       <filelist dir="."
@@ -117,6 +127,7 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
           Source/TianoTools/build.xml
           Source/MigrationTools/build.xml
           Source/ContextTool/build.xml
+          Source/Merge/build.xml
         "/>
     </subant>
   </target>
@@ -150,6 +161,7 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
           Source/TianoTools/build.xml
           Source/MigrationTools/build.xml
           Source/ContextTool/build.xml
+          Source/Merge/build.xml
         "/>
     </subant>
   </target>