summaryrefslogtreecommitdiff
path: root/src
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
parent2636fd6559a83a574e83f4977709357e1df6b912 (diff)
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')
-rw-r--r--src/Makefile_Ector.am6
-rw-r--r--src/Makefile_Evas.am6
2 files changed, 6 insertions, 6 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 \
133lib/ector/gl/shader/ector_gl_shaders.x \ 133lib/ector/gl/shader/ector_gl_shaders.x \
134lib/ector/gl/ector_gl_shader.c 134lib/ector/gl/ector_gl_shader.c
135 135
136GL_SHADERS_GEN = \ 136ECTOR_GL_SHADERS_GEN = \
137lib/ector/gl/shader/gen_shaders.sh \ 137lib/ector/gl/shader/gen_shaders.sh \
138lib/ector/gl/shader/fragment.glsl \ 138lib/ector/gl/shader/fragment.glsl \
139lib/ector/gl/shader/vertex.glsl \ 139lib/ector/gl/shader/vertex.glsl \
140lib/ector/gl/shader/include.glsl 140lib/ector/gl/shader/include.glsl
141 141
142lib/ector/gl/shader/ector_gl_shaders.x: $(GL_SHADERS_GEN) 142lib/ector/gl/shader/ector_gl_shaders.x: $(ECTOR_GL_SHADERS_GEN)
143 @echo " SHADERS $@" 143 @echo " SHADERS $@"
144 @bash $(srcdir)/lib/ector/gl/shader/gen_shaders.sh 144 @bash $(srcdir)/lib/ector/gl/shader/gen_shaders.sh
145 145
@@ -201,4 +201,4 @@ static_libs/freetype/sw_ft_stroker.h \
201static_libs/freetype/sw_ft_types.h \ 201static_libs/freetype/sw_ft_types.h \
202static_libs/draw/draw.h \ 202static_libs/draw/draw.h \
203static_libs/draw/draw_private.h \ 203static_libs/draw/draw_private.h \
204$(GL_SHADERS_GEN) 204$(ECTOR_GL_SHADERS_GEN)
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 \
730modules/evas/engines/gl_common/evas_gl_3d_renderer.c \ 730modules/evas/engines/gl_common/evas_gl_3d_renderer.c \
731modules/evas/engines/gl_common/evas_gl_3d_shader.c 731modules/evas/engines/gl_common/evas_gl_3d_shader.c
732 732
733GL_SHADERS_GEN = \ 733EVAS_GL_SHADERS_GEN = \
734modules/evas/engines/gl_common/shader/gen_shaders.sh \ 734modules/evas/engines/gl_common/shader/gen_shaders.sh \
735modules/evas/engines/gl_common/shader/fragment.glsl \ 735modules/evas/engines/gl_common/shader/fragment.glsl \
736modules/evas/engines/gl_common/shader/vertex.glsl \ 736modules/evas/engines/gl_common/shader/vertex.glsl \
737modules/evas/engines/gl_common/shader/include.glsl \ 737modules/evas/engines/gl_common/shader/include.glsl \
738$(NULL) 738$(NULL)
739 739
740EXTRA_DIST += $(GL_SHADERS_GEN) 740EXTRA_DIST += $(EVAS_GL_SHADERS_GEN)
741 741
742modules/evas/engines/gl_common/shader/evas_gl_shaders.x: $(GL_SHADERS_GEN) 742modules/evas/engines/gl_common/shader/evas_gl_shaders.x: $(EVAS_GL_SHADERS_GEN)
743 @echo " SHADERS $@" 743 @echo " SHADERS $@"
744 @bash $(srcdir)/modules/evas/engines/gl_common/shader/gen_shaders.sh 744 @bash $(srcdir)/modules/evas/engines/gl_common/shader/gen_shaders.sh
745 745