X-Git-Url: http://g0dil.de/git?a=blobdiff_plain;f=senf%2FPackets%2FSConscript;h=6aa3680eee40c0a2dc37472f1f8f5e54dc54c637;hb=78a6e233083efa63a9cd0684a92abc64202a9ee7;hp=954e5f974ceb3ab28462c3dd54a297dab59b5d0e;hpb=954a692a42eecf2c8750e7009aa80bcfb41bbfef;p=senf.git

diff --git a/senf/Packets/SConscript b/senf/Packets/SConscript
index 954e5f9..6aa3680 100644
--- a/senf/Packets/SConscript
+++ b/senf/Packets/SConscript
@@ -5,9 +5,10 @@ import SENFSCons
 
 ###########################################################################
 
-SENFSCons.AutoRules(env, doc_extra_sources = [
+SENFSCons.AutoRules(env, exclude = [ 'bundledump.cc' ], doc_extra_sources = [
     env.Dia2Png("structure.dia"),
     env.Dia2Png("80221Bundle/TLV.dia"),
+    env.Dia2Png("GenericTLV.dia"),
     env.PkgDraw("MPEGDVBBundle/DTCPPacket.hh"),
     env.PkgDraw("DefaultBundle/EthernetPacket.hh",
                 PKGDRAWPACKETS = "EthernetPacketParser"),
@@ -18,14 +19,14 @@ SENFSCons.AutoRules(env, doc_extra_sources = [
     env.PkgDraw("DefaultBundle/LlcSnapPacket.hh"),
     env.PkgDraw("DefaultBundle/UDPPacket.hh"),
     env.PkgDraw("DefaultBundle/TCPPacket.hh"),
-    env.PkgDraw("DefaultBundle/IPv6Extensions_Fragment.png", "DefaultBundle/IPv6Extensions.hh",
-                PKGDRAWPACKETS = "IPv6PacketParserExtension_Fragment"),
-    env.PkgDraw("DefaultBundle/IPv6Extensions_Routing.png", "DefaultBundle/IPv6Extensions.hh",
-                PKGDRAWPACKETS = "IPv6PacketParserExtension_Routing"),
-    env.PkgDraw("DefaultBundle/IPv6Extensions_HopByHop.png", "DefaultBundle/IPv6Extensions.hh",
-                PKGDRAWPACKETS = "IPv6PacketParserExtension_HopByHop"),
-    env.PkgDraw("DefaultBundle/IPv6Extensions_Destination.png", "DefaultBundle/IPv6Extensions.hh",
-                PKGDRAWPACKETS = "IPv6PacketParserExtension_Destination"),
+    env.PkgDraw("DefaultBundle/IPv6FragmentPacket.png", "DefaultBundle/IPv6Extensions.hh",
+                PKGDRAWPACKETS = "IPv6FragmentPacketParser"),
+    env.PkgDraw("DefaultBundle/IPv6RoutingPacket.png", "DefaultBundle/IPv6Extensions.hh",
+                PKGDRAWPACKETS = "IPv6RoutingPacketParser"),
+    env.PkgDraw("DefaultBundle/IPv6HopByHopOptionsPacket.png", "DefaultBundle/IPv6Extensions.hh",
+                PKGDRAWPACKETS = "IPv6HopByHopOptionsPacketParser"),
+    env.PkgDraw("DefaultBundle/IPv6DestinationOptionsPacket.png", "DefaultBundle/IPv6Extensions.hh",
+                PKGDRAWPACKETS = "IPv6DestinationOptionsPacketParser"),
     env.PkgDraw("DefaultBundle/ICMPv6Packet.hh"),
     env.PkgDraw("DefaultBundle/ICMPv6EchoRequest.png", "DefaultBundle/ICMPv6TypePacket.hh",
                 PKGDRAWPACKETS = "ICMPv6EchoRequestParser"),
@@ -55,8 +56,7 @@ SENFSCons.AutoRules(env, doc_extra_sources = [
     env.PkgDraw("MPEGDVBBundle/TransportPacket.hh"),
 ])
 
-cobject = env.CombinedObject('${LOCALLIBDIR}/${NAME}${OBJADDSUFFIX}', env['PACKET_BUNDLES'],
-                              NAME="AllBundles")
-env.Default(cobject)
-env.Install('${OBJINSTALLDIR}', cobject)
-        
+bundledump = env.Program('bundledump', [ 'bundledump.cc', '$LOCALLIBDIR/DefaultBundle.o' ],
+                         LIBS = [ '$LIBS', 'dl' ])
+env.Default(bundledump)
+env.Install('$BININSTALLDIR', bundledump)