Completely refactor install targets

[senf.git] / Packets / DefaultBundle / SConscript

diff --git a/Packets/DefaultBundle/SConscript b/Packets/DefaultBundle/SConscript
index ca95750..1f70312 100644 (file)
--- a/Packets/DefaultBundle/SConscript
+++ b/Packets/DefaultBundle/SConscript
@@ -5,18 +5,10 @@ import SENFSCons, glob
 
 ###########################################################################
 
-sources = SENFSCons.GlobSources()
-
+sources, includes = SENFSCons.Glob(env)
 SENFSCons.StandardTargets(env)
+SENFSCons.Object(env, target='DefaultBundle', sources=sources)
+SENFSCons.Lib(env, sources[0])
+SENFSCons.InstallIncludeFiles(env, includes)
 
-SENFSCons.Object(env, 
-    target = 'DefaultBundle', 
-    sources=sources,
-    LIBS = ['Packets', 'Socket', 'Utils'])
-
-SENFSCons.Lib(env, 
-    library = 'Packets_DefaultBundle',
-    sources = sources[0],
-    no_includes = 1)
-                 
 SConscript(glob.glob("*/SConscript"))