Fix SCons 1.2.0 build failure

[senf.git] / Socket / SConscript

diff --git a/Socket/SConscript b/Socket/SConscript
index 5206292..2e9bd62 100644 (file)
--- a/Socket/SConscript
+++ b/Socket/SConscript
@@ -7,12 +7,12 @@ import SENFSCons, glob
 
 SConscript(glob.glob("*/SConscript"))
 
-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') ])
+SENFSCons.AllIncludesHH(env, exclude=['Socket.hh'])
 
-sources, includes = SENFSCons.Glob(env)
+sources, tests, includes = SENFSCons.Glob(env)
 
-SENFSCons.Lib(env, sources = sources)
+env.Append(ALLOBJECTS = env.Object(sources))
+env.BoostUnitTest('test', tests)
 SENFSCons.Doxygen(env, extra_sources = [
     env.Dia2Png('SocketLibrary-classes.dia'),
     env.Dia2Png('FhHierarchy.dia'),
@@ -20,5 +20,4 @@ SENFSCons.Doxygen(env, extra_sources = [
     env.Dia2Png('Protocols.dia'),
     env.Dia2Png('Handle.dia'),
 ])
-
-env.InstallSubdir(target = '$INCLUDEINSTALLDIR', source = includes)
+env.InstallSubdir('$INCLUDEINSTALLDIR', includes)