OpenHarmony/third_party_mesa3d
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

compiler: avoid warning about redefinition of PYTHON_GEN

Browse Source 
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>
This commit is contained in:
Erik Faye-Lund
2016-10-26 15:09:54 +02:00
committed by Emil Velikov
parent 4fa799ae04
commit aca491341b
3 changed files with 1 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
src/compiler/Makefile.am
View File

@@ -57,6 +57,7 @@ CLEANFILES =
EXTRA_DIST = SConscript EXTRA_DIST = SConscript
MKDIR_GEN = $(AM_V_at)$(MKDIR_P) $(@D) MKDIR_GEN = $(AM_V_at)$(MKDIR_P) $(@D)
PYTHON_GEN = $(AM_V_GEN)$(PYTHON2) $(PYTHON_FLAGS)
include Makefile.glsl.am include Makefile.glsl.am

1
src/compiler/Makefile.glsl.am
View File

@@ -189,7 +189,6 @@ am__v_YACC_1 =
YACC_GEN = $(AM_V_YACC)$(YACC) $(YFLAGS) YACC_GEN = $(AM_V_YACC)$(YACC) $(YFLAGS)
LEX_GEN = $(AM_V_LEX)$(LEX) $(LFLAGS) 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 glsl/glsl_parser.cpp glsl/glsl_parser.h: glsl/glsl_parser.yy
$(MKDIR_GEN) $(MKDIR_GEN)

2
src/compiler/Makefile.nir.am
View File

@@ -31,8 +31,6 @@ nir_libnir_la_SOURCES = \
$(SPIRV_FILES) \ $(SPIRV_FILES) \
$(NIR_GENERATED_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 nir/nir_builder_opcodes.h: nir/nir_opcodes.py nir/nir_builder_opcodes_h.py
$(MKDIR_GEN) $(MKDIR_GEN)
$(PYTHON_GEN) $(srcdir)/nir/nir_builder_opcodes_h.py > $@ || ($(RM) $@; false) $(PYTHON_GEN) $(srcdir)/nir/nir_builder_opcodes_h.py > $@ || ($(RM) $@; false)