Combine all boot build stuff in a single scons tool

[senf.git] / Packets / DefaultBundle / SConscript

diff --git a/Packets/DefaultBundle/SConscript b/Packets/DefaultBundle/SConscript
index bfafdac..037cafc 100644 (file)
--- a/Packets/DefaultBundle/SConscript
+++ b/Packets/DefaultBundle/SConscript
@@ -5,12 +5,13 @@ import SENFSCons, glob
 
 ###########################################################################
 
-(sources, tests), includes = SENFSCons.Glob(env)
+sources, tests, includes = SENFSCons.Glob(env)
 
-SENFSCons.Object(env, target='DefaultBundle', sources=sources, 
-                 testSources=tests + [ 'DefaultBundle.o' ])
-SENFSCons.Lib(env, sources)
+objects = env.Object(sources)
+cobject = env.CombinedObject('DefaultBundle', objects)
+env.Append(ALLOBJECTS = objects)
+env.BoostUnitTest('test', tests + cobject)
 
-env.InstallSubdir(target = '$INCLUDEINSTALLDIR', source = includes)
+env.InstallSubdir('$INCLUDEINSTALLDIR', includes)
 
 SConscript(glob.glob("*/SConscript"))