Mesa (fast-color-clear): swr/codegen: fix autotools build

[GitLab Mirror]

Module: Mesa
Branch: fast-color-clear
Commit: 71a76a47ccb34c5c259781ed49b0013e86dfaa31
URL:    http://cgit.freedesktop.org/mesa/mesa/commit/?id=71a76a47ccb34c5c259781ed49b0013e86dfaa31

Author: Erik Faye-Lund <erik.faye-lund at collabora.com>
Date:   Tue Feb 26 14:53:25 2019 +0100

swr/codegen: fix autotools build

When the output directory was changed, the BUILT_SOURCES and build-rule
target-path was no longer correct, leading to races to generate the
sources and compiling them.

Fix this by updating both sets of paths, so automake see what's going on
here.

Fixes: 773b3ceacaf ("swr/rast: Fix autotools and scons codegen")
Signed-off-by: Erik Faye-Lund <erik.faye-lund at collabora.com>
Reviewed-by: Alok Hota <alok.hota at intel.com>

---

 src/gallium/drivers/swr/Makefile.am | 16 ++++++++--------
 1 file changed, 8 insertions(+), 8 deletions(-)

diff --git a/src/gallium/drivers/swr/Makefile.am b/src/gallium/drivers/swr/Makefile.am
index 81bfaca54fa..c111d31a874 100644
--- a/src/gallium/drivers/swr/Makefile.am
+++ b/src/gallium/drivers/swr/Makefile.am
@@ -82,10 +82,10 @@ BUILT_SOURCES = \
 	rasterizer/jitter/gen_builder.hpp \
 	rasterizer/jitter/gen_builder_meta.hpp \
 	rasterizer/jitter/gen_builder_intrin.hpp \
-	rasterizer/archrast/gen_ar_event.hpp \
-	rasterizer/archrast/gen_ar_event.cpp \
-	rasterizer/archrast/gen_ar_eventhandler.hpp \
-	rasterizer/archrast/gen_ar_eventhandlerfile.hpp \
+	rasterizer/codegen/gen_ar_event.hpp \
+	rasterizer/codegen/gen_ar_event.cpp \
+	rasterizer/codegen/gen_ar_eventhandler.hpp \
+	rasterizer/codegen/gen_ar_eventhandlerfile.hpp \
 	rasterizer/core/backends/gen_BackendPixelRate0.cpp \
 	rasterizer/core/backends/gen_BackendPixelRate1.cpp \
 	rasterizer/core/backends/gen_BackendPixelRate2.cpp \
@@ -155,7 +155,7 @@ rasterizer/jitter/gen_builder_intrin.hpp: rasterizer/codegen/gen_llvm_ir_macros.
 		--gen_intrin_h
 	$(AM_V_GEN)touch $@
 
-rasterizer/archrast/gen_ar_event.hpp: rasterizer/codegen/gen_archrast.py rasterizer/codegen/templates/gen_ar_event.hpp rasterizer/archrast/events.proto rasterizer/archrast/events_private.proto rasterizer/codegen/gen_common.py
+rasterizer/codegen/gen_ar_event.hpp: rasterizer/codegen/gen_archrast.py rasterizer/codegen/templates/gen_ar_event.hpp rasterizer/archrast/events.proto rasterizer/archrast/events_private.proto rasterizer/codegen/gen_common.py
 	$(MKDIR_GEN)
 	$(PYTHON_GEN) \
 		$(srcdir)/rasterizer/codegen/gen_archrast.py \
@@ -163,7 +163,7 @@ rasterizer/archrast/gen_ar_event.hpp: rasterizer/codegen/gen_archrast.py rasteri
 		--output-dir rasterizer/codegen
 	$(AM_V_GEN)touch $@
 
-rasterizer/archrast/gen_ar_event.cpp: rasterizer/codegen/gen_archrast.py rasterizer/codegen/templates/gen_ar_event.cpp rasterizer/archrast/events.proto rasterizer/archrast/events_private.proto rasterizer/codegen/gen_common.py
+rasterizer/codegen/gen_ar_event.cpp: rasterizer/codegen/gen_archrast.py rasterizer/codegen/templates/gen_ar_event.cpp rasterizer/archrast/events.proto rasterizer/archrast/events_private.proto rasterizer/codegen/gen_common.py
 	$(MKDIR_GEN)
 	$(PYTHON_GEN) \
 		$(srcdir)/rasterizer/codegen/gen_archrast.py \
@@ -171,7 +171,7 @@ rasterizer/archrast/gen_ar_event.cpp: rasterizer/codegen/gen_archrast.py rasteri
 		--output-dir rasterizer/codegen
 	$(AM_V_GEN)touch $@
 
-rasterizer/archrast/gen_ar_eventhandler.hpp: rasterizer/codegen/gen_archrast.py rasterizer/codegen/templates/gen_ar_eventhandler.hpp rasterizer/archrast/events.proto rasterizer/archrast/events_private.proto rasterizer/codegen/gen_common.py
+rasterizer/codegen/gen_ar_eventhandler.hpp: rasterizer/codegen/gen_archrast.py rasterizer/codegen/templates/gen_ar_eventhandler.hpp rasterizer/archrast/events.proto rasterizer/archrast/events_private.proto rasterizer/codegen/gen_common.py
 	$(MKDIR_GEN)
 	$(PYTHON_GEN) \
 		$(srcdir)/rasterizer/codegen/gen_archrast.py \
@@ -179,7 +179,7 @@ rasterizer/archrast/gen_ar_eventhandler.hpp: rasterizer/codegen/gen_archrast.py
 		--output-dir rasterizer/codegen
 	$(AM_V_GEN)touch $@
 
-rasterizer/archrast/gen_ar_eventhandlerfile.hpp: rasterizer/codegen/gen_archrast.py rasterizer/codegen/templates/gen_ar_eventhandlerfile.hpp rasterizer/archrast/events.proto rasterizer/archrast/events_private.proto rasterizer/codegen/gen_common.py
+rasterizer/codegen/gen_ar_eventhandlerfile.hpp: rasterizer/codegen/gen_archrast.py rasterizer/codegen/templates/gen_ar_eventhandlerfile.hpp rasterizer/archrast/events.proto rasterizer/archrast/events_private.proto rasterizer/codegen/gen_common.py
 	$(MKDIR_GEN)
 	$(PYTHON_GEN) \
 		$(srcdir)/rasterizer/codegen/gen_archrast.py \