X-Git-Url: http://g0dil.de/git?a=blobdiff_plain;f=Utils%2FSConscript;h=a39e7f6c9f983460285920b4da72aca200ebb7d0;hb=412024ed31a4ab4eaea7a4165a434f8efebee325;hp=baa117a22748ff116e0499fd2270a1e13542c0b3;hpb=9f894848419a22a6a50e6c5ce253f436d164dcd3;p=senf.git

diff --git a/Utils/SConscript b/Utils/SConscript
index baa117a..a39e7f6 100644
--- a/Utils/SConscript
+++ b/Utils/SConscript
@@ -1,11 +1,29 @@
 # -*- python -*-
 
 Import('env')
-import SENFSCons
+import SENFSCons, glob, os.path
 
 ###########################################################################
 
-sources = SENFSCons.GlobSources()
 SENFSCons.StandardTargets(env)
-SENFSCons.Lib(env, 'Utils', sources)
+
+# 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' ]))
+
 SENFSCons.Doxygen(env)
+SENFSCons.InstallIncludeFiles(env, [ 'Logger.hh', 'Daemon.hh' ])