Restructure SENFSCons.Object helper

[senf.git] / Packets / MPEGDVBBundle / SConscript

diff --git a/Packets/MPEGDVBBundle/SConscript b/Packets/MPEGDVBBundle/SConscript
index 5d94e25..dafcda7 100644 (file)
--- a/Packets/MPEGDVBBundle/SConscript
+++ b/Packets/MPEGDVBBundle/SConscript
@@ -5,13 +5,10 @@ import SENFSCons, glob
 
 ###########################################################################
 
-sources = SENFSCons.GlobSources()
+(sources, tests), includes = SENFSCons.Glob(env)
 
-SENFSCons.StandardTargets(env)
+SENFSCons.Object(env, target='MPEGDVBBundle', sources=sources,
+                 testSources = tests + [ 'MPEGDVBBundle.o' ])
+SENFSCons.Lib(env, sources)
 
-SENFSCons.Object(env, target = 'MPEGDVBBundle', sources=sources,
-                 LIBS = ['Packets', 'Socket', 'Utils'])
-SENFSCons.Lib(env, library = 'Packets_MPEGDVBBundle', sources = sources[0],
-              LIBS = ['Packets', 'Socket', 'Utils'])
-                 
-SENFSCons.Doxygen(env)
+env.InstallSubdir(target = '$INCLUDEINSTALLDIR', source = includes)