android,autotools,i965: Fix location of float64_glsl.h

[mesa.git] / src / mesa / drivers / dri / i965 / Makefile.am

diff --git a/src/mesa/drivers/dri/i965/Makefile.am b/src/mesa/drivers/dri/i965/Makefile.am
index 824882389ea4b5f7ef1ae5042ed2b575a76de2ae..0bda2897e8e6e171b1fdd9de58ee003a79d002fb 100644 (file)
--- a/src/mesa/drivers/dri/i965/Makefile.am
+++ b/src/mesa/drivers/dri/i965/Makefile.am
@@ -26,6 +26,7 @@ include Makefile.sources
 AM_CFLAGS = \
        -I$(top_srcdir)/include \
        -I$(top_srcdir)/src/ \
+       -I$(top_builddir)/src/ \
        -I$(top_srcdir)/src/mapi \
        -I$(top_srcdir)/src/mesa/ \
        -I$(top_srcdir)/src/gallium/include \
@@ -33,6 +34,8 @@ AM_CFLAGS = \
        -I$(top_builddir)/src/util \
        -I$(top_srcdir)/src/mesa/drivers/dri/common \
        -I$(top_srcdir)/src/gtest/include \
+       -I$(top_builddir)/src/compiler \
+       -I$(top_srcdir)/src/compiler \
        -I$(top_builddir)/src/compiler/glsl \
        -I$(top_builddir)/src/compiler/nir \
        -I$(top_srcdir)/src/compiler/nir \
@@ -44,7 +47,7 @@ AM_CFLAGS = \
        $(WNO_OVERRIDE_INIT) \
        $(LIBDRM_CFLAGS) \
        $(VALGRIND_CFLAGS) \
-       -msse2
+       -msse2 -mstackrealign
 
 AM_CXXFLAGS = $(AM_CFLAGS)
 
@@ -110,26 +113,14 @@ BUILT_SOURCES = $(i965_oa_GENERATED_FILES)
 CLEANFILES = $(BUILT_SOURCES)
 
 EXTRA_DIST = \
-       brw_oa_hsw.xml \
-       brw_oa_bdw.xml \
-       brw_oa_chv.xml \
-       brw_oa_sklgt2.xml \
-       brw_oa_sklgt3.xml \
-       brw_oa_sklgt4.xml \
-       brw_oa_bxt.xml \
-       brw_oa_kblgt2.xml \
-       brw_oa_kblgt3.xml \
-       brw_oa_glk.xml \
-       brw_oa_cflgt2.xml \
-       brw_oa_cflgt3.xml \
        brw_oa.py \
+       $(i965_oa_xml_FILES) \
        meson.build
 
-# Note: we avoid using a multi target rule here and outputting both the
-# .c and .h files in one go so we don't hit problems with parallel
-# make and multiple invocations of the same script trying to write
-# to the same files.
-brw_oa_%.h: brw_oa.py brw_oa_%.xml Makefile.am
-       $(PYTHON2) $(PYTHON_FLAGS) $(srcdir)/brw_oa.py --header=$(builddir)/brw_oa_$(*).h --chipset=$(*) $(srcdir)/brw_oa_$(*).xml
-brw_oa_%.c: brw_oa.py brw_oa_%.xml Makefile.am
-       $(PYTHON2) $(PYTHON_FLAGS) $(srcdir)/brw_oa.py --code=$(builddir)/brw_oa_$(*).c --chipset=$(*) $(srcdir)/brw_oa_$(*).xml
+brw_oa_metrics.c: brw_oa.py $(i965_oa_xml_FILES)
+       $(PYTHON) $(PYTHON_FLAGS) $(srcdir)/brw_oa.py \
+       --code=$(builddir)/brw_oa_metrics.c \
+       --header=$(builddir)/brw_oa_metrics.h \
+       $(i965_oa_xml_FILES:%=$(srcdir)/%)
+
+brw_oa_metrics.h: brw_oa_metrics.c