diff --git a/wscript b/wscript
index 068c3e4..7e11285 100644
--- a/wscript
+++ b/wscript
@@ -41,20 +41,44 @@
     bld(
         features='cxx',
         name='ndns-objects',
-        source=bld.path.ant_glob(['src/**/*.cpp'],
-                                 excl=['src/main.cpp']),
+#        source=bld.path.ant_glob(['src/**/*.cpp'], excl=['src/main.cpp']),
+        source=bld.path.ant_glob(['src/rr.cpp', 'src/query.cpp',
+                'src/response.cpp', 'src/zone.cpp', 'src/iterative-query.cpp',
+                'src/db/db-mgr.cpp','src/db/zone-mgr.cpp', 'src/db/rr-mgr.cpp',
+                'src/app/ndn-app.cpp', 'src/app/name-server.cpp',
+                'src/app/name-caching-resolver.cpp', 'src/app/name-dig.cpp',
+                ], 
+           excl=['src/main.cpp']),
         use='NDN_CXX BOOST',
         includes='src',
         export_includes='src',
     )
-
-    # bld(
-    #     features='cxx cxxprogram',
-    #     target='ndns',
-    #     source='src/main.cpp',
-    #     use='ndns-objects',
-    # )
-
+    
+    bld(
+      features='cxx cxxprogram',
+      source = "tools/name-server-daemon.cpp",
+      target = "name-server-daemon",
+      use = "ndns-objects"
+    )
+    
+    bld(
+      features='cxx cxxprogram',
+      source = "tools/caching-resolver-daemon.cpp",
+      target = "caching-resolver-daemon",
+      use = "ndns-objects"
+    )
+    
+    bld(
+      features='cxx cxxprogram',
+      source = "tools/dig.cpp",
+      target = "dig",
+      use = "ndns-objects"
+    )
+    
+    
+    
+    
+    
     bld.recurse('tests')
 
     # bld.install_files('${SYSCONFDIR}/ndn', 'ndns.conf.sample')