Restructure SENFSCons.Object helper

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

diff --git a/Packets/80221Bundle/SConscript b/Packets/80221Bundle/SConscript
index b2ec091..0cbf20a 100644 (file)
--- a/Packets/80221Bundle/SConscript
+++ b/Packets/80221Bundle/SConscript
@@ -5,18 +5,10 @@ import SENFSCons, glob
 
 ###########################################################################
 
-sources = SENFSCons.GlobSources()
+(sources, tests), includes = SENFSCons.Glob(env)
 
-SENFSCons.StandardTargets(env)
+SENFSCons.Object(env, target = '80221Bundle', sources=sources,
+                 testSources = tests + [ '80221Bundle.o' ])
+SENFSCons.Lib(env, sources)
 
-SENFSCons.Object(env, 
-    target = '80221Bundle', 
-    sources=sources,
-    LIBS = ['Packets', 'Socket', 'Utils'])
-
-SENFSCons.Lib(env, 
-    library = 'Packets_80221Bundle',
-    sources = sources[0],
-    no_includes = 1)
-                 
 SConscript(glob.glob("*/SConscript"))