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

diff --git a/Socket/SConscript b/Socket/SConscript
index 72af964..67b1bdc 100644
--- a/Socket/SConscript
+++ b/Socket/SConscript
@@ -1,18 +1,34 @@
 # -*- python -*-
 
 Import('env')
-import SatSCons
+import SENFSCons, glob
 
 ###########################################################################
 
-sources = SatSCons.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') ])
 
-SatSCons.StandardTargets(env)
+sources, testSources = SENFSCons.GlobSources()
 
-SatSCons.Lib(env,
-             library = 'Socket',
-             sources = sources,
-             LIBS = [ 'Utils' ])
+SENFSCons.StandardTargets(env)
 
-SatSCons.Doxygen(env,sources,SatSCons.DoxyGlob(),
-                 image=[ 'SocketLibrary-classes.dia' ])
+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 = [ 'Scheduler', 'Utils' ])
+
+SENFSCons.Doxygen(env, extra_sources = [
+    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' ])