compiler: avoid warning about redefinition of PYTHON_GEN

PYTHON_GEN is defined to the exact same thing in both
Makefile.glsl.am and Makefile.nir.am. This makes automake complain,
so let's lift the definition up to Makefile.am, the same way as
MKDIR_GEN.

Signed-off-by: Erik Faye-Lund <kusmabite@gmail.com>
Reviewed-by: Eric Engestrom <eric.engestrom@imgtec.com>
Tested-by: Eric Engestrom <eric.engestrom@imgtec.com>
Reviewed-by: Emil Velikov <emil.velikov@collabora.com>

diff --git a/src/compiler/Makefile.am b/src/compiler/Makefile.am
index 50e87bb835a8be4648bb90406b496fba6894e419..d52da91dab8cea536450af232855a6e9402e54d5 100644 (file)
--- a/src/compiler/Makefile.am
+++ b/src/compiler/Makefile.am
@@ -57,6 +57,7 @@ CLEANFILES =
 EXTRA_DIST = SConscript
 
 MKDIR_GEN = $(AM_V_at)$(MKDIR_P) $(@D)
+PYTHON_GEN = $(AM_V_GEN)$(PYTHON2) $(PYTHON_FLAGS)
 
 include Makefile.glsl.am
 

diff --git a/src/compiler/Makefile.glsl.am b/src/compiler/Makefile.glsl.am
index 80dfb737fb276afe80a4f14d0bc15d1fb48a8ac8..8cc0a4a22e180624ec870f20cc693a465fd5210e 100644 (file)
--- a/src/compiler/Makefile.glsl.am
+++ b/src/compiler/Makefile.glsl.am
@@ -189,7 +189,6 @@ am__v_YACC_1 =
 
 YACC_GEN = $(AM_V_YACC)$(YACC) $(YFLAGS)
 LEX_GEN = $(AM_V_LEX)$(LEX) $(LFLAGS)
-PYTHON_GEN = $(AM_V_GEN)$(PYTHON2) $(PYTHON_FLAGS)
 
 glsl/glsl_parser.cpp glsl/glsl_parser.h: glsl/glsl_parser.yy
        $(MKDIR_GEN)

diff --git a/src/compiler/Makefile.nir.am b/src/compiler/Makefile.nir.am
index 6cef3229e46660f6cbea68799a49923811d03eb0..f4dd8eac9d10ef4e8a47143a869963ad13d48b9f 100644 (file)
--- a/src/compiler/Makefile.nir.am
+++ b/src/compiler/Makefile.nir.am
@@ -31,8 +31,6 @@ nir_libnir_la_SOURCES =                                       \
        $(SPIRV_FILES)                                  \
        $(NIR_GENERATED_FILES)
 
-PYTHON_GEN = $(AM_V_GEN)$(PYTHON2) $(PYTHON_FLAGS)
-
 nir/nir_builder_opcodes.h: nir/nir_opcodes.py nir/nir_builder_opcodes_h.py
        $(MKDIR_GEN)
        $(PYTHON_GEN) $(srcdir)/nir/nir_builder_opcodes_h.py > $@ || ($(RM) $@; false)