From a9c9a31de867c87a4823414f057bc17632e9804a Mon Sep 17 00:00:00 2001 From: jwang36 Date: Tue, 26 Jun 2007 08:07:10 +0000 Subject: [PATCH] Removed the AutoGen-Code type of file build; added new macro for replacement. git-svn-id: https://edk2.svn.sourceforge.net/svnroot/edk2/trunk/edk2@2745 6f19259b-4bc3-4df7-8a09-765794883524 --- BaseTools/Conf/build_rule.template | 31 +++++++++++++++--------------- 1 file changed, 15 insertions(+), 16 deletions(-) diff --git a/BaseTools/Conf/build_rule.template b/BaseTools/Conf/build_rule.template index db459d988b..91407f17eb 100644 --- a/BaseTools/Conf/build_rule.template +++ b/BaseTools/Conf/build_rule.template @@ -82,36 +82,35 @@ ToolChainFamilyMapping = { ## Build rules for makefile # Placeholders for string substitution -# ${fdir} File relative directory within a module +# ${fpath} File path relative to $(WORKSPACE) +# ${fdir} File relative directory within a module # ${fname} File full name without path # ${fbase} File name without extension and path -# ${fext} File extension -# ${dep} Dependency file -# ${sep} Directory separator +# ${fext} File extension +# ${fdep} File dependencies +# ${sep} Directory separator # Makefile = { "nmake" : { "C-Code" : '''\ -${BEGIN}$(OUTPUT_DIR)${sep}${fdir}${sep}${fbase}.obj : $(WORKSPACE)${sep}${dep} -${END} "$(CC)" $(CC_FLAGS) $(INC) /Fo$@ $(MODULE_DIR)${sep}${fdir}${sep}${fname} -''', - -"AutoGen-Code" : '''\ -${BEGIN}$(OUTPUT_DIR)${sep}${fbase}.obj : $(WORKSPACE)${sep}${dep} -${END} "$(CC)" $(CC_FLAGS) $(INC) /Fo$@ $(DEBUG_DIR)${sep}${fname} +$(OUTPUT_DIR)${sep}${fdir}${sep}${fbase}.obj : $(COMMON_DEPS) +${BEGIN}$(OUTPUT_DIR)${sep}${fdir}${sep}${fbase}.obj : $(WORKSPACE)${sep}${fdep} +${END} "$(CC)" $(CC_FLAGS) $(INC) /Fo$@ $(WORKSPACE)${sep}${fpath} ''', "Masm-Code" : '''\ -${BEGIN}$(OUTPUT_DIR)${sep}${fdir}${sep}${fbase}.obj : $(WORKSPACE)${sep}${dep} -${END} "$(PP)" $(PP_FLAGS) $(INC) $(MODULE_DIR)${sep}${fdir}${sep}${fname} > $(@D)${sep}${fbase}.i +$(OUTPUT_DIR)${sep}${fdir}${sep}${fbase}.obj : $(COMMON_DEPS) +${BEGIN}$(OUTPUT_DIR)${sep}${fdir}${sep}${fbase}.obj : $(WORKSPACE)${sep}${fdep} +${END} "$(PP)" $(PP_FLAGS) $(INC) $(WORKSPACE)${sep}${fpath} > $(@D)${sep}${fbase}.i Trim -CONVERT $(@D)${sep}${fbase}.i "$(ASM)" $(ASM_FLAGS) /Fo$@ $(@D)${sep}${fbase}.iii ''', "Iasm-Code" : '''\ -${BEGIN}$(OUTPUT_DIR)${sep}${fdir}${sep}${fbase}.obj : $(WORKSPACE)${sep}${dep} -${END} "$(APP)" $(APP_FLAGS) $(INC) $< $(PP_OUTPUT)$(@D)${sep}${fbase}.i - "$(ASM)" $(ASM_FLAGS) $(ASM_OUTPUT)$@ $(@D)${sep}${fbase}.i +$(OUTPUT_DIR)${sep}${fdir}${sep}${fbase}.obj : $(COMMON_DEPS) +${BEGIN}$(OUTPUT_DIR)${sep}${fdir}${sep}${fbase}.obj : $(WORKSPACE)${sep}${fdep} +${END} "$(APP)" $(APP_FLAGS) $(INC) $(WORKSPACE)${sep}${fpath} > $(@D)${sep}${fbase}.i + "$(ASM)" $(ASM_FLAGS) /Fo$@ $(@D)${sep}${fbase}.i ''', "Visual-Form-Representation" : -- 2.39.2