X-Git-Url: http://g0dil.de/git?a=blobdiff_plain;f=Socket%2FSConscript;h=41dd658bbc19de3e82cbcff01b97224ebb4cd234;hb=fa696fb7164ff243f6b7c1c5bda35ed75af153dc;hp=72af964270a45f01751f0e6f09f620af58c6dfed;hpb=558583531d5042ece06b19fcd10132d2d1bc5ad0;p=senf.git

diff --git a/Socket/SConscript b/Socket/SConscript
index 72af964..41dd658 100644
--- a/Socket/SConscript
+++ b/Socket/SConscript
@@ -1,18 +1,33 @@
 # -*- python -*-
 
 Import('env')
-import SatSCons
+import SENFSCons
+import glob
 
 ###########################################################################
 
-sources = SatSCons.GlobSources()
+sources, testSources = SENFSCons.GlobSources()
 
-SatSCons.StandardTargets(env)
+SENFSCons.StandardTargets(env)
 
-SatSCons.Lib(env,
-             library = 'Socket',
-             sources = sources,
-             LIBS = [ 'Utils' ])
+subob = []
+for sc in glob.glob("*/SConscript"):
+    ob = SConscript(sc)
+    if ob : subob.extend(ob)
+
+SENFSCons.Lib(env,
+              library = 'Socket',
+              sources = sources + subob,
+              testSources = testSources,
+              LIBS = [ 'Utils' ])
+
+SENFSCons.Doxygen(env, extra_sources = [
+    env.Dia2Png('SocketLibrary-classes.dia'),
+    env.Dia2Png('FhHierarchy.dia'),
+    env.Command('doc/html/SocketPolicy.png', env.Dia2Png('SocketPolicy.dia'),
+                Copy('$TARGET','$SOURCE')),
+    env.Command('doc/html/Protocols.png', env.Dia2Png('Protocols.dia'),
+                Copy('$TARGET','$SOURCE')),
+    env.Dia2Png('Handle.dia'),
+])
 
-SatSCons.Doxygen(env,sources,SatSCons.DoxyGlob(),
-                 image=[ 'SocketLibrary-classes.dia' ])