jpeg pushed a commit to branch master. http://git.enlightenment.org/core/efl.git/commit/?id=30ba6bfcac5fdd237e70a81026373f2036c977d8
commit 30ba6bfcac5fdd237e70a81026373f2036c977d8 Author: Jean-Philippe Andre <[email protected]> Date: Mon Jun 20 14:47:39 2016 +0900 evas: Fix regeneration of shaders (normal and 3d) This will trigger a re-run of the shaders shell scripts even in case of out-of-tree builds. BUILT_SOURCES is used here because for whatever reason make does not rebuild the .x targets in case of out-of-tree builds (even if the timestamps of the dependencies have changed). --- src/Makefile_Evas.am | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/src/Makefile_Evas.am b/src/Makefile_Evas.am index 00a3a46..3630e4e 100644 --- a/src/Makefile_Evas.am +++ b/src/Makefile_Evas.am @@ -803,11 +803,12 @@ $(NULL) EXTRA_DIST2 += \ modules/evas/engines/gl_common/shader_3d/gen_shaders_3d.sh \ +modules/evas/engines/gl_common/shader_3d/include.shd \ $(GL_SHADERS_3D_GEN) -modules/evas/engines/gl_common/shader_3d/evas_gl_3d_shaders.x: modules/evas/engines/gl_common/shader_3d/gen_shaders_3d.sh $(GL_SHADERS_3D_GEN) +modules/evas/engines/gl_common/shader_3d/evas_gl_3d_shaders.x: modules/evas/engines/gl_common/shader_3d/gen_shaders_3d.sh $(GL_SHADERS_3D_GEN) modules/evas/engines/gl_common/shader_3d/include.shd @echo " SHADERS $@" - @sh $^ + @sh $(srcdir)/modules/evas/engines/gl_common/shader_3d/gen_shaders_3d.sh $(GL_SHADERS_3D_GEN) GL_GENERIC_SOURCES = \ @@ -831,7 +832,9 @@ evas_gl_generic_eolian_h = $(evas_gl_generic_eolian_files:%.eo=%.eo.h) \ BUILT_SOURCES += \ $(evas_gl_generic_eolian_c) \ - $(evas_gl_generic_eolian_h) + $(evas_gl_generic_eolian_h) \ + modules/evas/engines/gl_common/shader_3d/evas_gl_3d_shaders.x \ + modules/evas/engines/gl_common/shader/evas_gl_shaders.x EXTRA_DIST2 += $(evas_gl_generic_eolian_files) --
