diff --git a/src/Makefile_Evas.am b/src/Makefile_Evas.am index 46275221fb..9d45c16848 100644 --- a/src/Makefile_Evas.am +++ b/src/Makefile_Evas.am @@ -775,7 +775,7 @@ EXTRA_DIST2 += $(EVAS_GL_SHADERS_GEN) modules/evas/engines/gl_common/shader/evas_gl_shaders.x: $(EVAS_GL_SHADERS_GEN) $(top_srcdir)/src/modules/evas/engines/gl_common/shader/gen_shaders.sh @echo " SHADERS $@" - @sh $(top_srcdir)/src/modules/evas/engines/gl_common/shader/gen_shaders.sh $(top_builddir)/src/modules/evas/engines/gl_common/shader/evas_gl_shaders.x + @sh $(top_srcdir)/src/modules/evas/engines/gl_common/shader/gen_shaders.sh modules/evas/engines/gl_common/evas_gl_shader.c: modules/evas/engines/gl_common/shader/evas_gl_shaders.x @@ -808,7 +808,7 @@ $(GL_SHADERS_3D_GEN) modules/evas/engines/gl_common/shader_3d/evas_gl_3d_shaders.x: $(top_srcdir)/src/modules/evas/engines/gl_common/shader_3d/gen_shaders_3d.sh $(GL_SHADERS_3D_GEN) $(top_srcdir)/src/modules/evas/engines/gl_common/shader_3d/include.shd @echo " SHADERS $@" - @sh $(top_srcdir)/src/modules/evas/engines/gl_common/shader_3d/gen_shaders_3d.sh $(top_builddir)/src/modules/evas/engines/gl_common/shader_3d/evas_3d_shaders.x $(GL_SHADERS_3D_GEN) + @sh $(top_srcdir)/src/modules/evas/engines/gl_common/shader_3d/gen_shaders_3d.sh $(GL_SHADERS_3D_GEN) modules/evas/engines/gl_common/evas_gl_3d_shader.c: modules/evas/engines/gl_common/shader_3d/evas_gl_3d_shaders.x 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 3ba7a4d9f0..7c2fec1e47 100755 --- a/src/modules/evas/engines/gl_common/shader/gen_shaders.sh +++ b/src/modules/evas/engines/gl_common/shader/gen_shaders.sh @@ -2,7 +2,10 @@ # This script will generate a C file containing all the shaders used by Evas -OUTPUT=$1 +DIR=`dirname $0` +cd $DIR/../../../../../ + +OUTPUT="$DIR/evas_gl_shaders.x" # Skip generation during make distcheck if [ "${top_distdir}" != "" ] ; then exit 0; fi @@ -18,8 +21,6 @@ then exit 0 fi -echo $DIR - exec 1<&- exec 1>"$OUTPUT" 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 ffefda4cff..f31880fda0 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 @@ -2,11 +2,10 @@ # This script will generate a C file containing all the shaders used by Evas_3D -OUTPUT="$1" -OUTDIR=$(dirname ${OUTPUT}) -INDIR=`dirname $0` +DIR=`dirname $0` +cd $DIR/../../../../../ -mkdir -p $OUTDIR +OUTPUT="$DIR/evas_gl_3d_shaders.x" # Skip generation during make distcheck if [ "${top_distdir}" != "" ] ; then exit 0; fi @@ -16,7 +15,7 @@ if [ -e ${OUTPUT} ] && [ ! -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 -- "$OUTDIR" +if git diff --quiet --exit-code -- "$DIR" then touch "$OUTPUT" exit 0 @@ -25,7 +24,7 @@ fi exec 1<&- exec 1>"$OUTPUT" -SHADERS=${@:2} +SHADERS=$@ VERT_SHADERS_SOURCE="" FRAG_SHADERS_SOURCE="" @@ -43,7 +42,7 @@ for SHD in $SHADERS ; do FRAG_SHADERS_SOURCE="$FRAG_SHADERS_SOURCE "$LNAME"_glsl,\n" fi - m4 "$INDIR/include.shd" "$SHD" > "$SHD.tmp" + m4 "$DIR/include.shd" "$SHD" > "$SHD.tmp" OIFS="$IFS" IFS=`printf '\n+'`