Centralise the PACKAGE_* stuff, move our libraries to lib, and shuffle stuff to suit.

7 files changed, 1 insertions, 25 deletions

diff --git a/libraries/LSL.lua b/lib/LSL.lua
index 662c880..662c880 100644
--- a/libraries/LSL.lua
+++ b/lib/LSL.lua
diff --git a/libraries/skang.lua b/lib/skang.lua
index 23549c3..633a574 100644
--- a/libraries/skang.lua
+++ b/lib/skang.lua
@@ -1010,7 +1010,7 @@ end
 
 -- Get our C functions installed into skang.
 -- This has to be after thingasm is defined.
-package.cpath = package.cpath .. ';../../libraries/lib?.so'
+package.cpath = package.cpath .. ';../../lib/lib?.so'
 local GuiLua = require 'GuiLua'
 
 
diff --git a/libraries/build.lua b/libraries/build.lua
deleted file mode 100755
index 8b48b70..0000000
--- a/libraries/build.lua
+++ /dev/null
@@ -1,24 +0,0 @@
-#!/usr/bin/env lua
-
-local dir = ...
-
-if 'nil' == type(dir) then
-  local build, err = loadfile('../build.lua')
-  if build then
-    setfenv(build, getfenv(2))
-    build('')
-  else
-    print("ERROR - " .. err)
-  end
-  dir = workingDir
-end
-
-LDFLAGS = '-L ' .. dir .. ' ' .. LDFLAGS
-
-removeFiles(dir, {'LumbrJack.o', 'libLumbrJack.so', 'Runnr.o', 'libRunnr.so'})
-
-runCommand('C libraries',       dir, 'gcc ' .. CFLAGS .. ' -fPIC -c LumbrJack.c')
-runCommand(nil,                 dir, 'gcc ' .. CFLAGS .. ' -shared -Wl,-soname,libLumbrJack.so -o libLumbrJack.so LumbrJack.o')
-
-runCommand(nil,                 dir, 'gcc ' .. CFLAGS .. ' -fPIC -c Runnr.c')
-runCommand(nil,                 dir, 'gcc ' .. CFLAGS .. ' -shared -Wl,-soname,libRunnr.so -o libRunnr.so Runnr.o')
diff --git a/libraries/LumbrJack.c b/src/libraries/LumbrJack.c
index 084d916..084d916 100644
--- a/libraries/LumbrJack.c
+++ b/src/libraries/LumbrJack.c
diff --git a/libraries/LumbrJack.h b/src/libraries/LumbrJack.h
index 4a3290c..4a3290c 100644
--- a/libraries/LumbrJack.h
+++ b/src/libraries/LumbrJack.h
diff --git a/libraries/Runnr.c b/src/libraries/Runnr.c
index a24e7f5..a24e7f5 100644
--- a/libraries/Runnr.c
+++ b/src/libraries/Runnr.c
diff --git a/libraries/Runnr.h b/src/libraries/Runnr.h
index dc720ff..dc720ff 100644
--- a/libraries/Runnr.h
+++ b/src/libraries/Runnr.h