Auto clean the files we build.

4 files changed, 7 insertions, 6 deletions

diff --git a/build.lua b/build.lua
index 4b6c29e..7bbd642 100755
--- a/build.lua
+++ b/build.lua
@@ -16,7 +16,6 @@ pkgConfig = function (what, name)
 end
 
 removeFiles = function (dir, files)
-  print('clean')
   for i, v in ipairs(files) do
     os.execute('rm -f ' .. dir .. '/' .. v)
   end
@@ -30,6 +29,10 @@ end
 compileFiles = function (name, dir, files, extras)
   local objects = ''
   print('\n' .. name)
+  removeFiles(dir, {name})
+  for i, v in ipairs(files) do
+    removeFiles(dir, {v .. '.o'})
+  end
   for i, v in ipairs(files) do
     print('  ' .. v)
     os.execute('cd ' .. dir .. '; gcc ' .. CFLAGS .. ' -c -o ' .. v .. '.o ' .. v .. '.c')
@@ -81,7 +84,6 @@ EDJE_FLAGS = '-id ' .. baseDir .. '/media -fd ' .. baseDir .. '/media'
 if 'nil' == type(args) then
   -- Building this passes my "holding breath" test, if it can compile while I'm holding my breath, no need for make files.
   print('_______________ BUILDING lemon _______________')
-  removeFiles('libraries/lemon', {'*.o', 'lemon'})
   compileFiles('lemon', 'libraries/lemon', {'lemon'}, '')
   print('_______________ BUILDING Irrlicht _______________')
   -- Irrlicht is an external project that comes with make files anyway, and doesn't otherwise pass the test.
diff --git a/src/LuaSL/build.lua b/src/LuaSL/build.lua
index 0878e3d..0bd376c 100755
--- a/src/LuaSL/build.lua
+++ b/src/LuaSL/build.lua
@@ -14,7 +14,7 @@ if 'nil' == type(dir) then
 end
 
 
-removeFiles(dir, {'../../LuaSL', '*.o', '*.output', '*.backup', 'LuaSL_lexer.h', 'LuaSL_lexer.c', 'LuaSL_lemon_yaccer.h', 'LuaSL_lemon_yaccer.c', 'LuaSL_lemon_yaccer.out'})
+removeFiles(dir, {'*.output', '*.backup', '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')
diff --git a/src/extantz/build.lua b/src/extantz/build.lua
index 90caca5..c2990ff 100755
--- a/src/extantz/build.lua
+++ b/src/extantz/build.lua
@@ -17,8 +17,7 @@ CFLAGS  = CFLAGS  .. ' -I../../libraries/irrlicht-1.8.1/include -I/usr/X11R6/inc
 LDFLAGS = LDFLAGS .. ' -L../../libraries/irrlicht-1.8.1/lib/Linux'
 libs    = libs    .. ' -lIrrlicht -lephysics -lGL -lbz2 -lGuiLua'
 
-removeFiles(dir, {'crappisspuke.o', 'CDemo.o', 'extantzCamera.o', 'gears.o', 'ephysics_demo.o', 'Evas_3D_demo.o', '../../media/extantz.edj'})
-removeFiles(dir, {'../../extantz', 'camera.o', 'files.o', 'scenri.o', 'woMan.o'})
+removeFiles(dir, {'crappisspuke.o', 'CDemo.o', 'extantzCamera.o', '../../media/extantz.edj'})
 
 runCommand('edje_cc',           dir, 'edje_cc ' .. EDJE_FLAGS .. ' extantz.edc ../../media/extantz.edj')
 runCommand('Irrlicht files',    dir, 'g++ ' .. CFLAGS .. ' -ffast-math -c crappisspuke.cpp -o crappisspuke.o ' .. LDFLAGS)
diff --git a/src/love/build.lua b/src/love/build.lua
index 8fd9a29..b3911cd 100755
--- a/src/love/build.lua
+++ b/src/love/build.lua
@@ -14,7 +14,7 @@ if 'nil' == type(dir) then
 end
 
 
-removeFiles(dir, {'../../love', '*.o', '../../media/love.edj'})
+removeFiles(dir, {'../../media/love.edj'})
 
 runCommand('edje_cc', dir, 'edje_cc ' .. EDJE_FLAGS .. ' love.edc ../../media/love.edj')
 compileFiles('../../love', dir, {'love'}, '')