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 | |
| parent | c303bce617567de5d32c838fae74f608096aa71b (diff) | |
| download | blackbird-hostboot-cdb8cf581d746c7e05495236ece738612bc48c91.tar.gz blackbird-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>
| -rw-r--r-- | makefile | 7 | ||||
| -rw-r--r-- | src/makefile | 6 | ||||
| -rw-r--r-- | src/usr/errl/parser/makefile | 7 | ||||
| -rw-r--r-- | src/usr/targeting/xmltohb/makefile | 9 |
4 files changed, 18 insertions, 11 deletions
@@ -23,8 +23,8 @@ SUBDIRS = src.d ROOTPATH = . -IMAGE_PASS_BODY += $(GENDIR)/hwp_id.html $(IMGDIR)/hbotStringFile -CLEAN_TARGETS += $(GENDIR)/hwp_id.html $(IMGDIR)/hbotStringFile +IMAGE_PASS_BODY += $(GENDIR)/hwp_id.html +CLEAN_TARGETS += $(GENDIR)/hwp_id.html IMAGE_PASS_BODY += cscope ctags check_istep_modules include ./config.mk @@ -47,9 +47,6 @@ gcov: --title `git describe --dirty` @echo "View GCOV results with: firefox obj/gcov/html/index.html" -$(IMGDIR)/hbotStringFile : $(IMAGES) - $(ROOTPATH)/src/build/trace/tracehash_hb.pl -c -d $(ROOTPATH)/obj -s $@ - $(GENDIR)/hwp_id.html : $(ROOTPATH)/src/build/tools/hwp_id.pl -i -l > $@ diff --git a/src/makefile b/src/makefile index 014988e3d..5ed063483 100644 --- a/src/makefile +++ b/src/makefile @@ -97,7 +97,13 @@ hbicore_test_DATA_MODULES = ${hbicore_DATA_MODULES} testdata IMAGE_PASS_BODY += buildpnor +IMAGE_PASS_BODY += $(IMGDIR)/hbotStringFile +CLEAN_TARGETS += $(IMGDIR)/hbotStringFile + include ${ROOTPATH}/config.mk buildpnor: ${IMAGES} cd build/buildpnor/ && ${MAKE} buildpnor + +$(IMGDIR)/hbotStringFile : $(IMAGES) + $(ROOTPATH)/src/build/trace/tracehash_hb.pl -c -d $(ROOTPATH)/obj -s $@ diff --git a/src/usr/errl/parser/makefile b/src/usr/errl/parser/makefile index 386ab9b5e..3cf63bba6 100644 --- a/src/usr/errl/parser/makefile +++ b/src/usr/errl/parser/makefile @@ -59,6 +59,7 @@ endif CODE_PASS: ${IMGDIR}/errlparser +.PHONY: mkdirs mkdirs: mkdir -p ${OBJDIR} mkdir -p ${GENDIR}/plugins @@ -67,11 +68,11 @@ mkdirs: ${ERRLPARSE_TARGETS} : gen_errl_parsers .PHONY: gen_errl_parsers -gen_errl_parsers: +gen_errl_parsers: mkdirs ./genErrlParsers.pl -b ${ROOTPATH} -o ${GENDIR}/plugins -${GENDIR}/comps.C: ${ROOTPATH}/src/include/usr/hbotcompid.H - grep "const compId_t [A-Z0-9]*_COMP_ID" $^ | \ +${GENDIR}/comps.C: ${ROOTPATH}/src/include/usr/hbotcompid.H mkdirs + grep "const compId_t [A-Z0-9]*_COMP_ID" $< | \ grep -v MY_COMP_ID | \ sed 's/const compId_t \([A-Z0-9]*\)_COMP_ID[ =\t]*\(0[xX][0-9a-fA-F]*\).*/{ "\1", \2 },/' \ > $@ 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 |
