Mesa (master): intel/genxml: fix building rules for aubinator required headers

Emil Velikov evelikov at kemper.freedesktop.org
Tue Oct 11 13:04:39 UTC 2016


Module: Mesa
Branch: master
Commit: b9e639589d2e06f3a7ecfebd811cacb9655fab5a
URL:    http://cgit.freedesktop.org/mesa/mesa/commit/?id=b9e639589d2e06f3a7ecfebd811cacb9655fab5a

Author: Mauro Rossi <issor.oruam at gmail.com>
Date:   Mon Oct 10 23:43:42 2016 +0200

intel/genxml: fix building rules for aubinator required headers

New generated headers were introduced by commit 63a366a
"intel: aubinator: generate a standalone binary"

Android does not need aubinator yet, so in order to avoid building error,
aubinator required new genxml headers are defined in a separate list.

If required, building rules for Android will be added later.
[Emil Velikov: don't use a _HEADERS variable name (causes warnings)]
Signed-off-by: Emil Velikov <emil.velikov at collabora.com>

---

 src/intel/Makefile.genxml.am | 4 +++-
 src/intel/Makefile.sources   | 4 +++-
 2 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/src/intel/Makefile.genxml.am b/src/intel/Makefile.genxml.am
index 160a411..f8b0363 100644
--- a/src/intel/Makefile.genxml.am
+++ b/src/intel/Makefile.genxml.am
@@ -19,7 +19,9 @@
 # FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS
 # IN THE SOFTWARE.
 
-BUILT_SOURCES += $(GENXML_GENERATED_FILES)
+BUILT_SOURCES += \
+	$(GENXML_GENERATED_FILES) \
+	$(AUBINATOR_GENERATED_FILES)
 
 SUFFIXES = _pack.h _xml.h .xml
 
diff --git a/src/intel/Makefile.sources b/src/intel/Makefile.sources
index 5b759bf..c1740fe 100644
--- a/src/intel/Makefile.sources
+++ b/src/intel/Makefile.sources
@@ -21,7 +21,9 @@ GENXML_GENERATED_FILES = \
 	genxml/gen7_pack.h \
 	genxml/gen75_pack.h \
 	genxml/gen8_pack.h \
-	genxml/gen9_pack.h \
+	genxml/gen9_pack.h
+
+AUBINATOR_GENERATED_FILES = \
 	genxml/gen6_xml.h \
 	genxml/gen7_xml.h \
 	genxml/gen75_xml.h \




More information about the mesa-commit mailing list