diff options
| author | Jonathan Gray <jsg@cvs.openbsd.org> | 2016-12-11 16:03:26 +0000 |
|---|---|---|
| committer | Jonathan Gray <jsg@cvs.openbsd.org> | 2016-12-11 16:03:26 +0000 |
| commit | b007d313e6c701a6fbc4030936f43f83e6af3f78 (patch) | |
| tree | d04d313d4259480aee399ed93b02d900bc097ce7 /lib/mesa/src/intel | |
| parent | c92d9dcdf2aa8a705de06f2ba38a5d2a6531f84b (diff) | |
disable additional rules to regen sources when xxd is not found
Found the hard way by Mark Patruck and naddy. Didn't encounter it here
with a post import build for reasons unknown.
Diffstat (limited to 'lib/mesa/src/intel')
| -rw-r--r-- | lib/mesa/src/intel/Makefile.genxml.am | 2 | ||||
| -rw-r--r-- | lib/mesa/src/intel/Makefile.in | 12 |
2 files changed, 8 insertions, 6 deletions
diff --git a/lib/mesa/src/intel/Makefile.genxml.am b/lib/mesa/src/intel/Makefile.genxml.am index 9694ccafa..df0d7a6b1 100644 --- a/lib/mesa/src/intel/Makefile.genxml.am +++ b/lib/mesa/src/intel/Makefile.genxml.am @@ -43,12 +43,14 @@ endif $(GENXML_GENERATED_FILES): Makefile +if REGEN_SOURCES .xml_xml.h: $(MKDIR_GEN) $(AM_V_GEN) echo -n "static const uint8_t " > $@; \ echo "$(@F)_xml[] = {" | sed -e 's,_xml.h,,' >> $@; \ cat $< | $(XXD) -i >> $@; \ echo "};" >> $@ +endif EXTRA_DIST += \ genxml/gen4.xml \ diff --git a/lib/mesa/src/intel/Makefile.in b/lib/mesa/src/intel/Makefile.in index 05951fa56..89ed2bc5c 100644 --- a/lib/mesa/src/intel/Makefile.in +++ b/lib/mesa/src/intel/Makefile.in @@ -1412,12 +1412,12 @@ $(GENXML_GENERATED_FILES): genxml/gen_pack_header.py $(GENXML_GENERATED_FILES): Makefile -.xml_xml.h: - $(MKDIR_GEN) - $(AM_V_GEN) echo -n "static const uint8_t " > $@; \ - echo "$(@F)_xml[] = {" | sed -e 's,_xml.h,,' >> $@; \ - cat $< | $(XXD) -i >> $@; \ - echo "};" >> $@ +@REGEN_SOURCES_TRUE@.xml_xml.h: +@REGEN_SOURCES_TRUE@ $(MKDIR_GEN) +@REGEN_SOURCES_TRUE@ $(AM_V_GEN) echo -n "static const uint8_t " > $@; \ +@REGEN_SOURCES_TRUE@ echo "$(@F)_xml[] = {" | sed -e 's,_xml.h,,' >> $@; \ +@REGEN_SOURCES_TRUE@ cat $< | $(XXD) -i >> $@; \ +@REGEN_SOURCES_TRUE@ echo "};" >> $@ @REGEN_SOURCES_TRUE@isl/isl_format_layout.c: isl/gen_format_layout.py \ @REGEN_SOURCES_TRUE@ isl/isl_format_layout.csv |