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

diff --git a/Utils/SConscript b/Utils/SConscript
index b117eac..7181097 100644
--- a/Utils/SConscript
+++ b/Utils/SConscript
@@ -1,25 +1,15 @@
 # -*- python -*-
 
 Import('env')
-import SENFSCons, glob
+import SENFSCons, glob, os.path
 
 ###########################################################################
 
-SENFSCons.StandardTargets(env)
-
-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"))