commit f08a7376e9cfa6448b4637662d14631b4b79a4d5
author Alexander Afanasyev <alexander.afanasyev@ucla.edu> Mon Feb 09 21:28:19 2015 -0800
committer Alexander Afanasyev <alexander.afanasyev@ucla.edu> Sun Feb 15 12:43:49 2015 -0800
tree bdd27612aa1f0c8b85d8b666efac3a8534539e8b
parent 63df436e5f165605a5aebcace9012551470da5d0

daemon+rib: Merge nrd and nfd into a single process (separate threads)

Change-Id: I41952d5b8ee29f109130c570e0d13ccad6970d2f
Refs: #2489

wscript

diff --git a/wscript b/wscript
index 955266b..01d69a7 100644
--- a/wscript
+++ b/wscript
@@ -208,25 +208,18 @@
     if bld.env['HAVE_WEBSOCKET']:
         nfd_objects.source += bld.path.ant_glob('daemon/face/websocket-*.cpp')
 
-    bld(target='bin/nfd',
-        features='cxx cxxprogram',
-        source='daemon/main.cpp',
-        use='daemon-objects',
-        )
-
     rib_objects = bld(
         target='rib-objects',
         name='rib-objects',
         features='cxx',
-        source=bld.path.ant_glob(['rib/**/*.cpp'],
-                                 excl=['rib/main.cpp']),
+        source=bld.path.ant_glob(['rib/**/*.cpp']),
         use='core-objects',
         )
 
-    bld(target='bin/nrd',
+    bld(target='bin/nfd',
         features='cxx cxxprogram',
-        source='rib/main.cpp',
-        use='rib-objects',
+        source='daemon/main.cpp',
+        use='daemon-objects rib-objects',
         )
 
     bld.recurse("tools")