anv: Emit cherryview SF state without including gen9_pack.h

[mesa.git] / src / intel / Makefile.genxml.am

diff --git a/src/intel/Makefile.genxml.am b/src/intel/Makefile.genxml.am
index f8b0363fa2664b62fb93b84e1a5b3f5f9fad4af1..2ed2741e4feda3e959322833777b5f636399c9d1 100644 (file)
--- a/src/intel/Makefile.genxml.am
+++ b/src/intel/Makefile.genxml.am
@@ -23,21 +23,28 @@ BUILT_SOURCES += \
        $(GENXML_GENERATED_FILES) \
        $(AUBINATOR_GENERATED_FILES)
 
+EXTRA_DIST += \
+       $(GENXML_GENERATED_FILES) \
+       $(AUBINATOR_GENERATED_FILES)
+
 SUFFIXES = _pack.h _xml.h .xml
 
 $(GENXML_GENERATED_FILES): genxml/gen_pack_header.py
 
 .xml_pack.h:
        $(MKDIR_GEN)
-       $(PYTHON_GEN) $(srcdir)/genxml/gen_pack_header.py $< > $@
+       $(PYTHON_GEN) $(srcdir)/genxml/gen_pack_header.py $< > $@ || ($(RM) $@; false)
 
 # xxd generates variable names based on the path of the input file. We
 # prefer to generate our own name here, so it doesn't vary from
 # in/out-of-tree builds.
-%_xml.h:  %.xml Makefile
+
+$(GENXML_GENERATED_FILES): Makefile
+
+.xml_xml.h:
        $(MKDIR_GEN)
        $(AM_V_GEN) echo -n "static const uint8_t " > $@; \
-       echo "`basename $@`_xml[] = {" | sed -e 's,_xml.h,,' >> $@; \
+       echo "$(@F)_xml[] = {" | sed -e 's,_xml.h,,' >> $@; \
        cat $< | $(XXD) -i >> $@; \
        echo "};" >> $@