###########################################################################
-sources, includes = SENFSCons.Glob(env)
+sources, tests, includes = SENFSCons.Glob(env)
-SENFSCons.StandardTargets(env)
-SENFSCons.Object(env, target='80211Bundle', sources=sources)
-SENFSCons.Lib(env, sources=sources[0])
-SENFSCons.InstallIncludeFiles(env, includes)
+objects = env.Object(sources)
+cobject = env.CombinedObject('80211Bundle', objects)
+env.Append(ALLOBJECTS = objects)
+env.BoostUnitTest('test', tests + cobject)
+
+env.InstallSubdir('$INCLUDEINSTALLDIR', includes)
SConscript(glob.glob("*/SConscript"))