Add dependency for RealAsm file build rules and Use the module name in place of macro STRING_ARRAY_NAME

git-svn-id: https://edk2.svn.sourceforge.net/svnroot/edk2/trunk/edk2@2205 6f19259b-4bc3-4df7-8a09-765794883524

1 files changed, 18 insertions, 8 deletions

diff --git a/Tools/Conf/BuildMacro.xml b/Tools/Conf/BuildMacro.xml
index 0442b05b9d..a673d00a22 100644
--- a/Tools/Conf/BuildMacro.xml
+++ b/Tools/Conf/BuildMacro.xml
@@ -785,14 +785,24 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
     <element name="EXTRA.ARG" optional="yes"/>

     

     <sequential>

-      <!-- Lack Dependency Check -->

-      <exec dir="${DEST_DIR_OUTPUT}" executable="${ASM}" failonerror="true">

-        <arg line="/nologo /omf ${MODULE_DIR}/@{FILEPATH}/@{FILENAME}.@{FILEEXT} /Bl${ASMLINK} ${ASMLINK_FLAGS}"/>

-      </exec>

-      <concat destfile="${DEST_DIR_OUTPUT}/@{FILENAME}.cat" binary="yes">

-        <filelist dir="${MODULE_DIR}" files="Blank2.pad"/>

-        <filelist dir="${DEST_DIR_OUTPUT}" files="@{FILENAME}.com"/>

-      </concat>

+      <OnDependency>

+        <sourcefiles>

+          <file name="${MODULE_DIR}/@{FILEPATH}/@{FILENAME}.@{FILEEXT}"/>

+        </sourcefiles>

+        <targetfiles>

+          <file name="${DEST_DIR_OUTPUT}/@{FILENAME}.cat"/>

+        </targetfiles>

+  

+        <sequential>

+          <exec dir="${DEST_DIR_OUTPUT}" executable="${ASM}" failonerror="true">

+            <arg line="/nologo /omf ${MODULE_DIR}/@{FILEPATH}/@{FILENAME}.@{FILEEXT} /Bl${ASMLINK} ${ASMLINK_FLAGS}"/>

+          </exec>

+          <concat destfile="${DEST_DIR_OUTPUT}/@{FILENAME}.cat" binary="yes">

+            <filelist dir="${MODULE_DIR}" files="Blank2.pad"/>

+            <filelist dir="${DEST_DIR_OUTPUT}" files="@{FILENAME}.com"/>

+          </concat>

+        </sequential>

+      </OnDependency>

     </sequential>

   </macrodef>