Move LuaSL source up one directory.

15 files changed, 14 insertions, 16 deletions

diff --git a/.gitignore b/.gitignore
index 84b3dc5..347d6c0 100644
--- a/.gitignore
+++ b/.gitignore
@@ -322,12 +322,12 @@ LuaSL/LuaSL
 LuaSL/LuaSL_test
 LuaSL/LuaSL_parser
 LuaSL/constants.lsl
-LuaSL/src/LuaSL_lemon_yaccer.c
-LuaSL/src/LuaSL_lemon_yaccer.h
-LuaSL/src/LuaSL_lemon_yaccer.out
-LuaSL/src/lex.backup
-LuaSL/src/LuaSL_lexer.c
-LuaSL/src/LuaSL_lexer.h
-LuaSL/src/LuaSL_LSL_lexer.c
-LuaSL/src/LuaSL_LSL_lexer.h
+LuaSL/LuaSL_lemon_yaccer.c
+LuaSL/LuaSL_lemon_yaccer.h
+LuaSL/LuaSL_lemon_yaccer.out
+LuaSL/lex.backup
+LuaSL/LuaSL_lexer.c
+LuaSL/LuaSL_lexer.h
+LuaSL/LuaSL_LSL_lexer.c
+LuaSL/LuaSL_LSL_lexer.h
 
diff --git a/LuaSL/src/LSL.lua b/LuaSL/LSL.lua
index 662c880..662c880 100644
--- a/LuaSL/src/LSL.lua
+++ b/LuaSL/LSL.lua
diff --git a/LuaSL/src/LuaSL.edc b/LuaSL/LuaSL.edc
index 844fc8e..844fc8e 100644
--- a/LuaSL/src/LuaSL.edc
+++ b/LuaSL/LuaSL.edc
diff --git a/LuaSL/src/LuaSL.h b/LuaSL/LuaSL.h
index d1f448e..d1f448e 100644
--- a/LuaSL/src/LuaSL.h
+++ b/LuaSL/LuaSL.h
diff --git a/LuaSL/src/LuaSL_LSL_tree.h b/LuaSL/LuaSL_LSL_tree.h
index 5415228..5415228 100644
--- a/LuaSL/src/LuaSL_LSL_tree.h
+++ b/LuaSL/LuaSL_LSL_tree.h
diff --git a/LuaSL/src/LuaSL_compile.c b/LuaSL/LuaSL_compile.c
index 4a0a42f..4a0a42f 100644
--- a/LuaSL/src/LuaSL_compile.c
+++ b/LuaSL/LuaSL_compile.c
diff --git a/LuaSL/src/LuaSL_lemon_yaccer.y b/LuaSL/LuaSL_lemon_yaccer.y
index 182789f..182789f 100644
--- a/LuaSL/src/LuaSL_lemon_yaccer.y
+++ b/LuaSL/LuaSL_lemon_yaccer.y
diff --git a/LuaSL/src/LuaSL_lexer.l b/LuaSL/LuaSL_lexer.l
index 85b2821..85b2821 100644
--- a/LuaSL/src/LuaSL_lexer.l
+++ b/LuaSL/LuaSL_lexer.l
diff --git a/LuaSL/src/LuaSL_main.c b/LuaSL/LuaSL_main.c
index 0a40712..0a40712 100644
--- a/LuaSL/src/LuaSL_main.c
+++ b/LuaSL/LuaSL_main.c
diff --git a/LuaSL/src/LuaSL_test.c b/LuaSL/LuaSL_test.c
index 58d6225..58d6225 100644
--- a/LuaSL/src/LuaSL_test.c
+++ b/LuaSL/LuaSL_test.c
diff --git a/LuaSL/src/LuaSL_threads.c b/LuaSL/LuaSL_threads.c
index 234a7c5..234a7c5 100644
--- a/LuaSL/src/LuaSL_threads.c
+++ b/LuaSL/LuaSL_threads.c
diff --git a/LuaSL/src/LuaSL_threads.h b/LuaSL/LuaSL_threads.h
index 9a11b5c..9a11b5c 100644
--- a/LuaSL/src/LuaSL_threads.h
+++ b/LuaSL/LuaSL_threads.h
diff --git a/LuaSL/src/LuaSL_utilities.c b/LuaSL/LuaSL_utilities.c
index 40263df..40263df 100644
--- a/LuaSL/src/LuaSL_utilities.c
+++ b/LuaSL/LuaSL_utilities.c
diff --git a/LuaSL/build.lua b/LuaSL/build.lua
index f626fb0..b5ff670 100755
--- a/LuaSL/build.lua
+++ b/LuaSL/build.lua
@@ -13,13 +13,11 @@ if 'nil' == type(dir) then
   dir = workingDir
 end
 
-dir = dir .. '/src'
-
-removeFiles(dir, {'../LuaSL', '*.o', '*.output', '*.backup', '../../media/LuaSL.edj', 'LuaSL_lexer.h', 'LuaSL_lexer.c', 'LuaSL_lemon_yaccer.h', 'LuaSL_lemon_yaccer.c', 'LuaSL_lemon_yaccer.out'})
+removeFiles(dir, {'LuaSL', '*.o', '*.output', '*.backup', '../media/LuaSL.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.
-runCommand('lemon',   dir, '../../libraries/lemon/lemon -s -T../../libraries/lemon/lempar.c LuaSL_lemon_yaccer.y')
+runCommand('lemon',   dir, '../libraries/lemon/lemon -s -T../libraries/lemon/lempar.c LuaSL_lemon_yaccer.y')
 runCommand('flex',    dir, 'flex -C --outfile=LuaSL_lexer.c --header-file=LuaSL_lexer.h LuaSL_lexer.l')
-runCommand('edje_cc', dir, 'edje_cc ' .. EDJE_FLAGS .. ' LuaSL.edc ../../media/LuaSL.edj')
-compileFiles('../LuaSL', dir, {'LuaSL_main', 'LuaSL_compile', 'LuaSL_threads', 'LuaSL_utilities', 'LuaSL_lexer', 'LuaSL_lemon_yaccer'})
-compileFiles('../LuaSL_test', dir, {'LuaSL_test', 'LuaSL_utilities'})
+runCommand('edje_cc', dir, 'edje_cc ' .. EDJE_FLAGS .. ' LuaSL.edc ../media/LuaSL.edj')
+compileFiles('LuaSL', dir, {'LuaSL_main', 'LuaSL_compile', 'LuaSL_threads', 'LuaSL_utilities', 'LuaSL_lexer', 'LuaSL_lemon_yaccer'})
+compileFiles('LuaSL_test', dir, {'LuaSL_test', 'LuaSL_utilities'})
diff --git a/LuaSL/test.sh b/LuaSL/test.sh
index d1a7d4c..91ee412 100755
--- a/LuaSL/test.sh
+++ b/LuaSL/test.sh
@@ -4,7 +4,7 @@ wd=$(pwd)
 
 # Kill any left overs.
 killall -KILL LuaSL
-export LUA_PATH="$wd/src/?.lua"
+export LUA_PATH="$wd/?.lua"
 
 case $@ in