X-Git-Url: http://g0dil.de/git?a=blobdiff_plain;f=Utils%2FSConscript;h=71810974609df520ef5f3360007054d277a64606;hb=164fe477094d42463722584e527a02379ab5d985;hp=a39e7f6c9f983460285920b4da72aca200ebb7d0;hpb=1d247d12d1759ffd77f456efe3a52f03dd289994;p=senf.git

diff --git a/Utils/SConscript b/Utils/SConscript
index a39e7f6..7181097 100644
--- a/Utils/SConscript
+++ b/Utils/SConscript
@@ -5,25 +5,11 @@ import SENFSCons, glob, os.path
 
 ###########################################################################
 
-SENFSCons.StandardTargets(env)
-
-# OUCH ... another hack to work around a scons bug ...
-if not os.path.exists("Logger/all_includes.hh"):
-    Execute(Touch("Logger/all_includes.hh"))
-
-sources, testSources = SENFSCons.GlobSources()
-objects = SENFSCons.Objects( env, sources = sources, testSources=testSources )
-
-for sc in glob.glob("*/SConscript"):
-    ob = SConscript(sc)
-    if ob : objects.extend(ob)
-
-lib = SENFSCons.Lib(env,
-                    library = 'Utils',
-                    sources = objects,
-                    no_includes = True)
-
-SENFSCons.InstallSourceIncludes(env, Flatten([ lib, '.test.bin', 'Logger/.test.bin' ]))
+sources, tests, includes = SENFSCons.Glob(env, subdirs=[ 'impl' ])
 
+env.Append(ALLOBJECTS = env.Object(sources))
+env.BoostUnitTest('test', tests)
 SENFSCons.Doxygen(env)
-SENFSCons.InstallIncludeFiles(env, [ 'Logger.hh', 'Daemon.hh' ])
+env.InstallSubdir('$INCLUDEINSTALLDIR', includes)
+
+SConscript(glob.glob("*/SConscript"))