X-Git-Url: http://g0dil.de/git?a=blobdiff_plain;f=Socket%2FSConscript;h=67b1bdc2945a83e0affb9b7c4fb22e97ab728083;hb=10985d71f77b627bc4da543d7114feb7c4529329;hp=5887b53ad15d42b7ebf732cc7af9326ae810b192;hpb=344c0f9eb4ea24e789e4dbb5e1d55006d288c2b1;p=senf.git

diff --git a/Socket/SConscript b/Socket/SConscript
index 5887b53..67b1bdc 100644
--- a/Socket/SConscript
+++ b/Socket/SConscript
@@ -1,26 +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('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('SocketPolicy.dia'),
+    env.Dia2Png('Protocols.dia'),
     env.Dia2Png('Handle.dia'),
 ])
 
+SENFSCons.InstallIncludeFiles(env, [ 'Socket.hh', 'all_includes.hh' ])