diff options
| author | Erik Faye-Lund <[email protected]> | 2016-10-26 15:09:54 +0200 |
|---|---|---|
| committer | Emil Velikov <[email protected]> | 2016-10-26 14:54:26 +0100 |
| commit | aca491341b57fac05901943d693e264b589925f5 (patch) | |
| tree | 9cc0fe084a7303d52004c16bcbd90e792d935269 | |
| parent | 4fa799ae04c02b77176797c854f9d1b9b4290a2e (diff) | |
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 <[email protected]>
Reviewed-by: Eric Engestrom <[email protected]>
Tested-by: Eric Engestrom <[email protected]>
Reviewed-by: Emil Velikov <[email protected]>
| -rw-r--r-- | src/compiler/Makefile.am | 1 | ||||
| -rw-r--r-- | src/compiler/Makefile.glsl.am | 1 | ||||
| -rw-r--r-- | src/compiler/Makefile.nir.am | 2 |
3 files changed, 1 insertions, 3 deletions
diff --git a/src/compiler/Makefile.am b/src/compiler/Makefile.am index 50e87bb835a..d52da91dab8 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 80dfb737fb2..8cc0a4a22e1 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 6cef3229e46..f4dd8eac9d1 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) |