12 files changed, 37 insertions, 35 deletions

diff --git a/src/dht/Makefile.am b/src/dht/Makefile.am
index d6045112b..5a111433c 100644
--- a/src/dht/Makefile.am
+++ b/src/dht/Makefile.am
@@ -15,32 +15,32 @@ if USE_COVERAGE
 endif
 
 lib_LTLIBRARIES = \
- libgnunetdhtnew.la 
+ libgnunetdht.la 
 
 
-libgnunetdhtnew_la_SOURCES = \
-  dht_api_new.c dht_new.h 
-libgnunetdhtnew_la_LIBADD = \
+libgnunetdht_la_SOURCES = \
+  dht_api.c dht.h 
+libgnunetdht_la_LIBADD = \
   $(top_builddir)/src/util/libgnunetutil.la \
   $(XLIB)
-libgnunetdhtnew_la_LDFLAGS = \
+libgnunetdht_la_LDFLAGS = \
   $(GN_LIB_LDFLAGS) $(WINFLAGS) \
   -version-info 0:0:0
 
 bin_PROGRAMS = \
- gnunet-service-dht-new \
+ gnunet-service-dht \
  gnunet-dht-get \
  gnunet-dht-put
 
-gnunet_service_dht_new_SOURCES = \
- gnunet-service-dht-new.c gnunet-service-dht.h \
+gnunet_service_dht_SOURCES = \
+ gnunet-service-dht.c gnunet-service-dht.h \
  gnunet-service-dht_clients.c gnunet-service-dht_clients.h \
  gnunet-service-dht_datacache.c gnunet-service-dht_datacache.h \
  gnunet-service-dht_hello.c gnunet-service-dht_hello.h \
  gnunet-service-dht_nse.c gnunet-service-dht_nse.h \
  gnunet-service-dht_neighbours.c gnunet-service-dht_neighbours.h \
  gnunet-service-dht_routing.c gnunet-service-dht_routing.h 
-gnunet_service_dht_new_LDADD = \
+gnunet_service_dht_LDADD = \
   $(top_builddir)/src/statistics/libgnunetstatistics.la \
   $(top_builddir)/src/core/libgnunetcore.la \
   $(top_builddir)/src/nse/libgnunetnse.la \
@@ -55,7 +55,7 @@ gnunet_service_dht_new_LDADD = \
 gnunet_dht_get_SOURCES = \
  gnunet-dht-get.c         
 gnunet_dht_get_LDADD = \
-  $(top_builddir)/src/dht/libgnunetdhtnew.la \
+  $(top_builddir)/src/dht/libgnunetdht.la \
   $(top_builddir)/src/core/libgnunetcore.la \
   $(top_builddir)/src/util/libgnunetutil.la 
 gnunet_dht_get_DEPENDENCIES = \
@@ -64,7 +64,7 @@ gnunet_dht_get_DEPENDENCIES = \
 gnunet_dht_put_SOURCES = \
  gnunet-dht-put.c         
 gnunet_dht_put_LDADD = \
-  $(top_builddir)/src/dht/libgnunetdhtnew.la \
+  $(top_builddir)/src/dht/libgnunetdht.la \
   $(top_builddir)/src/core/libgnunetcore.la \
   $(top_builddir)/src/util/libgnunetutil.la 
 gnunet_dht_put_DEPENDENCIES = \
@@ -92,25 +92,16 @@ test_dht_api_SOURCES = \
 test_dht_api_LDADD = \
  $(top_builddir)/src/util/libgnunetutil.la \
  $(top_builddir)/src/hello/libgnunethello.la \
- $(top_builddir)/src/dht/libgnunetdhtnew.la
+ $(top_builddir)/src/dht/libgnunetdht.la
 test_dht_api_DEPENDENCIES = \
   libgnunetdht.la                           
 
-test_dht_multipeer_SOURCES = \
- test_dht_multipeer.c
-test_dht_multipeer_LDADD = \
- $(top_builddir)/src/util/libgnunetutil.la \
- $(top_builddir)/src/testing/libgnunettesting.la \
- $(top_builddir)/src/dht/libgnunetdht.la  
-test_dht_multipeer_DEPENDENCIES = \
-  libgnunetdht.la                           
-
 test_dht_twopeer_SOURCES = \
  test_dht_twopeer.c
 test_dht_twopeer_LDADD = \
  $(top_builddir)/src/util/libgnunetutil.la \
  $(top_builddir)/src/testing/libgnunettesting.la \
- $(top_builddir)/src/dht/libgnunetdhtnew.la    
+ $(top_builddir)/src/dht/libgnunetdht.la    
 test_dht_twopeer_DEPENDENCIES = \
   libgnunetdht.la                           
 
@@ -119,14 +110,14 @@ test_dht_twopeer_put_get_SOURCES = \
 test_dht_twopeer_put_get_LDADD = \
  $(top_builddir)/src/util/libgnunetutil.la \
  $(top_builddir)/src/testing/libgnunettesting.la \
- $(top_builddir)/src/dht/libgnunetdhtnew.la   
+ $(top_builddir)/src/dht/libgnunetdht.la   
 
 test_dht_twopeer_get_put_SOURCES = \
  test_dht_twopeer_get_put.c
 test_dht_twopeer_get_put_LDADD = \
  $(top_builddir)/src/util/libgnunetutil.la \
  $(top_builddir)/src/testing/libgnunettesting.la \
- $(top_builddir)/src/dht/libgnunetdhtnew.la   
+ $(top_builddir)/src/dht/libgnunetdht.la   
 
 test_dht_twopeer_path_tracking_SOURCES = \
  test_dht_twopeer_path_tracking.c
@@ -135,6 +126,17 @@ test_dht_twopeer_path_tracking_LDADD = \
  $(top_builddir)/src/testing/libgnunettesting.la \
  $(top_builddir)/src/dht/libgnunetdht.la   
 
+test_dht_multipeer_SOURCES = \
+ test_dht_multipeer.c
+test_dht_multipeer_LDADD = \
+ $(top_builddir)/src/util/libgnunetutil.la \
+ $(top_builddir)/src/testing/libgnunettesting.la \
+ $(top_builddir)/src/dht/libgnunetdht.la  
+test_dht_multipeer_DEPENDENCIES = \
+  libgnunetdht.la                           
+
+
+
 EXTRA_DIST = \
   $(check_SCRIPTS) \
   test_dht_api_data.conf \
diff --git a/src/dht/dht_new.h b/src/dht/dht.h
index c8e2baff1..c8e2baff1 100644
--- a/src/dht/dht_new.h
+++ b/src/dht/dht.h
diff --git a/src/dht/dht_api_new.c b/src/dht/dht_api.c
index 7d817acd7..2e89cf3eb 100644
--- a/src/dht/dht_api_new.c
+++ b/src/dht/dht_api.c
@@ -31,8 +31,8 @@
 #include "gnunet_arm_service.h"
 #include "gnunet_hello_lib.h"
 #include "gnunet_protocols.h"
-#include "gnunet_dht_service_new.h"
-#include "dht_new.h"
+#include "gnunet_dht_service.h"
+#include "dht.h"
 
 #define DEBUG_DHT_API GNUNET_NO
 
diff --git a/src/dht/gnunet-dht-get.c b/src/dht/gnunet-dht-get.c
index 0d291e5e7..8720e76aa 100644
--- a/src/dht/gnunet-dht-get.c
+++ b/src/dht/gnunet-dht-get.c
@@ -24,7 +24,7 @@
  * @author Nathan Evans
  */
 #include "platform.h"
-#include "gnunet_dht_service_new.h"
+#include "gnunet_dht_service.h"
 
 /**
  * The type of the query
diff --git a/src/dht/gnunet-dht-put.c b/src/dht/gnunet-dht-put.c
index 727eebe63..f165aa4a4 100644
--- a/src/dht/gnunet-dht-put.c
+++ b/src/dht/gnunet-dht-put.c
@@ -24,7 +24,7 @@
  * @author Nathan Evans
  */
 #include "platform.h"
-#include "gnunet_dht_service_new.h"
+#include "gnunet_dht_service.h"
 
 /**
  * The type of the query
diff --git a/src/dht/gnunet-service-dht-new.c b/src/dht/gnunet-service-dht.c
index e38fda7cf..3e0f3c8d9 100644
--- a/src/dht/gnunet-service-dht-new.c
+++ b/src/dht/gnunet-service-dht.c
@@ -29,7 +29,7 @@
 #include "gnunet_util_lib.h"
 #include "gnunet_transport_service.h"
 #include "gnunet_hello_lib.h"
-#include "gnunet_dht_service_new.h"
+#include "gnunet_dht_service.h"
 #include "gnunet_statistics_service.h"
 #include "gnunet-service-dht.h"
 #include "gnunet-service-dht_clients.h"
diff --git a/src/dht/gnunet-service-dht_clients.c b/src/dht/gnunet-service-dht_clients.c
index ebbde14b8..25687d570 100644
--- a/src/dht/gnunet-service-dht_clients.c
+++ b/src/dht/gnunet-service-dht_clients.c
@@ -32,7 +32,7 @@
 #include "gnunet-service-dht_clients.h"
 #include "gnunet-service-dht_datacache.h"
 #include "gnunet-service-dht_neighbours.h"
-#include "dht_new.h"
+#include "dht.h"
 
 
 /**
diff --git a/src/dht/gnunet-service-dht_neighbours.c b/src/dht/gnunet-service-dht_neighbours.c
index 80efd5d40..0622533f5 100644
--- a/src/dht/gnunet-service-dht_neighbours.c
+++ b/src/dht/gnunet-service-dht_neighbours.c
@@ -36,7 +36,7 @@
 #include "gnunet_datacache_lib.h"
 #include "gnunet_transport_service.h"
 #include "gnunet_hello_lib.h"
-#include "gnunet_dht_service_new.h"
+#include "gnunet_dht_service.h"
 #include "gnunet_statistics_service.h"
 #include "gnunet-service-dht.h"
 #include "gnunet-service-dht_clients.h"
diff --git a/src/dht/test_dht_api.c b/src/dht/test_dht_api.c
index c56fab27c..87e08d840 100644
--- a/src/dht/test_dht_api.c
+++ b/src/dht/test_dht_api.c
@@ -31,7 +31,7 @@
 #include "gnunet_os_lib.h"
 #include "gnunet_program_lib.h"
 #include "gnunet_scheduler_lib.h"
-#include "gnunet_dht_service_new.h"
+#include "gnunet_dht_service.h"
 #include "gnunet_hello_lib.h"
 
 #define VERBOSE GNUNET_NO
diff --git a/src/dht/test_dht_twopeer.c b/src/dht/test_dht_twopeer.c
index 3331eb011..21e817c85 100644
--- a/src/dht/test_dht_twopeer.c
+++ b/src/dht/test_dht_twopeer.c
@@ -25,7 +25,7 @@
 #include "platform.h"
 #include "gnunet_testing_lib.h"
 #include "gnunet_core_service.h"
-#include "gnunet_dht_service_new.h"
+#include "gnunet_dht_service.h"
 
 /* DEFINES */
 #define VERBOSE GNUNET_NO
diff --git a/src/dht/test_dht_twopeer_get_put.c b/src/dht/test_dht_twopeer_get_put.c
index 100f964cf..86ce546cc 100644
--- a/src/dht/test_dht_twopeer_get_put.c
+++ b/src/dht/test_dht_twopeer_get_put.c
@@ -39,7 +39,7 @@
 #include "platform.h"
 #include "gnunet_testing_lib.h"
 #include "gnunet_core_service.h"
-#include "gnunet_dht_service_new.h"
+#include "gnunet_dht_service.h"
 #include "block_dns.h"
 #include "gnunet_signatures.h"
 
diff --git a/src/dht/test_dht_twopeer_put_get.c b/src/dht/test_dht_twopeer_put_get.c
index ccb421cae..197a05006 100644
--- a/src/dht/test_dht_twopeer_put_get.c
+++ b/src/dht/test_dht_twopeer_put_get.c
@@ -39,7 +39,7 @@
 #include "platform.h"
 #include "gnunet_testing_lib.h"
 #include "gnunet_core_service.h"
-#include "gnunet_dht_service_new.h"
+#include "gnunet_dht_service.h"
 #include "block_dns.h"
 #include "gnunet_signatures.h"