Clean up all the build and test scripts to be similar, and not have the EFL directory hard coded.

1 files changed, 21 insertions, 52 deletions

diff --git a/LuaSL/build.sh b/LuaSL/build.sh
index 4605cb0..8d776d6 100755
--- a/LuaSL/build.sh
+++ b/LuaSL/build.sh
@@ -1,75 +1,45 @@
 #! /bin/bash
 
-
 export LOCALDIR=`pwd`
 
-cd src
-rm -f ../LuaSL *.o *.output *.backup ../luac.out ../*.edj LuaSL_lexer.h LuaSL_lexer.c LuaSL_lemon_yaccer.h LuaSL_lemon_yaccer.c LuaSL_lemon_yaccer.out
-
-
-# This assumes you have EFL installed in one of two standard places.
-if [ -d "/opt/e17" ]
-then
-    export E17DIR="/opt/e17"
-else
-    export E17DIR="/usr"
-fi
-
 # No need for a make file, or dependencies, the entire thing takes only a few seconds to build.
 
-CFLAGS="-g -Wall -Wunreachable-code -I include -I $LOCALDIR/src"
+CFLAGS="-g -Wall -Wunreachable-code -I include -I $LOCALDIR"
 CFLAGS="$CFLAGS -I ../../libraries"
-#CFLAGS="$CFLAGS -I ../../libraries/LuaJIT-2.0.2/src"
 CFLAGS="$CFLAGS $(pkg-config --cflags luajit)"
-#CFLAGS="$CFLAGS -I /usr/include/lua5.1"
-CFLAGS="$CFLAGS -I $E17DIR/include/eo-1"
-CFLAGS="$CFLAGS -I $E17DIR/include/eina-1"
-CFLAGS="$CFLAGS -I $E17DIR/include/eina-1/eina"
-CFLAGS="$CFLAGS -I $E17DIR/include/eet-1"
-CFLAGS="$CFLAGS -I $E17DIR/include/embryo-1"
-CFLAGS="$CFLAGS -I $E17DIR/include/edje-1"
-CFLAGS="$CFLAGS -I $E17DIR/include/evas-1"
-CFLAGS="$CFLAGS -I $E17DIR/include/ecore-1"
-CFLAGS="$CFLAGS -I $E17DIR/include/efl-1"
-CFLAGS="$CFLAGS -I $E17DIR/include/ecore-con-1"
-CFLAGS="$CFLAGS -I $E17DIR/include/ecore-evas-1"
-CFLAGS="$CFLAGS -I $E17DIR/include/ecore-file-1"
-CFLAGS="$CFLAGS -I $E17DIR/include"
+CFLAGS="$CFLAGS $(pkg-config --cflags eo)"
+CFLAGS="$CFLAGS $(pkg-config --cflags eet)"
+CFLAGS="$CFLAGS $(pkg-config --cflags ecore-con)"
+CFLAGS="$CFLAGS $(pkg-config --cflags ecore-evas)"
+CFLAGS="$CFLAGS $(pkg-config --cflags ecore-file)"
+CFLAGS="$CFLAGS $(pkg-config --cflags edje)"
+CFLAGS="$CFLAGS -DPACKAGE_BIN_DIR=\"$LOCALDIR\""
+CFLAGS="$CFLAGS -DPACKAGE_LIB_DIR=\"$LOCALDIR\""
 CFLAGS="$CFLAGS -DPACKAGE_DATA_DIR=\"$LOCALDIR\" $CFLAGOPTS"
 
-#LDFLAGS="-L ../../libraries/LuaJIT-2.0.2/src -L lib -L /usr/lib -L /lib -L $E17DIR/lib"
-#libs="-leo -lecore -levas -ledje -lembryo -leet -leina -lluajit -lpthread -lm"
-LDFLAGS="$(pkg-config --libs-only-L luajit) -L lib -L /usr/lib -L /lib -L $E17DIR/lib"
-libs="-leo -lecore -levas -ledje -lembryo -leet -leina $(pkg-config --libs-only-L luajit) -lpthread -lm"
-#LDFLAGS="-L /usr/lib/lua/5.1 -L lib -L /usr/lib -L /lib -L $E17DIR/lib"
-#libs="-lecore -levas -ledje -lembryo -leet -leina -llua5.1 -lpthread -lm"
-# These need to be added to libs if linking staticaly, though some parts of EFL don't like that.
-#-lecore_evas \
-#-lecore_file \
-#-ldl \
-#-lfontconfig \
-#-lfreetype \
-#-lexpat \
-#-lrt \
-#-lz
+LDFLAGS="$(pkg-config --libs-only-L luajit) -L lib -L /usr/lib -L /lib"
+libs="$(pkg-config --libs edje) $libs $(pkg-config --libs luajit)"
 
 LFLAGS="-d"
 EDJE_FLAGS="-id images -fd fonts"
 # Dunno why I needed this, not gonna work with a packaged LuaJIT anyway.
 #LD_RUN_PATH="../../libraries/LuaJIT-2.0.2/src:"
 
+cd src
+echo "clean"
+rm -f ../LuaSL *.o *.output *.backup ../luac.out ../*.edj LuaSL_lexer.h LuaSL_lexer.c LuaSL_lemon_yaccer.h LuaSL_lemon_yaccer.c LuaSL_lemon_yaccer.out
 
 # Run lemon first, flex depends on it to define the symbol values.
 command="../../libraries/lemon/lemon -s -T../../libraries/lemon/lempar.c LuaSL_lemon_yaccer.y"
-echo $command
+echo "lemon"
 $command
 
 command="flex -C --outfile=LuaSL_lexer.c --header-file=LuaSL_lexer.h LuaSL_lexer.l"
-echo $command
+echo "flex"
 $command
 
 command="edje_cc $EDJE_FLAGS LuaSL.edc ../LuaSL.edj"
-echo $command
+echo "edje_cc"
 $command
 
 names="LuaSL_main LuaSL_compile LuaSL_threads LuaSL_utilities LuaSL_lexer LuaSL_lemon_yaccer"
@@ -77,12 +47,12 @@ objects=""
 for i in $names
 do
     command="gcc $CFLAGS -c -o $i.o $i.c"
-    echo $command
+    echo $i
     $command
     objects="$objects $i.o"
 done
 command="gcc $CFLAGS -o ../LuaSL $objects $LDFLAGS $libs"
-echo $command
+echo "LuaSL"
 $command
 
 names="LuaSL_test LuaSL_utilities"
@@ -90,11 +60,10 @@ objects=""
 for i in $names
 do
     command="gcc $CFLAGS -c -o $i.o $i.c"
-    echo $command
+    echo $i
     $command
     objects="$objects $i.o"
 done
 command="gcc $CFLAGS -o ../LuaSL_test $objects $LDFLAGS $libs"
-echo $command
+echo "LuaSL_test"
 $command
-