Move Console from Scheduler into Utils

[senf.git] / Utils / SConscript

diff --git a/Utils/SConscript b/Utils/SConscript
index 75a2b96..d17af8a 100644 (file)
--- a/Utils/SConscript
+++ b/Utils/SConscript
@@ -1,28 +1,24 @@
 # -*- 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"))
+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 = objects)
 
 SENFSCons.Doxygen(env)
 SENFSCons.InstallIncludeFiles(env, [ 'Logger.hh', 'Daemon.hh' ])
+
+SConscript(glob.glob("*/SConscript"))