X-Git-Url: http://g0dil.de/git?a=blobdiff_plain;f=senf%2FPackets%2FSConscript;h=b6a6376813337497d4e951ecccbc6bd9b0a8d540;hb=52ceda9d4019d45ef0d1a941d517b4ffeafe547b;hp=68ea6cbae17371898a173eb6d9f07c4914184325;hpb=737789818bf8658d3b3f4444a273b2d44021e51a;p=senf.git

diff --git a/senf/Packets/SConscript b/senf/Packets/SConscript
index 68ea6cb..b6a6376 100644
--- a/senf/Packets/SConscript
+++ b/senf/Packets/SConscript
@@ -5,11 +5,10 @@ import SENFSCons
 
 ###########################################################################
 
-env['PACKET_BUNDLES'] = []
-
-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"),
@@ -20,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"),
@@ -57,8 +56,5 @@ 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)
-        
+env.Default(env.Program('bundledump', [ 'bundledump.cc', '$LOCALLIBDIR/DefaultBundle.o' ],
+                        LIBS = [ '$LIBS', 'dl' ]))