missing NO_TASK assignment

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

diff --git a/src/dht/Makefile.am b/src/dht/Makefile.am
index f69cc15baac03b5c9bcc84c58d111e1bdc9a05a4..06e25bf8df2b1157a080fca4393966727cc51970 100644 (file)
--- a/src/dht/Makefile.am
+++ b/src/dht/Makefile.am
@@ -24,7 +24,8 @@ lib_LTLIBRARIES = libgnunetdht.la \
 plugin_LTLIBRARIES = \
  $(MYSQL_PLUGIN) \
  libgnunet_plugin_dhtlog_dummy.la \
- libgnunet_plugin_dhtlog_mysql_dump.la 
+ libgnunet_plugin_dhtlog_mysql_dump.la \
+ libgnunet_plugin_dhtlog_mysql_dump_load.la  
 
 
 libgnunet_plugin_dhtlog_mysql_la_SOURCES = \
@@ -43,7 +44,7 @@ libgnunet_plugin_dhtlog_dummy_la_LIBADD = \
   $(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 = \
@@ -52,6 +53,14 @@ libgnunet_plugin_dhtlog_mysql_dump_la_LIBADD = \
 libgnunet_plugin_dhtlog_mysql_dump_la_LDFLAGS = \
  $(GN_PLUGIN_LDFLAGS)
 
+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 = \
@@ -61,7 +70,9 @@ libgnunetdhtlog_la_LDFLAGS = \
   -version-info 0:0:0
 
 libgnunetdht_la_SOURCES = \
-  dht_api.c dht.h
+  dht_api.c dht.h \
+  dht_api_get_put.c \
+  dht_api_find_peer.c 
 libgnunetdht_la_LIBADD = \
   $(top_builddir)/src/util/libgnunetutil.la \
   $(XLIB)
@@ -69,21 +80,16 @@ libgnunetdht_la_LDFLAGS = \
   $(GN_LIB_LDFLAGS) $(WINFLAGS) \
   -version-info 0:0:0
 
-if HAVE_EXPERIMENTAL
-STUD_PROGS =  gnunet-service-dht-can \
- gnunet-service-dht-freenet \
- gnunet-service-dht-kademlia \
- gnunet-service-dht-koorde 
-endif
-
 bin_PROGRAMS = $(STUD_PROGS) \
  gnunet-service-dht \
  gnunet-dht-get \
  gnunet-dht-get-peer \
  gnunet-dht-put 
 
+if HAVE_MALICIOUS
 noinst_PROGRAMS = \
  gnunet-dht-driver 
+endif
 
 gnunet_service_dht_SOURCES = \
  gnunet-service-dht.c         
@@ -92,61 +98,10 @@ gnunet_service_dht_LDADD = \
   $(top_builddir)/src/core/libgnunetcore.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
-
-gnunet_service_dht_can_SOURCES = \
- dht_can.c dht_can_helper.c dht_can_helper.h
-gnunet_service_dht_can_LDADD = \
-  $(top_builddir)/src/statistics/libgnunetstatistics.la \
-  $(top_builddir)/src/core/libgnunetcore.la \
-  $(top_builddir)/src/transport/libgnunettransport.la \
-  $(top_builddir)/src/hello/libgnunethello.la \
-  $(top_builddir)/src/datacache/libgnunetdatacache.la \
-  $(top_builddir)/src/util/libgnunetutil.la 
-
-gnunet_service_dht_freenet_SOURCES = \
- dht_freenet.c 
-gnunet_service_dht_freenet_LDADD = \
-  $(top_builddir)/src/statistics/libgnunetstatistics.la \
-  $(top_builddir)/src/core/libgnunetcore.la \
-  $(top_builddir)/src/transport/libgnunettransport.la \
-  $(top_builddir)/src/peerinfo/libgnunetpeerinfo.la \
-  $(top_builddir)/src/hello/libgnunethello.la \
-  $(top_builddir)/src/datacache/libgnunetdatacache.la \
-  $(top_builddir)/src/util/libgnunetutil.la 
-
-gnunet_service_dht_kademlia_SOURCES = \
- dht_kademlia.c dht_kademlia.h
-gnunet_service_dht_kademlia_LDADD = \
-  $(top_builddir)/src/statistics/libgnunetstatistics.la \
-  $(top_builddir)/src/core/libgnunetcore.la \
-  $(top_builddir)/src/transport/libgnunettransport.la \
-  $(top_builddir)/src/hello/libgnunethello.la \
-  $(top_builddir)/src/datacache/libgnunetdatacache.la \
-  $(top_builddir)/src/util/libgnunetutil.la 
-
-gnunet_service_dht_koorde_SOURCES = \
- dht_koorde.c dht_koorde.h
-gnunet_service_dht_koorde_LDADD = \
-  $(top_builddir)/src/statistics/libgnunetstatistics.la \
-  $(top_builddir)/src/core/libgnunetcore.la \
-  $(top_builddir)/src/transport/libgnunettransport.la \
-  $(top_builddir)/src/hello/libgnunethello.la \
-  $(top_builddir)/src/datacache/libgnunetdatacache.la \
-  $(top_builddir)/src/util/libgnunetutil.la 
-
-#gnunet_service_dht_new_SOURCES = \
-# gnunet-service-dht-new.c         
-#gnunet_service_dht_new_LDADD = \
-#  $(top_builddir)/src/statistics/libgnunetstatistics.la \
-#  $(top_builddir)/src/core/libgnunetcore.la \
-#  $(top_builddir)/src/transport/libgnunettransport.la \
-#  $(top_builddir)/src/hello/libgnunethello.la \
-#  $(top_builddir)/src/datacache/libgnunetdatacache.la \
-#  $(top_builddir)/src/util/libgnunetutil.la \
-#  $(top_builddir)/src/dht/libgnunetdhtlog.la
+  $(top_builddir)/src/dht/libgnunetdhtlog.la -lm
 
 gnunet_dht_get_SOURCES = \
  gnunet-dht-get.c         
@@ -180,12 +135,13 @@ gnunet_dht_driver_LDADD = \
   $(top_builddir)/src/util/libgnunetutil.la \
   $(top_builddir)/src/dht/libgnunetdhtlog.la
 
-check_PROGRAMS = \
+check_PROGRAMS = $(STUD_TESTS) \
  test_dht_api \
  test_dht_twopeer \
  test_dht_twopeer_put_get \
  test_dht_multipeer \
- test_dhtlog
+ test_dhtlog 
+# test_hash_operations
 
 if !DISABLE_TEST_RUN
 TESTS = test_dht_api $(check_SCRIPTS) \
@@ -206,6 +162,13 @@ test_dht_multipeer_LDADD = \
  $(top_builddir)/src/util/libgnunetutil.la \
  $(top_builddir)/src/testing/libgnunettesting.la \
  $(top_builddir)/src/dht/libgnunetdht.la  
+ 
+#test_hash_operations_SOURCES = \
+# test_hash_operations.c
+#test_hash_operations_LDADD = \
+# $(top_builddir)/src/util/libgnunetutil.la \
+# $(top_builddir)/src/testing/libgnunettesting.la \
+# $(top_builddir)/src/dht/libgnunetdht.la 
 
 test_dht_twopeer_SOURCES = \
  test_dht_twopeer.c
@@ -229,6 +192,14 @@ test_dhtlog_LDADD = \
  $(top_builddir)/src/dht/libgnunetdht.la \
  $(top_builddir)/src/dht/libgnunetdhtlog.la
 
+test_kademlia_end2end_SOURCES = \
+ test_kademlia_end2end.c
+test_kademlia_end2end_LDADD = \
+ $(top_builddir)/src/util/libgnunetutil.la \
+ $(top_builddir)/src/testing/libgnunettesting.la \
+ $(top_builddir)/src/dht/libgnunetdht.la \
+ $(top_builddir)/src/dht/libgnunetdhtlog.la
+
 EXTRA_DIST = \
   $(check_SCRIPTS) \
   test_dht_api_data.conf \