Remove SENFSCons.StandardTargets and SENFSCons.GlobalTargets

[senf.git] / Socket / SConscript

diff --git a/Socket/SConscript b/Socket/SConscript
index 41dd658..0e7b440 100644 (file)
--- a/Socket/SConscript
+++ b/Socket/SConscript
@@ -1,33 +1,23 @@
 # -*- python -*-
 
 Import('env')
-import SENFSCons
-import glob
+import SENFSCons, glob
 
 ###########################################################################
 
-sources, testSources = SENFSCons.GlobSources()
+SConscript(glob.glob("*/SConscript"))
 
-SENFSCons.StandardTargets(env)
+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') ])
 
-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' ])
+sources, includes = SENFSCons.Glob(env)
 
+SENFSCons.Lib(env, sources = sources)
 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, includes)