Move lemon to the src/others directory.

5 files changed, 5 insertions, 3 deletions

diff --git a/.gitignore b/.gitignore
index 0e0e9b0..52694c4 100644
--- a/.gitignore
+++ b/.gitignore
@@ -319,7 +319,6 @@
 *.diff
 *.lsl.lua
 *.lsl2
-/libraries/lemon/lemon
 /lib/constants.lsl
 media/bad_scripts/
 media/really_bad_scripts/
@@ -334,4 +333,7 @@ media/Test%20sim/test/bulk_scripts_dump/
 /src/LuaSL/LuaSL_lexer.h
 /src/LuaSL/LuaSL_LSL_lexer.c
 /src/LuaSL/LuaSL_LSL_lexer.h
+/src/others/lemon/lemon
+/src/others/netsurf/
+/src/others/polipo/
 valgrind_*.log
diff --git a/src/LuaSL/build.lua b/src/LuaSL/build.lua
index dafcf5e..3a45e9b 100755
--- a/src/LuaSL/build.lua
+++ b/src/LuaSL/build.lua
@@ -16,7 +16,7 @@ end
 removeFiles(dir, {'*.output', '*.backup', 'LuaSL_lexer.h', 'LuaSL_lexer.c', 'LuaSL_lemon_yaccer.h', 'LuaSL_lemon_yaccer.c', 'LuaSL_lemon_yaccer.out'})
 
 -- Build and run lemon first, flex depends on it to define the symbol values.
-compileFiles('lemon', dir .. '/../../libraries/lemon', {'lemon'}, '')
-runCommand('lemon',   dir, '../../libraries/lemon/lemon -qs -T../../libraries/lemon/lempar.c LuaSL_lemon_yaccer.y')
+compileFiles('lemon', dir .. '/../others/lemon', {'lemon'}, '')
+runCommand('lemon',   dir, '../others/lemon/lemon -qs -T../others/lemon/lempar.c LuaSL_lemon_yaccer.y')
 runCommand('flex',    dir, 'flex -C --outfile=LuaSL_lexer.c --header-file=LuaSL_lexer.h LuaSL_lexer.l')
 compileFiles('../../LuaSL', dir, {'LuaSL_main', 'LuaSL_compile', 'LuaSL_lexer', 'LuaSL_lemon_yaccer'}, '')
diff --git a/libraries/lemon/README b/src/others/lemon/README
index aa84547..aa84547 100644
--- a/libraries/lemon/README
+++ b/src/others/lemon/README
diff --git a/libraries/lemon/lemon.c b/src/others/lemon/lemon.c
index 85e94f7..85e94f7 100644
--- a/libraries/lemon/lemon.c
+++ b/src/others/lemon/lemon.c
diff --git a/libraries/lemon/lempar.c b/src/others/lemon/lempar.c
index fe56d2d..fe56d2d 100644
--- a/libraries/lemon/lempar.c
+++ b/src/others/lemon/lempar.c