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

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