From: g0dil Date: Mon, 24 Aug 2009 07:28:31 +0000 (+0000) Subject: Add AllBundles.o X-Git-Url: http://g0dil.de/git?a=commitdiff_plain;h=fe92b49375aef6629f7bea55b85454f173524d9a;p=senf.git Add AllBundles.o git-svn-id: https://svn.berlios.de/svnroot/repos/senf/trunk@1330 270642c3-0616-0410-b53a-bc976706d245 --- diff --git a/Examples/MCSniffer/SConscript b/Examples/MCSniffer/SConscript index d3d9875..b74eaf0 100644 --- a/Examples/MCSniffer/SConscript +++ b/Examples/MCSniffer/SConscript @@ -7,4 +7,4 @@ import SENFSCons sources, tests, includes = SENFSCons.Glob(env) -env.Program('mcsniffer', sources + env['PACKET_BUNDLES']) +env.Program('mcsniffer', sources + [ '${LOCALLIBDIR}/AllBundles.o' ]) diff --git a/Examples/Sniffer/SConscript b/Examples/Sniffer/SConscript index 44150eb..f894589 100644 --- a/Examples/Sniffer/SConscript +++ b/Examples/Sniffer/SConscript @@ -7,5 +7,5 @@ import SENFSCons sources, tests, includes = SENFSCons.Glob(env) -env.Program('sniffer', sources + env['PACKET_BUNDLES']) +env.Program('sniffer', sources + [ '${LOCALLIBDIR}/AllBundles.o' ]) SENFSCons.Doxygen(env) diff --git a/senf/Packets/SConscript b/senf/Packets/SConscript index 290af21..25d5c94 100644 --- a/senf/Packets/SConscript +++ b/senf/Packets/SConscript @@ -54,4 +54,5 @@ SENFSCons.AutoRules(env, doc_extra_sources = [ env.PkgDraw("MPEGDVBBundle/SNDUPacket.hh"), env.PkgDraw("MPEGDVBBundle/TransportPacket.hh"), ]) - +env.Default(env.CombinedObject('${LOCALLIBDIR}/${NAME}', env['PACKET_BUNDLES'], + NAME="AllBundles"))