Completely refactor install targets

[senf.git] / Socket / Protocols / SConscript

diff --git a/Socket/Protocols/SConscript b/Socket/Protocols/SConscript
index e0e2d49..6e76b25 100644 (file)
--- a/Socket/Protocols/SConscript
+++ b/Socket/Protocols/SConscript
@@ -5,15 +5,10 @@ import SENFSCons, glob
 
 ###########################################################################
 
-SENFSCons.StandardTargets(env)
-
-sources = SENFSCons.GlobSources()
-objects = SENFSCons.Objects( env, sources = sources, LIBS = [ 'Socket', 'Scheduler', 'Utils' ] )
+SConscript(glob.glob("*/SConscript"))
 
-for sc in glob.glob("*/SConscript"):
-    ob = SConscript(sc)
-    if ob : objects.extend(ob)
-
-SENFSCons.InstallIncludeFiles(env, [ 'INet.hh', 'Raw.hh', 'DVB.hh', 'UN.hh' ])
+SENFSCons.StandardTargets(env)
 
-Return('objects')
+sources, includes = SENFSCons.Glob(env)
+SENFSCons.Lib(env, sources)
+SENFSCons.InstallIncludeFiles(env, includes)