X-Git-Url: http://g0dil.de/git?a=blobdiff_plain;f=Utils%2FSConscript;h=e07dec065691b15aa77517af3561e62f3ca9982d;hb=5443435c4c2b6e4386c5334b5b8358273f2bae93;hp=75a2b96ccc6e01c2c174c821476ce53fa31bf823;hpb=48e002c85474560e93187b1423a75dde49463147;p=senf.git

diff --git a/Utils/SConscript b/Utils/SConscript
index 75a2b96..e07dec0 100644
--- a/Utils/SConscript
+++ b/Utils/SConscript
@@ -1,28 +1,15 @@
 # -*- python -*-
 
 Import('env')
-import SENFSCons, glob
+import SENFSCons, glob, os.path
 
 ###########################################################################
 
-SENFSCons.StandardTargets(env)
-
-# OUCH ... another hack to work around a scons bug ...
-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, includes = SENFSCons.Glob(env, subdirs=[ 'impl' ])
 
+SENFSCons.StandardTargets(env)
+SENFSCons.Lib(env, sources)
 SENFSCons.Doxygen(env)
-SENFSCons.InstallIncludeFiles(env, [ 'Logger.hh', 'Daemon.hh' ])
+SENFSCons.InstallIncludeFiles(env, includes)
+
+SConscript(glob.glob("*/SConscript"))