From f2111102cf40b004e1fa3af98cefb3782ddeb5d9 Mon Sep 17 00:00:00 2001 From: Vincent Torri Date: Thu, 18 Feb 2016 13:25:21 -0800 Subject: [PATCH] build: fix duplicated use of the variable in multiple Makefile_*.am. GL_SHADERS_GEN is defined in the Makefile.am of Ector and Evas. As these Mafile_*.am are included in the same Makefile.am, there is a warning with multiple defined triggered by automake. So this patch rename these 2 variables Test Plan: autogen.sH Reviewers: jpeg, cedric Differential Revision: https://phab.enlightenment.org/D3711 Signed-off-by: Cedric BAIL --- src/Makefile_Ector.am | 6 +++--- src/Makefile_Evas.am | 6 +++--- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/src/Makefile_Ector.am b/src/Makefile_Ector.am index bbe1763..f1a8178 100644 --- a/src/Makefile_Ector.am +++ b/src/Makefile_Ector.am @@ -133,13 +133,13 @@ lib/ector/gl/ector_gl_private.h \ lib/ector/gl/shader/ector_gl_shaders.x \ lib/ector/gl/ector_gl_shader.c -GL_SHADERS_GEN = \ +ECTOR_GL_SHADERS_GEN = \ lib/ector/gl/shader/gen_shaders.sh \ lib/ector/gl/shader/fragment.glsl \ lib/ector/gl/shader/vertex.glsl \ lib/ector/gl/shader/include.glsl -lib/ector/gl/shader/ector_gl_shaders.x: $(GL_SHADERS_GEN) +lib/ector/gl/shader/ector_gl_shaders.x: $(ECTOR_GL_SHADERS_GEN) @echo " SHADERS $@" @bash $(srcdir)/lib/ector/gl/shader/gen_shaders.sh @@ -201,4 +201,4 @@ static_libs/freetype/sw_ft_stroker.h \ static_libs/freetype/sw_ft_types.h \ static_libs/draw/draw.h \ static_libs/draw/draw_private.h \ -$(GL_SHADERS_GEN) +$(ECTOR_GL_SHADERS_GEN) diff --git a/src/Makefile_Evas.am b/src/Makefile_Evas.am index 4355a38..09d5d51 100644 --- a/src/Makefile_Evas.am +++ b/src/Makefile_Evas.am @@ -730,16 +730,16 @@ modules/evas/engines/gl_common/evas_gl_3d.c \ modules/evas/engines/gl_common/evas_gl_3d_renderer.c \ modules/evas/engines/gl_common/evas_gl_3d_shader.c -GL_SHADERS_GEN = \ +EVAS_GL_SHADERS_GEN = \ modules/evas/engines/gl_common/shader/gen_shaders.sh \ modules/evas/engines/gl_common/shader/fragment.glsl \ modules/evas/engines/gl_common/shader/vertex.glsl \ modules/evas/engines/gl_common/shader/include.glsl \ $(NULL) -EXTRA_DIST += $(GL_SHADERS_GEN) +EXTRA_DIST += $(EVAS_GL_SHADERS_GEN) -modules/evas/engines/gl_common/shader/evas_gl_shaders.x: $(GL_SHADERS_GEN) +modules/evas/engines/gl_common/shader/evas_gl_shaders.x: $(EVAS_GL_SHADERS_GEN) @echo " SHADERS $@" @bash $(srcdir)/modules/evas/engines/gl_common/shader/gen_shaders.sh -- 2.7.4