Packets: Fix VariantParser invalid parser access bug

[senf.git] / Utils / SConscript

diff --git a/Utils/SConscript b/Utils/SConscript
index 81cb37c..a39e7f6 100644 (file)
--- a/Utils/SConscript
+++ b/Utils/SConscript
@@ -1,7 +1,29 @@
+# -*- python -*-
+
 Import('env')
-import SatSCons
+import SENFSCons, glob, os.path
 
 ###########################################################################
 
-SatSCons.StandardTargets(env)
-SatSCons.Lib(env, 'Utils',  SatSCons.GlobSources())
+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' ])