raster pushed a commit to branch master. http://git.enlightenment.org/core/efl.git/commit/?id=0b69356f1bbceab3261835bc2d4632f8f4669206
commit 0b69356f1bbceab3261835bc2d4632f8f4669206 Author: Carsten Haitzler (Rasterman) <[email protected]> Date: Fri Jun 24 09:53:37 2016 +0900 Revert "evas: Fix distcheck by disabling shaders generation" this breaks the simplest configure + make ... so obviously it's broken --- src/modules/evas/engines/gl_common/shader/gen_shaders.sh | 7 ------- src/modules/evas/engines/gl_common/shader_3d/gen_shaders_3d.sh | 6 ------ 2 files changed, 13 deletions(-) diff --git a/src/modules/evas/engines/gl_common/shader/gen_shaders.sh b/src/modules/evas/engines/gl_common/shader/gen_shaders.sh index c96f62e..8861d95 100755 --- a/src/modules/evas/engines/gl_common/shader/gen_shaders.sh +++ b/src/modules/evas/engines/gl_common/shader/gen_shaders.sh @@ -3,16 +3,9 @@ # This script will generate a C file containing all the shaders used by Evas DIR=`dirname $0` -cd $DIR/../../../../../ OUTPUT="$DIR/evas_gl_shaders.x" -# Skip generation during make distcheck -if [ "${top_distdir}" != "" ] ; then exit 0; fi - -# Skip generation if file can not be written to -if [ ! -w ${OUTPUT} ] ; then exit 0; fi - # Skip generation if there is no diff (or no git) if ! git rev-parse 2>> /dev/null >> /dev/null ; then exit 0 ; fi if git diff --quiet --exit-code -- "$DIR" diff --git a/src/modules/evas/engines/gl_common/shader_3d/gen_shaders_3d.sh b/src/modules/evas/engines/gl_common/shader_3d/gen_shaders_3d.sh index 529959d..c92a239 100755 --- a/src/modules/evas/engines/gl_common/shader_3d/gen_shaders_3d.sh +++ b/src/modules/evas/engines/gl_common/shader_3d/gen_shaders_3d.sh @@ -7,12 +7,6 @@ cd $DIR/../../../../../ OUTPUT="$DIR/evas_gl_3d_shaders.x" -# Skip generation during make distcheck -if [ "${top_distdir}" != "" ] ; then exit 0; fi - -# Skip generation if file can not be written to -if [ ! -w ${OUTPUT} ] ; then exit 0; fi - # Skip generation if there is no diff (or no git) if ! git rev-parse 2>> /dev/null >> /dev/null ; then exit 0 ; fi if git diff --quiet --exit-code -- "$DIR" --
