diff options
| author | Patrick Williams <iawillia@us.ibm.com> | 2013-03-13 11:09:28 -0500 |
|---|---|---|
| committer | A. Patrick Williams III <iawillia@us.ibm.com> | 2013-03-14 16:01:27 -0500 |
| commit | cdb8cf581d746c7e05495236ece738612bc48c91 (patch) | |
| tree | 88cc51efe1e70f6eb1d8f9ab8ed9271099f1ab65 /src/usr/targeting/xmltohb/makefile | |
| parent | c303bce617567de5d32c838fae74f608096aa71b (diff) | |
| download | talos-hostboot-cdb8cf581d746c7e05495236ece738612bc48c91.tar.gz talos-hostboot-cdb8cf581d746c7e05495236ece738612bc48c91.zip | |
Misc build fixes.
- xmltohb was running too often, causing most of the code to be
rebuilt on any 'make' call.
- hbotStringFile was not being rebuilt.
- 'make' sometimes failed if obj/genfiles/errl did not exist.
Change-Id: I509cd4dafe9cb4b8d22482c9058f7e84e508d968
Reviewed-on: http://gfw160.austin.ibm.com:8080/gerrit/3534
Reviewed-by: Brian H. Horton <brianh@linux.ibm.com>
Tested-by: Jenkins Server
Reviewed-by: Michael Baiocchi <baiocchi@us.ibm.com>
Reviewed-by: A. Patrick Williams III <iawillia@us.ibm.com>
Diffstat (limited to 'src/usr/targeting/xmltohb/makefile')
| -rw-r--r-- | src/usr/targeting/xmltohb/makefile | 9 |
1 files changed, 6 insertions, 3 deletions
diff --git a/src/usr/targeting/xmltohb/makefile b/src/usr/targeting/xmltohb/makefile index 000aabd8a..f233103b7 100644 --- a/src/usr/targeting/xmltohb/makefile +++ b/src/usr/targeting/xmltohb/makefile @@ -106,6 +106,9 @@ make_gendir_errl: @mkdir -p $(GENDIR_ERRL) GEN_PASS_PRE += make_gendir_errl +XMLTOHB_RAN_INDICATION = $(GENDIR)/.called_xmltohb_compiler +CLEAN_TARGETS += $(XMLTOHB_RAN_INDICATION) + include ${ROOTPATH}/config.mk # Delete any generated file on error @@ -131,9 +134,8 @@ ${GENDIR}/${XMLTOHB_FAPI_XML}: ${XMLTOHB_MERGE_SCRIPT} \ $< $^ > $@ # create the header files, only needs generic xml -$(call GENTARGET,$(XMLTOHB_TARGETS)) : call_xmltohb_compiler -.PHONY: call_xmltohb_compiler -call_xmltohb_compiler: ${XMLTOHB_COMPILER_SCRIPT} \ +$(call GENTARGET,$(XMLTOHB_TARGETS)) : $(XMLTOHB_RAN_INDICATION) +$(XMLTOHB_RAN_INDICATION): ${XMLTOHB_COMPILER_SCRIPT} \ ${GENDIR}/${XMLTOHB_GENERIC_XML} ${GENDIR}/${XMLTOHB_FAPI_XML} $< $(addprefix --hb-xml-file=,${GENDIR}/${XMLTOHB_GENERIC_XML}) \ $(addprefix --fapi-attributes-xml-file=,${GENDIR}/${XMLTOHB_FAPI_XML}) \ @@ -141,6 +143,7 @@ call_xmltohb_compiler: ${XMLTOHB_COMPILER_SCRIPT} \ --img-output-file=none cp ${GENDIR_ERRL}/errludattribute.H ${GENDIR_PLUGINS} cp ${GENDIR_ERRL}/errludtarget.H ${GENDIR_PLUGINS} + touch $(XMLTOHB_RAN_INDICATION) # system-specific XML needs the generic plus the xxx.system.xml file + the # MRW file |
