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

[mirror_edk2.git] / Tools / Conf / BuildMacro.xml

diff --git a/Tools/Conf/BuildMacro.xml b/Tools/Conf/BuildMacro.xml
index 4f4c1217f7217c6a9a6a5cefdaa5aaa976f3d111..a673d00a22c5f98fe49753a2427eabd13568d2d4 100644 (file)
--- a/Tools/Conf/BuildMacro.xml
+++ b/Tools/Conf/BuildMacro.xml
@@ -733,7 +733,7 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
               <cc userdefine="on">\r
                 <command type="PP" cmd="${PP}" workdir="${DEST_DIR_OUTPUT}/@{FILEPATH}" family="${PP_FAMILY}" \r
                          dpath="${PP_DPATH}" libpath="${PP_LIBPATH}" include="${PP_INCLUDEPATH}">\r
-                  <argument value="${VFRPP_FLAGS}"/>\r
+              <argument value="${VFRPP_FLAGS} ${MODULE_DIR}/@{FILEPATH}/@{FILENAME}.@{FILEEXT}"/>\r
                   <!-- Output file of the preprocess -->   \r
                   <EXTRA.INC/>            \r
                   <fileset casesensitive="on" file="${MODULE_DIR}/@{FILEPATH}/@{FILENAME}.@{FILEEXT}"/>              \r
@@ -785,14 +785,24 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
     <element name="EXTRA.ARG" optional="yes"/>\r
     \r
     <sequential>\r
-      <!-- Lack Dependency Check -->\r
-      <exec dir="${DEST_DIR_OUTPUT}" executable="${ASM}" failonerror="true">\r
-        <arg line="/nologo /omf ${MODULE_DIR}/@{FILEPATH}/@{FILENAME}.@{FILEEXT} /Bl${ASMLINK} ${ASMLINK_FLAGS}"/>\r
-      </exec>\r
-      <concat destfile="${DEST_DIR_OUTPUT}/@{FILENAME}.cat" binary="yes">\r
-        <filelist dir="${MODULE_DIR}" files="Blank2.pad"/>\r
-        <filelist dir="${DEST_DIR_OUTPUT}" files="@{FILENAME}.com"/>\r
-      </concat>\r
+      <OnDependency>\r
+        <sourcefiles>\r
+          <file name="${MODULE_DIR}/@{FILEPATH}/@{FILENAME}.@{FILEEXT}"/>\r
+        </sourcefiles>\r
+        <targetfiles>\r
+          <file name="${DEST_DIR_OUTPUT}/@{FILENAME}.cat"/>\r
+        </targetfiles>\r
+  \r
+        <sequential>\r
+          <exec dir="${DEST_DIR_OUTPUT}" executable="${ASM}" failonerror="true">\r
+            <arg line="/nologo /omf ${MODULE_DIR}/@{FILEPATH}/@{FILENAME}.@{FILEEXT} /Bl${ASMLINK} ${ASMLINK_FLAGS}"/>\r
+          </exec>\r
+          <concat destfile="${DEST_DIR_OUTPUT}/@{FILENAME}.cat" binary="yes">\r
+            <filelist dir="${MODULE_DIR}" files="Blank2.pad"/>\r
+            <filelist dir="${DEST_DIR_OUTPUT}" files="@{FILENAME}.com"/>\r
+          </concat>\r
+        </sequential>\r
+      </OnDependency>\r
     </sequential>\r
   </macrodef>\r
 \r