From 3c13ef14e3511611cabf184ff0b83c264b3e620d Mon Sep 17 00:00:00 2001
From: Felipe Magno de Almeida <felipe@expertisesolutions.com.br>
Date: Fri, 24 Jun 2016 18:35:04 -0300
Subject: [PATCH] evas: Fix compilation when using different build directory

---
 src/Makefile_Evas.am                                |  4 ++--
 .../evas/engines/gl_common/shader/gen_shaders.sh    |  7 +++----
 .../engines/gl_common/shader_3d/gen_shaders_3d.sh   | 13 +++++++------
 3 files changed, 12 insertions(+), 12 deletions(-)

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