Merge with code.nsnam.org

2009-09-14 10:19:55 +04:00
parent adad3f4b9f 55a729aca7
commit f57933cd7d
39 changed files with 16686 additions and 21 deletions
--- a/src/wscript
+++ b/src/wscript
@@ -41,6 +41,8 @@ all_modules = (
    'devices/mesh/flame',
    'applications/ping6',
    'applications/radvd',
+    'test/ns3tcp',
+    'test/ns3wifi',
    )

 def set_options(opt):
@@ -61,7 +63,6 @@ def configure(conf):
    conf.sub_config('core')
    conf.sub_config('simulator')
    conf.sub_config('devices/emu')
-    conf.sub_config('devices/wifi')
    conf.sub_config('devices/tap-bridge')
    conf.sub_config('contrib')
    conf.sub_config('internet-stack')