Restructure SENFSCons.Object helper

[senf.git] / Packets / DefaultBundle / SConscript

diff --git a/Packets/DefaultBundle/SConscript b/Packets/DefaultBundle/SConscript
index 310d9c8..bfafdac 100644 (file)
--- a/Packets/DefaultBundle/SConscript
+++ b/Packets/DefaultBundle/SConscript
@@ -5,20 +5,12 @@ import SENFSCons, glob
 
 ###########################################################################
 
-sources = SENFSCons.GlobSources()
+(sources, tests), includes = SENFSCons.Glob(env)
 
-SENFSCons.StandardTargets(env)
+SENFSCons.Object(env, target='DefaultBundle', sources=sources, 
+                 testSources=tests + [ 'DefaultBundle.o' ])
+SENFSCons.Lib(env, sources)
 
-SENFSCons.Object(env, 
-    target = 'DefaultBundle', 
-    sources=sources,
-    LIBS = ['Packets', 'Socket', 'Utils'])
+env.InstallSubdir(target = '$INCLUDEINSTALLDIR', source = includes)
 
-SENFSCons.Lib(env, 
-    library = 'Packets_DefaultBundle',
-    sources = sources[0],
-    no_includes = 1)
-                 
 SConscript(glob.glob("*/SConscript"))
-
-SENFSCons.Doxygen(env)