Combine all boot build stuff in a single scons tool

[senf.git] / Packets / 80221Bundle / SConscript

diff --git a/Packets/80221Bundle/SConscript b/Packets/80221Bundle/SConscript
index 0cbf20a..121b491 100644 (file)
--- a/Packets/80221Bundle/SConscript
+++ b/Packets/80221Bundle/SConscript
@@ -5,10 +5,13 @@ import SENFSCons, glob
 
 ###########################################################################
 
-(sources, tests), includes = SENFSCons.Glob(env)
+sources, tests, includes = SENFSCons.Glob(env)
 
-SENFSCons.Object(env, target = '80221Bundle', sources=sources,
-                 testSources = tests + [ '80221Bundle.o' ])
-SENFSCons.Lib(env, sources)
+objects = env.Object(sources)
+env.Install('$OBJINSTALLDIR', env.Default( env.CombinedObject('80221Bundle', objects) ))
+env.Append(ALLOBJECTS = objects)
+env.BoostUnitTest('test', tests + ['80221Bundle.o'])
+
+env.InstallSubdir('$INCLUDEINSTALLDIR', includes)
 
 SConscript(glob.glob("*/SConscript"))