Fix SCons 1.2.0 build failure

[senf.git] / Socket / SConscript

diff --git a/Socket/SConscript b/Socket/SConscript
index aef098c..2e9bd62 100644 (file)
--- a/Socket/SConscript
+++ b/Socket/SConscript
@@ -1,26 +1,18 @@
 # -*- python -*-
 
 Import('env')
-import SENFSCons
-import glob
+import SENFSCons, glob
 
 ###########################################################################
 
-sources, testSources = SENFSCons.GlobSources()
+SConscript(glob.glob("*/SConscript"))
 
-SENFSCons.StandardTargets(env)
+SENFSCons.AllIncludesHH(env, exclude=['Socket.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, 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'),
@@ -28,4 +20,4 @@ SENFSCons.Doxygen(env, extra_sources = [
     env.Dia2Png('Protocols.dia'),
     env.Dia2Png('Handle.dia'),
 ])
-
+env.InstallSubdir('$INCLUDEINSTALLDIR', includes)