Fix SCons 1.2.0 build failure

[senf.git] / Socket / SConscript

diff --git a/Socket/SConscript b/Socket/SConscript
index 5887b53..2e9bd62 100644 (file)
--- a/Socket/SConscript
+++ b/Socket/SConscript
@@ -1,26 +1,23 @@
 # -*- python -*-
 
 Import('env')
-import SENFSCons
+import SENFSCons, glob
 
 ###########################################################################
 
-sources = SENFSCons.GlobSources()
+SConscript(glob.glob("*/SConscript"))
 
-SENFSCons.StandardTargets(env)
+SENFSCons.AllIncludesHH(env, exclude=['Socket.hh'])
 
-SENFSCons.Lib(env,
-             library = 'Socket',
-             sources = sources,
-             LIBS = [ 'Utils' ])
+sources, tests, includes = SENFSCons.Glob(env)
 
+env.Append(ALLOBJECTS = env.Object(sources))
+env.BoostUnitTest('test', tests)
 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'),
 ])
-
+env.InstallSubdir('$INCLUDEINSTALLDIR', includes)