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

25 files changed, 123 insertions, 132 deletions

diff --git a/.gitignore b/.gitignore
index 221dde6..12ab02e 100644
--- a/.gitignore
+++ b/.gitignore
@@ -319,7 +319,7 @@ skang
 *.lsl.lua
 *.lsl2
 libraries/lemon/lemon
-libraries/constants.lsl
+lib/constants.lsl
 src/LuaSL/LuaSL_test
 src/LuaSL/LuaSL_lemon_yaccer.c
 src/LuaSL/LuaSL_lemon_yaccer.h
diff --git a/TODO b/TODO
index 3fa0c8d..240e63d 100644
--- a/TODO
+++ b/TODO
@@ -3,45 +3,19 @@ FIXES -
     Project paths
     -------------
 
-CFLAGS = CFLAGS .. ' -DPACKAGE_BIN_DIR=\\"'  .. baseDir .. '\\"'
-CFLAGS = CFLAGS .. ' -DPACKAGE_LIB_DIR=\\"'  .. baseDir .. '\\"'
-CFLAGS = CFLAGS .. ' -DPACKAGE_DATA_DIR=\\"' .. baseDir .. '\\"'
-
-  // There is also a locale variety, but we are not dealing with locale stuff yet.
-  // There is a prefix variety, but you can't set it, only read it later.
-  // These set the fallbacks used by elm_app_info_set(), that are defined at compile time.
-  elm_app_compile_bin_dir_set(PACKAGE_BIN_DIR);
-  elm_app_compile_data_dir_set(PACKAGE_DATA_DIR);
-  elm_app_compile_lib_dir_set(PACKAGE_LIB_DIR);
-  // Do this after the above calls, but before changing the working directory, or screwing with argv[0].
-  // It tries to set up the package paths depending on where the executable is, so things are relocatable.
-  // First argument is the elm_main() function that Elementary starts us from.
-  // Second argument should be a lower case string used as the "domain", which is different from the log domain.
-  //   It's used lower case as part of the data directory path.
-  //     So, if prefix is /usr/local, then the system data dir is /usr/local/share,
-  //     and this apps data dir is /usr/local/share/"domain".
-  //   It's used upper case as part of environment variables to override directory paths at run time.
-  //     So "DOMAIN"_PREFIX, "DOMAIN"_BIN_DIR, "DOMAIN"_LIB_DIR, "DOMAIN"_DATA_DIR, and "DOMAIN"_LOCALE_DIR
-  // Third argument is the name of a file it can check for to make sure it found the correct path.
-  //  This file is looked for in the data dir.
-  elm_app_info_set(elm_main, "GuiLua", "skang.lua");
-  // Once this is all setup, the code can do -
-  elm_app_prefix_dir_get();     // or bin, lib, data, locale.
-
 The executables currently live in ...../SledjHamr.
   Test executables stay in the src directory.
 Media and other data in SledjHamr/media (includes the test sim and Irrlicht examples).
-Libraries are in SledjHamr/libraries (including Irrlicht, lemon, and some sources).
-  Should move LumbrJack and Runnr sources to src, and probably lemon to.
+External libraries are in SledjHamr/libraries (Irrlicht and lemon).
   Irrlicht is statically linked, so except for it's media, we don't need it at run time.
     We could probably move the Irrlicht examples we actually use (all test data anyway) to Test sim.
+  Lemon is only used at build time.
 
 Builders should be able to -
   put binaries in /usr/local/bin
   put libraries - /usr/local/lib/SledjHamr
   put media in /usr/local/share/SledjHamr
 If they don't, those things should be in the build directory, where they are now.
-  And looked up locally to allow moving it as one thing.
 
 User should be able to -
   Run sims from where ever they like.
@@ -53,12 +27,6 @@ User should be able to -
   Write their own skins, using their own media.
 
 SOOOO ...
-  build.lua should set -
-    PACKAGE_BIN_DIR     = SledjHamr
-    PACKAGE_LIB_DIR     = SledjHamr/libraries   (should rename this to lib)
-    PACKAGE_DATA_DIR    = SledjHamr/media
-    PACKAGE_LOCALE_DIR  = SledjHamr/locale      (doesn't exist yet)
-
   install.lua should -                  (doesn't exist yet)
     SledjHamr binaries  -> prefix .. '/bin'
     SledjHamr/libraries -> prefix .. '/lib/SledjHamr'
@@ -69,14 +37,6 @@ SOOOO ...
         For now, we don't care, there's no actual installing going on.
     SledjHamr/locale    -> prefix .. '/share/SledjHamr/locale'
 
-  Some library function should call all the elm_app_compile_*_dir_set() functions.
-  They should be set as -D options only for that library.
-  elm_app_info_set() has to be called for each different elm_main(), so that might be tricky.
-  elm_app_*_dir_get() can then be called from anywhere, and will get the same results.
-  NOTE - this is Elm specific, so non GUI stuff like LuaSL can't use it.
-  Seems that non Elm examples all just use the PACKAGE_*_DIR type macros directly in strings.
-
-
 
 Irrlicht is flickering like crazy.  Hmm, might be Irrlicht's fault,
 mostly it flickers to black, but I've seen it flicker to the first frame
@@ -118,7 +78,7 @@ Write my own, use ePhysics.  Hopefully ePhysics has some sort of
 magnetism / attraction thingy.  See the forces demo, should be doable. 
 Collision restraints and impulses?
 
-See if Evas allows detaching stuff from one canvas and adding it to
+See if Evas allows detaching stuff from one canvas and adding it to 
 another canvas.  This allows things like tearing off tabs from windows,
 tearing off sub menus, and switching windows between internal and
 external windows, without having to entirely recreate the UI stack
diff --git a/build.lua b/build.lua
index 083d726..414ebfa 100755
--- a/build.lua
+++ b/build.lua
@@ -58,11 +58,16 @@ if 'number' == type(args) then
   end
 end
 
+bin_d    = baseDir
+lib_d    = baseDir .. '/lib'
+data_d   = baseDir .. '/media'
+locale_d = baseDir .. '/locale'
+
 -- Likely this will fail, coz Lua likes to strip out environmont variables.
 -- On the other hand, there's a more direct way to get to environment variables, it would fail to.
 CFLAGOPTS = readCommand('echo "$CFLAGOPTS"')
 
-CFLAGS = '-g -Wall -I include -I ' .. baseDir .. '/libraries'
+CFLAGS = '-g -Wall -I ' .. baseDir .. '/src/libraries'
 CFLAGS = CFLAGS .. ' ' .. pkgConfig('cflags', 'luajit')
 CFLAGS = CFLAGS .. ' ' .. pkgConfig('cflags', 'eo')
 CFLAGS = CFLAGS .. ' ' .. pkgConfig('cflags', 'eet')
@@ -71,13 +76,10 @@ CFLAGS = CFLAGS .. ' ' .. pkgConfig('cflags', 'ecore-evas')
 CFLAGS = CFLAGS .. ' ' .. pkgConfig('cflags', 'ecore-file')
 CFLAGS = CFLAGS .. ' ' .. pkgConfig('cflags', 'edje')
 CFLAGS = CFLAGS .. ' ' .. pkgConfig('cflags', 'elementary')
-CFLAGS = CFLAGS .. ' -DPACKAGE_BIN_DIR=\\"'  .. baseDir .. '\\"'
-CFLAGS = CFLAGS .. ' -DPACKAGE_LIB_DIR=\\"'  .. baseDir .. '\\"'
-CFLAGS = CFLAGS .. ' -DPACKAGE_DATA_DIR=\\"' .. baseDir .. '\\"'
 CFLAGS = CFLAGS .. ' ' .. CFLAGOPTS
 
-LDFLAGS = '-L ' .. baseDir .. '/libraries ' .. pkgConfig('libs-only-L', 'luajit') .. ' -L /usr/lib -L /lib'
-libs = '-lLumbrJack -lRunnr ' .. pkgConfig('libs', 'elementary') .. ' ' .. pkgConfig('libs', 'luajit') .. ' -lpthread -lm -Wl,-rpath,' .. baseDir .. '/libraries'
+LDFLAGS = '-L ' .. baseDir .. '/lib ' .. pkgConfig('libs-only-L', 'luajit') .. ' -L /usr/lib -L /lib'
+libs = '-lLumbrJack -lRunnr -lSledjHamr ' .. pkgConfig('libs', 'elementary') .. ' ' .. pkgConfig('libs', 'luajit') .. ' -lpthread -lm -Wl,-rpath,' .. baseDir .. '/lib'
 LFLAGS = '-d'
 EDJE_FLAGS = '-id ' .. baseDir .. '/media -fd ' .. baseDir .. '/media'
 
@@ -90,7 +92,7 @@ if 'nil' == type(args) then
   print('_______________ BUILDING Irrlicht _______________')
   -- Irrlicht is an external project that comes with make files anyway, and doesn't otherwise pass the test.
   runCommand('Irrlicht','libraries/irrlicht-1.8.1/source/Irrlicht', 'make')
-  buildSub('libraries', 'libraries')
+  buildSub('libraries', 'src/libraries')
   buildSub('LuaSL',     'src/LuaSL')
   buildSub('GuiLua',    'src/GuiLua')
   buildSub('extantz',   'src/extantz')
diff --git a/docs/README.libraries b/docs/README.libraries
index a26fda1..6d36009 100644
--- a/docs/README.libraries
+++ b/docs/README.libraries
@@ -26,6 +26,8 @@ Merged it into LuaSL, so it's no longer here.
 
 These are the libraries written for the SledjHamr project.
 
-LumbrJack is a library of logging stuff, coz every one wants to log.
+libLumbrJack is a library of logging stuff, coz every one wants to log.
 
-Runnr is for running Lua scripts.  Named (sorta) after a friend of mine.
+libRunnr is for running Lua scripts.  Named (sorta) after a friend of mine.
+
+libSledjHamr is a motley collection of stuff that is needed.
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/media/checkme.txt b/media/checkme.txt
new file mode 100644
index 0000000..957099c
--- /dev/null
+++ b/media/checkme.txt
@@ -0,0 +1,2 @@
+A file for elm_app_info_set() to find, to make sure it found the correct
+data directory.
diff --git a/src/GuiLua/GuiLua.h b/src/GuiLua/GuiLua.h
index 95353fb..2dd77ba 100644
--- a/src/GuiLua/GuiLua.h
+++ b/src/GuiLua/GuiLua.h
@@ -1,27 +1,8 @@
-
-#define EFL_API_OVERRIDE 1
-/* Enable access to unstable EFL API that are still in beta */
-#define EFL_BETA_API_SUPPORT 1
-/* Enable access to unstable EFL EO API. */
-#define EFL_EO_API_SUPPORT 1
-
-#include <stdio.h>
-#include <ctype.h>
-
-#include <Elementary.h>
-
-// This got left out.
-//EAPI Evas_3D_Scene *evas_3d_scene_add(Evas *e);
-
-
-#include <lua.h>
-#include <luajit.h>
-#include <lualib.h>
-#include <lauxlib.h>
-
+#include "SledjHamr.h"
 #include "LumbrJack.h"
 #include "Runnr.h"
 
+
 typedef struct _globals globals;
 
 
diff --git a/src/GuiLua/build.lua b/src/GuiLua/build.lua
index 16f4153..169e198 100755
--- a/src/GuiLua/build.lua
+++ b/src/GuiLua/build.lua
@@ -15,9 +15,9 @@ end
 
 LDFLAGS = '-L ' .. dir .. ' ' .. LDFLAGS
 
-removeFiles(dir, {'test_c.so', 'GuiLua.o', '../../libraries/libGuiLua.so', '../../skang'})
+removeFiles(dir, {'test_c.so', 'GuiLua.o', lib_d .. '/libGuiLua.so', '../../skang'})
 
 runCommand('C modules',         dir, 'gcc ' .. CFLAGS .. ' -fPIC -shared -o test_c.so test_c.c')
 runCommand(nil,                 dir, 'gcc ' .. CFLAGS .. ' -fPIC -c GuiLua.c')
-runCommand('C libraries',       dir, 'gcc ' .. CFLAGS .. ' -shared -Wl,-soname,libGuiLua.so -o ../../libraries/libGuiLua.so GuiLua.o')
+runCommand('C libraries',       dir, 'gcc ' .. CFLAGS .. ' -shared -Wl,-soname,libGuiLua.so -o ' .. lib_d .. '/libGuiLua.so GuiLua.o')
 runCommand('C apps',            dir, 'gcc ' .. CFLAGS .. ' -Wl,-export-dynamic -o ../../skang skang.c ' .. LDFLAGS .. ' -lGuiLua ' .. libs)
diff --git a/src/GuiLua/skang.c b/src/GuiLua/skang.c
index facc239..f78c1c5 100644
--- a/src/GuiLua/skang.c
+++ b/src/GuiLua/skang.c
@@ -3,11 +3,7 @@
 
 EAPI_MAIN int elm_main(int argc, char **argv)
 {
-  elm_app_compile_bin_dir_set(PACKAGE_BIN_DIR);
-  elm_app_compile_data_dir_set(PACKAGE_DATA_DIR);
-  elm_app_compile_lib_dir_set(PACKAGE_LIB_DIR);
-  elm_app_info_set(elm_main, "GuiLua", "skang.lua");
-
+  HamrTime(elm_main, "GuiLua");
   GuiLuaDo(argc, argv);
 
   return 0;
diff --git a/src/GuiLua/test.sh b/src/GuiLua/test.sh
index bea2fc3..0cf39d9 100755
--- a/src/GuiLua/test.sh
+++ b/src/GuiLua/test.sh
@@ -2,5 +2,5 @@
 
 wd=$(pwd)
 
-export LUA_PATH="$wd/../../libraries/?.lua;./?.lua"
+export LUA_PATH="$wd/../../lib/?.lua;./?.lua"
 ../../skang -l test -foo "argy bargy"
diff --git a/src/LuaSL/LuaSL_compile.c b/src/LuaSL/LuaSL_compile.c
index 771888e..f32e0c0 100644
--- a/src/LuaSL/LuaSL_compile.c
+++ b/src/LuaSL/LuaSL_compile.c
@@ -2119,9 +2119,9 @@ boolean compilerSetup(gameGlobals *ourGlobals)
         }
 
         // Compile the constants.
-        snprintf(buf, sizeof(buf), "lua -e 'require(\"LSL\").gimmeLSL()' > %s/libraries/constants.lsl", PACKAGE_DATA_DIR);
+        snprintf(buf, sizeof(buf), "lua -e 'require(\"LSL\").gimmeLSL()' > %s/constants.lsl", PACKAGE_LIB_DIR);
         system(buf);
-        snprintf(buf, sizeof(buf), "%s/libraries/constants.lsl", PACKAGE_DATA_DIR);
+        snprintf(buf, sizeof(buf), "%s/constants.lsl", PACKAGE_LIB_DIR);
         compileLSL(ourGlobals, NULL, "FAKE_SID", buf, TRUE);
 
         return TRUE;
diff --git a/src/LuaSL/LuaSL_test.c b/src/LuaSL/LuaSL_test.c
index 58d6225..27b9626 100644
--- a/src/LuaSL/LuaSL_test.c
+++ b/src/LuaSL/LuaSL_test.c
@@ -147,7 +147,7 @@ static Eina_Bool _add(void *data, int type __UNUSED__, Ecore_Con_Event_Server_Ad
 
     ourGlobals->server = ev->server;
     gettimeofday(&startTime, NULL);
-    snprintf(buf, sizeof(buf), "%s/media/Test sim/objects", PACKAGE_DATA_DIR);
+    snprintf(buf, sizeof(buf), "%s/Test sim/objects", PACKAGE_DATA_DIR);
     eina_file_dir_list(buf, EINA_TRUE, dirList_compile, ourGlobals);
     // Wait awhile, then start sending events for testing.
     ecore_timer_add(0.5, _timer_cb, ourGlobals);
@@ -392,7 +392,7 @@ int main(int argc, char **argv)
                                 evas_object_focus_set(ourGlobals.bg, EINA_TRUE);
 
                                 ourGlobals.edje = edje_object_add(ourGlobals.canvas);
-                                snprintf(buf, sizeof(buf), "%s/media/%s.edj", PACKAGE_DATA_DIR, "LuaSL");
+                                snprintf(buf, sizeof(buf), "%s/%s.edj", PACKAGE_DATA_DIR, "LuaSL");
                                 if (!edje_object_file_set(ourGlobals.edje, buf, group))
                                 {
                                     int err = edje_object_load_error_get(ourGlobals.edje);
@@ -409,7 +409,7 @@ int main(int argc, char **argv)
                                 evas_object_resize(ourGlobals.edje, WIDTH, HEIGHT);
                                 evas_object_show(ourGlobals.edje);
 
-                                snprintf(buf, sizeof(buf), "%s/media/bubble_sh.png", PACKAGE_DATA_DIR);
+                                snprintf(buf, sizeof(buf), "%s/bubble_sh.png", PACKAGE_DATA_DIR);
                                 for (i = 0; i < (sizeof(names) / sizeof(char *) / 2); i++)
                                 {
                                     sh = evas_object_image_filled_add(ourGlobals.canvas);
@@ -419,7 +419,7 @@ int main(int argc, char **argv)
                                     evas_object_data_set(ourGlobals.bg, names[(i * 2) + 1], sh);
                                 }
 
-                                snprintf(buf, sizeof(buf), "%s/media/bubble.png", PACKAGE_DATA_DIR);
+                                snprintf(buf, sizeof(buf), "%s/bubble.png", PACKAGE_DATA_DIR);
                                 for (i = 0; i < (sizeof(names) / sizeof(char *) / 2); i++)
                                 {
                                     bub = evas_object_image_filled_add(ourGlobals.canvas);
diff --git a/src/LuaSL/build.lua b/src/LuaSL/build.lua
index f86715c..6b34145 100755
--- a/src/LuaSL/build.lua
+++ b/src/LuaSL/build.lua
@@ -13,11 +13,20 @@ if 'nil' == type(dir) then
   dir = workingDir
 end
 
+
 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('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')
+
+-- While SledHamr.c does this, we can't use that here, coz LuaSL is not an Elm app.
+-- Neither is LuaSL_test actually.
+CFLAGS = CFLAGS .. ' -DPACKAGE_BIN_DIR=\\"'    .. bin_d    .. '\\"'
+CFLAGS = CFLAGS .. ' -DPACKAGE_LIB_DIR=\\"'    .. lib_d    .. '\\"'
+CFLAGS = CFLAGS .. ' -DPACKAGE_DATA_DIR=\\"'   .. data_d   .. '\\"'
+CFLAGS = CFLAGS .. ' -DPACKAGE_LOCALE_DIR=\\"' .. locale_d .. '\\"'
+
 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/src/LuaSL/test.sh b/src/LuaSL/test.sh
index 1c26ade..435c5e2 100755
--- a/src/LuaSL/test.sh
+++ b/src/LuaSL/test.sh
@@ -4,7 +4,7 @@ wd=$(pwd)
 
 # Kill any left overs.
 killall -KILL LuaSL
-export LUA_PATH="$wd/../../libraries/?.lua"
+export LUA_PATH="$wd/../../lib/?.lua"
 
 case $@ in
 
diff --git a/src/extantz/extantz.c b/src/extantz/extantz.c
index 09b5196..ab09fd0 100644
--- a/src/extantz/extantz.c
+++ b/src/extantz/extantz.c
@@ -39,7 +39,7 @@ static Elm_Genlist_Item_Class *viewer_gic = NULL;
 
 //static const char *img1 = PACKAGE_DATA_DIR "/media/plant_01.jpg";
 //static const char *img2 = PACKAGE_DATA_DIR "/media/sky_01.jpg";
-static const char *img3 = PACKAGE_DATA_DIR "/media/rock_01.jpg";
+static const char *img3 = "rock_01.jpg";
 
 
 #define EPHYSICS_TEST_THEME "extantz"
@@ -1240,7 +1240,7 @@ static void woMan_add(GLData *gld)
 //    Evas_Object *win, *bg, *bx, *ic, *bb, *av, *en, *bt, *nf, *tab, *tb, *gridList, *viewerList, *menu;
     Evas_Object *win, *bx, *bt, *nf, *tab, *tb, *gridList, *viewerList, *menu;
     Elm_Object_Item *tb_it, *menu_it, *tab_it;
-//    char buf[PATH_MAX];
+    char buf[PATH_MAX];
     int i;
 
     win = fang_win_add(gld);
@@ -1351,9 +1351,10 @@ static void woMan_add(GLData *gld)
     evas_object_size_hint_weight_set(nf, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND);
     evas_object_size_hint_align_set(nf, EVAS_HINT_FILL, EVAS_HINT_FILL);
     evas_object_show(nf);
-    
+
+    sprintf(buf, "%s/%s", elm_app_data_dir_get(), img3);
     tab = viewerList;                           tab_it = elm_naviframe_item_push(nf, NULL, NULL, NULL, tab, NULL);      elm_naviframe_item_title_enabled_set(tab_it, EINA_FALSE, EINA_TRUE);    elm_toolbar_item_append(tb, NULL, "Viewers", _promote, tab_it);
-    tab = _content_image_new(win, img3);        tab_it = elm_naviframe_item_push(nf, NULL, NULL, NULL, tab, NULL);      elm_naviframe_item_title_enabled_set(tab_it, EINA_FALSE, EINA_TRUE);    elm_toolbar_item_append(tb, NULL, "Landmarks", _promote, tab_it);
+    tab = _content_image_new(win, strdup(buf)); tab_it = elm_naviframe_item_push(nf, NULL, NULL, NULL, tab, NULL);      elm_naviframe_item_title_enabled_set(tab_it, EINA_FALSE, EINA_TRUE);    elm_toolbar_item_append(tb, NULL, "Landmarks", _promote, tab_it);
     tab = gridList;                             tab_it = elm_naviframe_item_push(nf, NULL, NULL, NULL, tab, NULL);      elm_naviframe_item_title_enabled_set(tab_it, EINA_FALSE, EINA_TRUE);    elm_toolbar_item_append(tb, NULL, "Grids", _promote, tab_it);
     elm_box_pack_end(bx, nf);
 
@@ -1393,7 +1394,7 @@ EAPI_MAIN int elm_main(int argc, char **argv)
     EPhysics_Body *box_body1, *box_body2;
     Evas_Object *box1, *box2;
     GLData *gld = NULL;
-//    char buf[PATH_MAX];
+    char buf[PATH_MAX];
 //    int i;
 //    Eina_Bool gotWebKit = elm_need_web();     // Initialise ewebkit if it exists, or return EINA_FALSE if it don't.
 
@@ -1401,10 +1402,7 @@ EAPI_MAIN int elm_main(int argc, char **argv)
     // Don't do this, we need to clean up other stuff to, so set a clean up function below.
     //elm_policy_set(ELM_POLICY_QUIT, ELM_POLICY_QUIT_LAST_WINDOW_CLOSED);
 
-    // If you want efl to handle finding your bin/lib/data dirs, you must do this below.
-    elm_app_compile_bin_dir_set(PACKAGE_BIN_DIR);
-    elm_app_compile_data_dir_set(PACKAGE_DATA_DIR);
-    elm_app_info_set(elm_main, "datadir", "media/sky_03.jpg");
+    HamrTime(elm_main, "extantz");
     fprintf(stdout, "prefix was set to: %s\n", elm_app_prefix_dir_get());
     fprintf(stdout, "data directory is: %s\n", elm_app_data_dir_get());
     fprintf(stdout, "library directory is: %s\n", elm_app_lib_dir_get());
@@ -1538,7 +1536,8 @@ EAPI_MAIN int elm_main(int argc, char **argv)
     ephysics_body_friction_set(boundary, 0);
 
     box1 = elm_image_add(gld->win);
-    elm_image_file_set(box1, PACKAGE_DATA_DIR "/media/" EPHYSICS_TEST_THEME ".edj", "blue-cube");
+    sprintf(buf, "%s/%s.edj", elm_app_data_dir_get(), EPHYSICS_TEST_THEME);
+    elm_image_file_set(box1, strdup(buf), "blue-cube");
     evas_object_move(box1, gld->win_w / 2 - 80, gld->win_h - 200);
     evas_object_resize(box1, 70, 70);
     evas_object_show(box1);
@@ -1552,7 +1551,7 @@ EAPI_MAIN int elm_main(int argc, char **argv)
     ephysics_body_sleeping_threshold_set(box_body1, 0.1, 0.1);
 
     box2 = elm_image_add(gld->win);
-    elm_image_file_set(box2, PACKAGE_DATA_DIR "/media/" EPHYSICS_TEST_THEME ".edj", "purple-cube");
+    elm_image_file_set(box2, strdup(buf), "purple-cube");
     evas_object_move(box2, gld->win_w / 2 + 10, gld->win_h - 200);
     evas_object_resize(box2, 70, 70);
     evas_object_show(box2);
diff --git a/src/extantz/extantz.h b/src/extantz/extantz.h
index afb94af..25b78cf 100644
--- a/src/extantz/extantz.h
+++ b/src/extantz/extantz.h
@@ -6,14 +6,8 @@
 #define USE_DEMO    1
 #define DO_GEARS    0
 
-#if USE_EO
-    /* Enable access to unstable EFL API that are still in beta */
-    #define EFL_BETA_API_SUPPORT 1
-    /* Enable access to unstable EFL EO API. */
-    #define EFL_EO_API_SUPPORT 1
-#endif
 
-#include <Elementary.h>
+#include "SledjHamr.h"
 #include <elm_widget_glview.h>
 #include <Evas_GL.h>
 #include <EPhysics.h>
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
diff --git a/src/libraries/SledjHamr.c b/src/libraries/SledjHamr.c
new file mode 100644
index 0000000..aa68774
--- /dev/null
+++ b/src/libraries/SledjHamr.c
@@ -0,0 +1,23 @@
+#include "SledjHamr.h"
+
+void HamrTime(void *elm_main, char *domain)
+{
+  elm_app_compile_bin_dir_set(PACKAGE_BIN_DIR);
+  elm_app_compile_data_dir_set(PACKAGE_DATA_DIR);
+  elm_app_compile_lib_dir_set(PACKAGE_LIB_DIR);
+  elm_app_compile_locale_set(PACKAGE_LOCALE_DIR);
+  // Do this after the above calls, but before changing the working directory, or screwing with argv[0].
+  // It tries to set up the package paths depending on where the executable is, so things are relocatable.
+  // First argument is the elm_main() function that Elementary starts us from.
+  // Second argument should be a lower case string used as the "domain", which is different from the log domain.
+  //   It's used lower case as part of the data directory path.
+  //     So, if prefix is /usr/local, then the system data dir is /usr/local/share,
+  //     and this apps data dir is /usr/local/share/"domain".
+  //   It's used upper case as part of environment variables to override directory paths at run time.
+  //     So "DOMAIN"_PREFIX, "DOMAIN"_BIN_DIR, "DOMAIN"_LIB_DIR, "DOMAIN"_DATA_DIR, and "DOMAIN"_LOCALE_DIR
+  // Third argument is the name of a file it can check for to make sure it found the correct path.
+  //  This file is looked for in the data dir.
+  elm_app_info_set(elm_main, domain, "checkme.txt");
+  // Once this is all setup, the code can do -
+  // elm_app_prefix_dir_get();  // or bin, lib, data, locale.
+}
diff --git a/src/libraries/SledjHamr.h b/src/libraries/SledjHamr.h
new file mode 100644
index 0000000..893d90e
--- /dev/null
+++ b/src/libraries/SledjHamr.h
@@ -0,0 +1,14 @@
+
+#define EFL_API_OVERRIDE 1
+/* Enable access to unstable EFL API that are still in beta */
+#define EFL_BETA_API_SUPPORT 1
+/* Enable access to unstable EFL EO API. */
+#define EFL_EO_API_SUPPORT 1
+
+#include <stdio.h>
+#include <ctype.h>
+
+#include <Elementary.h>
+
+
+void HamrTime(void *elm_main, char *domain);
diff --git a/src/libraries/build.lua b/src/libraries/build.lua
new file mode 100755
index 0000000..6566e66
--- /dev/null
+++ b/src/libraries/build.lua
@@ -0,0 +1,33 @@
+#!/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(2)
+  else
+    print("ERROR - " .. err)
+  end
+  dir = workingDir
+end
+
+LDFLAGS = '-L ' .. dir .. ' ' .. LDFLAGS
+
+removeFiles(dir, {'LumbrJack.o', lib_d .. '/libLumbrJack.so', 'Runnr.o', lib_d .. '/libRunnr.so', 'SledjHamr.o', lib_d .. '/libSledjHamr.so'})
+
+runCommand('C libraries',       dir, 'gcc ' .. CFLAGS .. ' -fPIC -c LumbrJack.c')
+runCommand(nil,                 dir, 'gcc ' .. CFLAGS .. ' -shared -Wl,-soname,libLumbrJack.so -o ' .. lib_d .. '/libLumbrJack.so LumbrJack.o')
+
+runCommand(nil,                 dir, 'gcc ' .. CFLAGS .. ' -fPIC -c Runnr.c')
+runCommand(nil,                 dir, 'gcc ' .. CFLAGS .. ' -shared -Wl,-soname,libRunnr.so -o ' .. lib_d .. '/libRunnr.so Runnr.o')
+
+-- For Elm apps, these are all centrally controlled in libSledjHamr.
+CFLAGS = CFLAGS .. ' -DPACKAGE_BIN_DIR=\\"'    .. bin_d    .. '\\"'
+CFLAGS = CFLAGS .. ' -DPACKAGE_LIB_DIR=\\"'    .. lib_d    .. '\\"'
+CFLAGS = CFLAGS .. ' -DPACKAGE_DATA_DIR=\\"'   .. data_d   .. '\\"'
+CFLAGS = CFLAGS .. ' -DPACKAGE_LOCALE_DIR=\\"' .. locale_d .. '\\"'
+
+runCommand(nil,                 dir, 'gcc ' .. CFLAGS .. ' -fPIC -c SledjHamr.c')
+runCommand(nil,                 dir, 'gcc ' .. CFLAGS .. ' -shared -Wl,-soname,libSledjHamr.so -o ' .. lib_d .. '/libSledjHamr.so SledjHamr.o')