[Mesa-dev] [PATCH v2] i965: add build rule for brw_nir_trig_workarounds.c on Android

[Jonathan Gray]

On Tue, Apr 19, 2016 at 11:09:13PM +0100, Emil Velikov wrote:
> On 19 April 2016 at 20:51, Rob Herring <robh at kernel.org> wrote:
> > Commit bfd17c76c126 ("i965: Port INTEL_PRECISE_TRIG=1 to NIR.") added a
> > generated file brw_nir_trig_workarounds.c which broke the Android build.
> > Add the necessary makefiles to the Android build.
> >
> > Cc: Kenneth Graunke <kenneth at whitecape.org>
> > Cc: Emil Velikov <emil.velikov at collabora.com>
> Thanks. I'll pull this series by end of tomorrow. If someone want to
> go ahead before that
> 
> Reviewed-by: Emil Velikov <emil.velikov at collabora.com>
> 
> -Emil

b27c85c4c089109339fc37135d0a4d2574024632 broke the i965 build here

autoreconf-2.69: running: /usr/local/bin/autoconf-2.69 --force
autoreconf-2.69: configure.ac: not using Autoheader
autoreconf-2.69: running: automake --add-missing --copy --force-missing
src/mesa/drivers/dri/i965/Makefile.am:57: error: BUILT_SOURCES must be set with '=' before using '+='
src/mesa/drivers/dri/i965/Makefile.am:58: error: CLEANFILES must be set with '=' before using '+='

With automake 1.12 and autoconf 2.69

Works with the following change:

diff --git a/src/mesa/drivers/dri/i965/Makefile.am b/src/mesa/drivers/dri/i965/Makefile.am
index c7f055d..ba3aa26 100644
--- a/src/mesa/drivers/dri/i965/Makefile.am
+++ b/src/mesa/drivers/dri/i965/Makefile.am
@@ -54,8 +54,8 @@ libi965_compiler_la_SOURCES = \
 	$(i965_compiler_FILES) \
 	$(i965_compiler_GENERATED_FILES)
 
-BUILT_SOURCES += $(i965_compiler_GENERATED_FILES)
-CLEANFILES += $(BUILT_SOURCES)
+BUILT_SOURCES = $(i965_compiler_GENERATED_FILES)
+CLEANFILES = $(BUILT_SOURCES)
 
 TEST_LIBS = \
 	libi965_compiler.la \