move global routing code into global routing directory

src/internet-stack/wscript

@@ -82,7 +82,6 @@ def build(bld):
         'ipv4-l3-protocol.cc',
         'ipv4-static-routing-impl.cc',
         'ipv4-list-routing-impl.cc',
-        'ipv4-global-routing.cc',
         'ipv4-end-point.cc',
         'udp-l4-protocol.cc',
         'tcp-l4-protocol.cc',
@@ -110,7 +109,6 @@ def build(bld):
         'udp-header.h',
         'tcp-header.h',
         'sequence-number.h',
-        'ipv4-global-routing.h',
         'ipv4-list-routing-impl.h',
         'ipv4-static-routing-impl.h',
         'icmpv4.h',

src/routing/global-routing/global-route-manager-impl.cc

@@ -30,12 +30,12 @@
 #include "ns3/log.h"
 #include "ns3/node-list.h"
 #include "ns3/ipv4.h"
-#include "ns3/ipv4-global-routing.h"
 #include "ns3/ipv4-routing-protocol.h"
 #include "ns3/ipv4-list-routing.h"
 #include "global-router-interface.h"
 #include "global-route-manager-impl.h"
 #include "candidate-queue.h"
+#include "ipv4-global-routing.h"
 
 NS_LOG_COMPONENT_DEFINE ("GlobalRouteManager");
 

src/routing/global-routing/wscript

@@ -7,6 +7,7 @@ def build(bld):
         'global-route-manager.cc',
         'global-route-manager-impl.cc',
         'candidate-queue.cc',
+        'ipv4-global-routing.cc',
         ]
     headers = bld.new_task_gen('ns3header')
     headers.module = 'global-routing'