diff options
| author | Vincent Torri <vincent dot torri at gmail dot com> | 2016-02-18 13:25:21 -0800 |
|---|---|---|
| committer | Cedric BAIL <cedric@osg.samsung.com> | 2016-02-18 13:37:31 -0800 |
| commit | f2111102cf40b004e1fa3af98cefb3782ddeb5d9 (patch) | |
| tree | d75f1ee9f160f428dad319751e3996898b1dd8ab /src/Makefile_Ector.am | |
| parent | 2636fd6559a83a574e83f4977709357e1df6b912 (diff) | |
| download | efl-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_Ector.am')
| -rw-r--r-- | src/Makefile_Ector.am | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/Makefile_Ector.am b/src/Makefile_Ector.am index bbe1763b44..f1a8178a08 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) |