--- a/SConstruct	Fri Jul 06 14:19:40 2007 -0700
+++ b/SConstruct	Fri Jul 06 14:39:59 2007 -0700
@@ -190,6 +190,8 @@
     'chunk.cc',
     'header.cc',
     'trailer.cc',
+    'packet-printer.cc',
+    'packet-metadata.cc',
     'packet.cc',
     'tags.cc',
     'pcap-writer.cc',
@@ -211,6 +213,8 @@
     'trailer.h',
     'tags.h',
     'packet.h',
+    'packet-printer.h',
+    'packet-metadata.h',
     'uv-trace-source.h',
     'sv-trace-source.h',
     'fv-trace-source.h',
@@ -306,8 +310,6 @@
     'udp-impl.cc',
 ])
 inode.add_headers ([
-    'ipv4-header.h',
-    'udp-header.h',
     'ipv4-checksum.h',
     'arp-header.h',
     'arp-cache.h',
@@ -337,6 +339,8 @@
     'internet-node.h',
     'ascii-trace.h',
     'pcap-trace.h',
+    'ipv4-header.h',
+    'udp-header.h',
 ])
 
 
@@ -370,9 +374,9 @@
 bench_object.add_source('bench-object.cc')
 
 bench_packets = build.Ns3Module('bench-packets', 'utils')
-#ns3.add(bench_packets)
+ns3.add(bench_packets)
 bench_packets.set_executable()
-bench_packets.add_dep('core')
+bench_packets.add_deps (['core', 'common'])
 bench_packets.add_source('bench-packets.cc')
 
 bench_simu = build.Ns3Module('bench-simulator', 'utils')
@@ -396,6 +400,13 @@
 sample_debug.add_source('main-debug.cc')
 sample_debug.add_source('main-debug-other.cc')
 
+sample_packet_printer = build.Ns3Module('sample-packet-printer', 'samples')
+sample_packet_printer.set_executable()
+ns3.add(sample_packet_printer)
+sample_packet_printer.add_deps (['common', 'internet-node'])
+sample_packet_printer.add_source('main-packet-printer.cc')
+
+
 sample_callback = build.Ns3Module('sample-callback', 'samples')
 sample_callback.set_executable()
 ns3.add(sample_callback)