Scheduler: Remove unneeded Socket dependency

[senf.git] / Socket / SConscript

diff --git a/Socket/SConscript b/Socket/SConscript
index 8925f1f..67b1bdc 100644 (file)
--- a/Socket/SConscript
+++ b/Socket/SConscript
@@ -1,19 +1,34 @@
 # -*- python -*-
 
 Import('env')
-import SENFSCons
+import SENFSCons, glob
 
 ###########################################################################
 
-sources = SENFSCons.GlobSources()
+SENFSCons.AllIncludesHH(env, [ f for f in glob.glob("*.hh")
+                               if f not in ('all_includes.hh','Socket.hh') and not f.endswith('.test.hh') ])
+
+sources, testSources = SENFSCons.GlobSources()
 
 SENFSCons.StandardTargets(env)
 
+subob = []
+for sc in glob.glob("*/SConscript"):
+    ob = SConscript(sc)
+    if ob : subob.extend(ob)
+
 SENFSCons.Lib(env,
-             library = 'Socket',
-             sources = sources,
-             LIBS = [ 'Utils' ])
+              library = 'Socket',
+              sources = sources + subob,
+              testSources = testSources,
+              LIBS = [ 'Scheduler', 'Utils' ])
 
 SENFSCons.Doxygen(env, extra_sources = [
-    env.Dia2Png('SocketLibrary-classes.dia')
-    ])
+    env.Dia2Png('SocketLibrary-classes.dia'),
+    env.Dia2Png('FhHierarchy.dia'),
+    env.Dia2Png('SocketPolicy.dia'),
+    env.Dia2Png('Protocols.dia'),
+    env.Dia2Png('Handle.dia'),
+])
+
+SENFSCons.InstallIncludeFiles(env, [ 'Socket.hh', 'all_includes.hh' ])