summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorPatrick Williams <iawillia@us.ibm.com>2011-09-13 12:30:42 -0500
committerA. Patrick Williams III <iawillia@us.ibm.com>2011-09-21 14:00:13 -0500
commitf7db11c7b05a12310e5a0200065f49caa99ac86f (patch)
treeebd125b57efcb7548122d4c452c9e2d410486f43
parentecbf21b783f33fc71f164540122179f6e011fa7b (diff)
downloadtalos-hostboot-f7db11c7b05a12310e5a0200065f49caa99ac86f.tar.gz
talos-hostboot-f7db11c7b05a12310e5a0200065f49caa99ac86f.zip
Makefile changes to targeting XML gen.
Change-Id: I71ca4f6ee6c33f3dacbda2f8729f6534109b7690 Reviewed-on: http://gfw160.austin.ibm.com:8080/gerrit/350 Tested-by: Jenkins Server Reviewed-by: Nicholas E. Bofferding <bofferdn@us.ibm.com> Reviewed-by: MIKE J. JONES <mjjones@us.ibm.com>
-rw-r--r--config.mk2
-rw-r--r--src/usr/targeting/xmltohb/makefile33
2 files changed, 26 insertions, 9 deletions
diff --git a/config.mk b/config.mk
index a8d270cc4..33d9efbed 100644
--- a/config.mk
+++ b/config.mk
@@ -256,7 +256,7 @@ clean: ${SUBDIRS:.d=.clean}
${IMAGES:.bin=.bin.modinfo} ${IMAGES:.ruhx=.lid} \
${IMAGES:.ruhx=.lidhdr} ${IMAGES:.bin=_extended.bin} \
${IMAGE_EXTRAS} ${EXTRA_LIDS_} \
- ${EXTRA_OBJS} ${_GENFILES})
+ ${EXTRA_OBJS} ${_GENFILES} ${EXTRA_PARTS})
cscope: code_pass
mkdir -p ${ROOTPATH}/obj/cscope
diff --git a/src/usr/targeting/xmltohb/makefile b/src/usr/targeting/xmltohb/makefile
index f67de5f9f..e9431c374 100644
--- a/src/usr/targeting/xmltohb/makefile
+++ b/src/usr/targeting/xmltohb/makefile
@@ -37,16 +37,33 @@ XMLTOHB_SOURCE_TARGETS = \
XMLTOHB_BINARY_TARGETS = \
targeting.bin
-GENFILES = \
- ${XMLTOHB_HEADER_TARGETS} \
- ${XMLTOHB_SOURCE_TARGETS} \
- ${XMLTOHB_BINARY_TARGETS}
+XMLTOHB_TARGETS = \
+ ${XMLTOHB_HEADER_TARGETS} \
+ ${XMLTOHB_SOURCE_TARGETS} \
+ ${XMLTOHB_BINARY_TARGETS}
+
+XMLTOHB_HBXML_SOURCES = \
+ hb.xml
+
+XMLTOHB_FAPIATTR_SOURCES = \
+ ${ROOTPATH}/src/usr/hwpf/hwp/fapiHwpAttributeInfo.xml
+
+GENFILES = ${XMLTOHB_TARGETS}
+
+EXTRA_PARTS = $(addprefix $(IMGDIR)/, $(XMLTOHB_BINARY_TARGETS))
+
+include ${ROOTPATH}/config.mk
# Delete any generated file on error
.DELETE_ON_ERROR:
-$(addprefix %/,$(GENFILES)) : xmltohb.pl hb.xml
- ./$< --hb-xml-file ./hb.xml --fapi-attributes-xml-file=../../hwpf/hwp/fapiHwpAttributeInfo.xml --src-output-dir=$(dir $@) --img-output-dir=$(dir $@) $(filter-out $<,$^)
- cp -f $(dir $@)/targeting.bin $(IMGDIR)
+${EXTRA_PARTS}: ${IMGDIR}/% : ${GENDIR}/%
+ cp -f $^ $@
+
+$(call GENTARGET,$(XMLTOHB_TARGETS)) : \
+ xmltohb.pl ${XMLTOHB_HBXML_SOURCES} ${XMLTOHB_FAPIATTR_SOURCES}
+ ./$< $(addprefix --hb-xml-file=,${XMLTOHB_HBXML_SOURCES}) \
+ $(addprefix --fapi-attributes-xml-file=,\
+ ${XMLTOHB_FAPIATTR_SOURCES}) \
+ --src-output-dir=$(dir $@) --img-output-dir=$(dir $@)
-include ${ROOTPATH}/config.mk
OpenPOWER on IntegriCloud