X-Git-Url: http://g0dil.de/git?a=blobdiff_plain;f=senf%2FPackets%2FSConscript;h=da9f02303a1e41ff2e62359d5f6a8e5599ab0006;hb=ccff925ac3c102822a38617d00aef1bcf5217706;hp=59ff51bab5042844bada4e6432a526d119b96b0d;hpb=d81ca89c2202ca6b9b9c5cc5e6e28e57452953c7;p=senf.git

diff --git a/senf/Packets/SConscript b/senf/Packets/SConscript
index 59ff51b..da9f023 100644
--- a/senf/Packets/SConscript
+++ b/senf/Packets/SConscript
@@ -5,6 +5,8 @@ import SENFSCons
 
 ###########################################################################
 
+env['PACKET_BUNDLES'] = []
+
 SENFSCons.AutoRules(env, doc_extra_sources = [
     env.Dia2Png("structure.dia"),
     env.Dia2Png("80221Bundle/TLV.dia"),
@@ -18,14 +20,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"),
@@ -54,5 +56,9 @@ SENFSCons.AutoRules(env, doc_extra_sources = [
     env.PkgDraw("MPEGDVBBundle/SNDUPacket.hh"),
     env.PkgDraw("MPEGDVBBundle/TransportPacket.hh"),
 ])
-env.Default(env.CombinedObject('${LOCALLIBDIR}/${NAME}${OBJADDSUFFIX}', env['PACKET_BUNDLES'],
-                               NAME="AllBundles"))
+
+cobject = env.CombinedObject('${LOCALLIBDIR}/${NAME}${OBJADDSUFFIX}', env['PACKET_BUNDLES'],
+                              NAME="AllBundles")
+env.Default(cobject)
+env.Install('${OBJINSTALLDIR}', cobject)
+