aboutsummaryrefslogtreecommitdiffstats
path: root/src/Makefile_Evas.am
diff options
context:
space:
mode:
authorVincent Torri <vincent dot torri at gmail dot com>2016-02-18 13:25:21 -0800
committerCedric BAIL <cedric@osg.samsung.com>2016-02-18 13:37:31 -0800
commitf2111102cf40b004e1fa3af98cefb3782ddeb5d9 (patch)
treed75f1ee9f160f428dad319751e3996898b1dd8ab /src/Makefile_Evas.am
parentEvil: remove useless defines (diff)
downloadefl-f2111102cf40b004e1fa3af98cefb3782ddeb5d9.tar.gz
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 <cedric@osg.samsung.com>
Diffstat (limited to 'src/Makefile_Evas.am')
-rw-r--r--src/Makefile_Evas.am6
1 files changed, 3 insertions, 3 deletions
diff --git a/src/Makefile_Evas.am b/src/Makefile_Evas.am
index 4355a38535..09d5d51d4a 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