From 3e8ccda80ec67447d9a435f3400e7bb26132179c Mon Sep 17 00:00:00 2001 From: Tommaso Pecorella Date: Fri, 23 Jan 2015 08:09:53 +0100 Subject: [PATCH] Cleanup aodv test dependency on mesh module --- src/aodv/test/aodv-regression.cc | 1 - src/aodv/test/bug-772.cc | 1 - src/aodv/wscript | 4 ++-- 3 files changed, 2 insertions(+), 4 deletions(-) diff --git a/src/aodv/test/aodv-regression.cc b/src/aodv/test/aodv-regression.cc index 35632650d..0d53611cc 100644 --- a/src/aodv/test/aodv-regression.cc +++ b/src/aodv/test/aodv-regression.cc @@ -22,7 +22,6 @@ #include "bug-772.h" #include "loopback.h" -#include "ns3/mesh-helper.h" #include "ns3/simulator.h" #include "ns3/mobility-helper.h" #include "ns3/double.h" diff --git a/src/aodv/test/bug-772.cc b/src/aodv/test/bug-772.cc index ff0d3768f..ed112bc29 100644 --- a/src/aodv/test/bug-772.cc +++ b/src/aodv/test/bug-772.cc @@ -20,7 +20,6 @@ #include "bug-772.h" -#include "ns3/mesh-helper.h" #include "ns3/simulator.h" #include "ns3/random-variable-stream.h" #include "ns3/rng-seed-manager.h" diff --git a/src/aodv/wscript b/src/aodv/wscript index 90dfe9bde..90b0e1553 100644 --- a/src/aodv/wscript +++ b/src/aodv/wscript @@ -1,7 +1,7 @@ ## -*- Mode: python; py-indent-offset: 4; indent-tabs-mode: nil; coding: utf-8; -*- def build(bld): - module = bld.create_ns3_module('aodv', ['internet', 'wifi', 'applications', 'mesh']) + module = bld.create_ns3_module('aodv', ['internet', 'wifi', 'applications']) module.includes = '.' module.source = [ 'model/aodv-id-cache.cc', @@ -11,7 +11,7 @@ def build(bld): 'model/aodv-packet.cc', 'model/aodv-neighbor.cc', 'model/aodv-routing-protocol.cc', - 'helper/aodv-helper.cc', + 'helper/aodv-helper.cc', ] aodv_test = bld.create_ns3_module_test_library('aodv')