From aca491341b57fac05901943d693e264b589925f5 Mon Sep 17 00:00:00 2001 From: Erik Faye-Lund Date: Wed, 26 Oct 2016 15:09:54 +0200 Subject: [PATCH] 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 Reviewed-by: Eric Engestrom Tested-by: Eric Engestrom Reviewed-by: Emil Velikov --- src/compiler/Makefile.am | 1 + src/compiler/Makefile.glsl.am | 1 - src/compiler/Makefile.nir.am | 2 -- 3 files changed, 1 insertion(+), 3 deletions(-) diff --git a/src/compiler/Makefile.am b/src/compiler/Makefile.am index 50e87bb..d52da91 100644 --- 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 80dfb73..8cc0a4a 100644 --- 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 6cef322..f4dd8ea 100644 --- 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) -- 2.7.4