naming

[oweals/gnunet.git] / src / dht / Makefile.am

diff --git a/src/dht/Makefile.am b/src/dht/Makefile.am
index 9f04943e5239374b3a6604dc02ca3982dfcc8db0..a88611fb3faa107e35e1b013f264d5ee66cf2c39 100644 (file)
--- a/src/dht/Makefile.am
+++ b/src/dht/Makefile.am
@@ -5,10 +5,6 @@ endif
 
 plugindir = $(libdir)/gnunet
 
-if HAVE_MYSQL
- MYSQL_PLUGIN = libgnunet_plugin_dhtlog_mysql.la
-endif
-
 if HAVE_ZLIB
  ZLIB_LNK = -lz
 endif
@@ -19,62 +15,11 @@ if USE_COVERAGE
 endif
 
 lib_LTLIBRARIES = \
- libgnunetdht.la \
- libgnunetdhtnew.la \
- libgnunetdhtlog.la
-
-plugin_LTLIBRARIES = \
- $(MYSQL_PLUGIN) \
- libgnunet_plugin_dhtlog_dummy.la \
- libgnunet_plugin_dhtlog_mysql_dump.la \
- libgnunet_plugin_dhtlog_mysql_dump_load.la  
-
-
-libgnunet_plugin_dhtlog_mysql_la_SOURCES = \
-  plugin_dhtlog_mysql.c
-libgnunet_plugin_dhtlog_mysql_la_LIBADD = \
-  $(top_builddir)/src/util/libgnunetutil.la $(XLIBS) -lz -lsqlite3
-libgnunet_plugin_dhtlog_mysql_la_LDFLAGS = \
- $(GN_PLUGIN_LDFLAGS) $(MYSQL_LDFLAGS) -lmysqlclient
-libgnunet_plugin_dhtlog_mysql_la_CPFLAGS = \
- $(MYSQL_CPPFLAGS)
-
-libgnunet_plugin_dhtlog_dummy_la_SOURCES = \
-  plugin_dhtlog_dummy.c
-libgnunet_plugin_dhtlog_dummy_la_LIBADD = \
-  $(top_builddir)/src/util/libgnunetutil.la \
-  $(XLIB)
-libgnunet_plugin_dhtlog_dummy_la_LDFLAGS = \
- $(GN_PLUGIN_LDFLAGS)
-
-libgnunet_plugin_dhtlog_mysql_dump_la_SOURCES = \
-  plugin_dhtlog_mysql_dump.c
-libgnunet_plugin_dhtlog_mysql_dump_la_LIBADD = \
-  $(top_builddir)/src/util/libgnunetutil.la \
-  $(XLIB)
-libgnunet_plugin_dhtlog_mysql_dump_la_LDFLAGS = \
- $(GN_PLUGIN_LDFLAGS)
+ libgnunetdht.la 
 
-libgnunet_plugin_dhtlog_mysql_dump_load_la_SOURCES = \
-  plugin_dhtlog_mysql_dump_load.c
-libgnunet_plugin_dhtlog_mysql_dump_load_la_LIBADD = \
-  $(top_builddir)/src/util/libgnunetutil.la \
-  $(XLIB)
-libgnunet_plugin_dhtlog_mysql_dump_load_la_LDFLAGS = \
- $(GN_PLUGIN_LDFLAGS)
-
-libgnunetdhtlog_la_SOURCES = \
-  dhtlog.c dhtlog.h
-libgnunetdhtlog_la_LIBADD = \
-  $(top_builddir)/src/util/libgnunetutil.la
-libgnunetdhtlog_la_LDFLAGS = \
-  $(GN_LIB_LDFLAGS) $(WINFLAGS) \
-  -version-info 0:0:0
 
 libgnunetdht_la_SOURCES = \
-  dht_api.c dht.h \
-  dht_api_get_put.c \
-  dht_api_find_peer.c 
+  dht_api.c dht.h 
 libgnunetdht_la_LIBADD = \
   $(top_builddir)/src/util/libgnunetutil.la \
   $(XLIB)
@@ -82,50 +27,20 @@ libgnunetdht_la_LDFLAGS = \
   $(GN_LIB_LDFLAGS) $(WINFLAGS) \
   -version-info 0:0:0
 
-libgnunetdhtnew_la_SOURCES = \
-  dht_api_new.c dht_new.h 
-libgnunetdhtnew_la_LIBADD = \
-  $(top_builddir)/src/util/libgnunetutil.la \
-  $(XLIB)
-libgnunetdhtnew_la_LDFLAGS = \
-  $(GN_LIB_LDFLAGS) $(WINFLAGS) \
-  -version-info 0:0:0
-
 bin_PROGRAMS = \
  gnunet-service-dht \
- gnunet-service-dht-new \
  gnunet-dht-get \
  gnunet-dht-put
 
-if HAVE_MALICIOUS
-noinst_PROGRAMS = \
- gnunet-dht-driver 
-endif
-
 gnunet_service_dht_SOURCES = \
- gnunet-service-dht.c         
-gnunet_service_dht_LDADD = \
-  $(top_builddir)/src/statistics/libgnunetstatistics.la \
-  $(top_builddir)/src/core/libgnunetcore.la \
-  $(top_builddir)/src/nse/libgnunetnse.la \
-  $(top_builddir)/src/transport/libgnunettransport.la \
-  $(top_builddir)/src/hello/libgnunethello.la \
-  $(top_builddir)/src/block/libgnunetblock.la \
-  $(top_builddir)/src/datacache/libgnunetdatacache.la \
-  $(top_builddir)/src/util/libgnunetutil.la \
-  $(top_builddir)/src/dht/libgnunetdhtlog.la -lm
-gnunet_service_dht_DEPENDENCIES = \
-  libgnunetdhtlog.la                             
-
-gnunet_service_dht_new_SOURCES = \
- gnunet-service-dht-new.c gnunet-service-dht.h \
+ 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 \
@@ -140,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 = \
@@ -149,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 = \
@@ -161,7 +76,8 @@ check_PROGRAMS = \
  test_dht_twopeer_put_get \
  test_dht_twopeer_get_put \
  test_dht_twopeer_path_tracking \
- test_dht_multipeer 
+ test_dht_multipeer \
+ test_dht_2dtorus 
 
 if ENABLE_TEST_RUN
 TESTS = test_dht_api $(check_SCRIPTS) \
@@ -169,7 +85,8 @@ TESTS = test_dht_api $(check_SCRIPTS) \
  test_dht_twopeer_put_get \
  test_dht_twopeer_get_put \
  test_dht_twopeer_path_tracking \
- test_dht_multipeer 
+ test_dht_multipeer  \
+ test_dht_2dtorus
 endif
 
 test_dht_api_SOURCES = \
@@ -177,25 +94,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                          
 
@@ -204,14 +112,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
@@ -220,12 +128,33 @@ 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/statistics/libgnunetstatistics.la \
+ $(top_builddir)/src/testing/libgnunettesting.la \
+ $(top_builddir)/src/dht/libgnunetdht.la  
+test_dht_multipeer_DEPENDENCIES = \
+  libgnunetdht.la                          
+
+test_dht_2dtours_SOURCES = \
+ test_dht_2dtorus.c
+test_dht_2dtorus_LDADD = \
+ $(top_builddir)/src/util/libgnunetutil.la \
+ $(top_builddir)/src/testing/libgnunettesting.la \
+ $(top_builddir)/src/dht/libgnunetdht.la
+test_dht_2dtorus_DEPENDENCIES = \
+  libgnunetdht.la
+
+
 EXTRA_DIST = \
   $(check_SCRIPTS) \
   test_dht_api_data.conf \
   test_dht_api_peer1.conf \
   test_dht_twopeer_data.conf \
   test_dht_multipeer_data.conf \
+  test_dht_2dtorus.conf \
   multipeer_topo.dat
 
 check_SCRIPTS = \