<div dir="ltr"><br><div class="gmail_extra"><br><div class="gmail_quote">2017-04-01 17:18 GMT+02:00 Lionel Landwerlin <span dir="ltr"><<a href="mailto:lionel.g.landwerlin@intel.com" target="_blank">lionel.g.landwerlin@intel.com</a>></span>:<br><blockquote class="gmail_quote" style="margin:0px 0px 0px 0.8ex;border-left:1px solid rgb(204,204,204);padding-left:1ex"><span class="gmail-">On 01/04/17 11:50, Mauro Rossi wrote:<br>
<blockquote class="gmail_quote" style="margin:0px 0px 0px 0.8ex;border-left:1px solid rgb(204,204,204);padding-left:1ex">
Recent changes in Makefile.sources merged the aubinator files in<br>
a unique list of generated files and genxml/genX_xml.h is now needed<br>
to avoid the following building error:<br>
<br>
ninja: error: '.../genxml/genX_xml.h', needed by '.../genxml/genX_xml.h',<br>
missing and no known rule to make it<br>
build/core/<a href="http://ninja.mk:148" rel="noreferrer" target="_blank">ninja.mk:148</a>: recipe for target 'ninja_wrapper' failed<br>
<br>
Fixes: 0f83c05 "intel: genxml: compress all gen files into one"<br>
---<br>
  src/intel/<a href="http://Android.genxml.mk" rel="noreferrer" target="_blank">Android.genxml.mk</a> | 5 +++++<br>
  1 file changed, 5 insertions(+)<br>
<br>
diff --git a/src/intel/<a href="http://Android.genxml.mk" rel="noreferrer" target="_blank">Android.genxml.mk</a> b/src/intel/<a href="http://Android.genxml.mk" rel="noreferrer" target="_blank">Android.genxml.mk</a><br>
index 842d0e13a33..4b0746c245b 100644<br>
--- a/src/intel/<a href="http://Android.genxml.mk" rel="noreferrer" target="_blank">Android.genxml.mk</a><br>
+++ b/src/intel/<a href="http://Android.genxml.mk" rel="noreferrer" target="_blank">Android.genxml.mk</a><br>
@@ -96,6 +96,11 @@ $(intermediates)/genxml/gen9_p<wbr>ack.h: PRIVATE_XML := $(LOCAL_PATH)/genxml/gen9.xm<br>
  $(intermediates)/genxml/gen9_p<wbr>ack.h: $(LOCAL_PATH)/genxml/gen9.xml $(LOCAL_PATH)/genxml/gen_pack_<wbr>header.py<br>
        $(call header-gen)<br>
  +$(intermediates)/genxml/genX_<wbr>xml.h: $(addprefix $(MESA_TOP)/src/intel/,$(GENXM<wbr>L_XML_FILES)) $(MESA_TOP)/src/intel/genxml/g<wbr>en_zipped_file.py<br>
+       @mkdir -p $(dir $@)<br>
+       @echo "Gen Header: $(PRIVATE_MODULE) <= $(notdir $(@))"<br>
+       $(hide) $(MESA_PYTHON2) $(MESA_TOP)/src/intel/genxml/g<wbr>en_zipped_file.py $(addprefix $(MESA_TOP)/src/intel/,$(GENXM<wbr>L_XML_FILES)) > $@ || (rm -f $@; false)<br>
+<br>
</blockquote>
<br></span>
The other files seems to use the header-gen macro, why not this one too?<br></blockquote><div><br></div><div>Hi Lionel,<br></div><div><br></div><div>the header-gen macro could have be reused, <br>but additional <span class="gmail-">'|| (rm -f $@; false)' would have required an hybrid generation rule<br></span></div><div><span class="gmail-">or to define an additional macro.<br><br></span></div><div><span class="gmail-">In this way the exact automake generation rules have been ported and are less cryptic,<br></span></div><div><span class="gmail-">as suggested by Emil in the last serie of similar cases.<br><br></span></div><div><span class="gmail-">Mauro<br></span></div><div><span class="gmail-"><br></span></div><div> </div><blockquote class="gmail_quote" style="margin:0px 0px 0px 0.8ex;border-left:1px solid rgb(204,204,204);padding-left:1ex">
<br>
Acked-by: Lionel Landwerlin <<a href="mailto:lionel.g.landwerlin@intel.com" target="_blank">lionel.g.landwerlin@intel.com</a><wbr>><br>
<br>
<blockquote class="gmail_quote" style="margin:0px 0px 0px 0.8ex;border-left:1px solid rgb(204,204,204);padding-left:1ex">
  LOCAL_EXPORT_C_INCLUDE_DIRS := \<br>
        $(MESA_TOP)/src/intel \<br>
        $(intermediates)<br>
</blockquote>
<br>
<br>
</blockquote></div><br></div></div><div id="DAB4FAD8-2DD7-40BB-A1B8-4E2AA1F9FDF2"><br> <table style="border-top:1px solid #d3d4de">
        <tr>
      <td style="width:55px;padding-top:18px"><a href="https://www.avast.com/sig-email?utm_medium=email&utm_source=link&utm_campaign=sig-email&utm_content=webmail" target="_blank"><img src="https://ipmcdn.avast.com/images/icons/icon-envelope-tick-round-orange-animated-no-repeat-v1.gif" width="46" height="29" style="width: 46px; height: 29px;"></a></td>
                <td style="width:470px;padding-top:17px;color:#41424e;font-size:13px;font-family:Arial,Helvetica,sans-serif;line-height:18px">Mail priva di virus. <a href="https://www.avast.com/sig-email?utm_medium=email&utm_source=link&utm_campaign=sig-email&utm_content=webmail" target="_blank" style="color:#4453ea">www.avast.com</a>          </td>
        </tr>
</table>
<a href="#DAB4FAD8-2DD7-40BB-A1B8-4E2AA1F9FDF2" width="1" height="1"></a></div>