-fixing source port randomization for DNS service

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

diff --git a/src/dht/Makefile.am b/src/dht/Makefile.am
index a90477108db88818c2dbe5baa9f37a12117fac57..acc81e2b5787e64fc8acd1950ede85a287170ebe 100644 (file)
--- a/src/dht/Makefile.am
+++ b/src/dht/Makefile.am
@@ -5,6 +5,11 @@ endif
 
 plugindir = $(libdir)/gnunet
 
+pkgcfgdir= $(pkgdatadir)/config.d/
+
+pkgcfg_DATA = \
+  dht.conf 
+
 if HAVE_ZLIB
  ZLIB_LNK = -lz
 endif
@@ -17,7 +22,6 @@ endif
 lib_LTLIBRARIES = \
  libgnunetdht.la 
 
-
 libgnunetdht_la_SOURCES = \
   dht_api.c dht.h 
 libgnunetdht_la_LIBADD = \
@@ -27,6 +31,23 @@ libgnunetdht_la_LDFLAGS = \
   $(GN_LIB_LDFLAGS) $(WINFLAGS) \
   -version-info 0:0:0
 
+
+plugin_LTLIBRARIES = \
+  libgnunet_plugin_block_dht.la 
+
+libgnunet_plugin_block_dht_la_SOURCES = \
+  plugin_block_dht.c
+libgnunet_plugin_block_dht_la_LIBADD = \
+  $(top_builddir)/src/hello/libgnunethello.la \
+  $(top_builddir)/src/block/libgnunetblock.la \
+  $(top_builddir)/src/util/libgnunetutil.la 
+libgnunet_plugin_block_dht_la_LDFLAGS = \
+ $(GN_PLUGIN_LDFLAGS)
+libgnunet_plugin_block_dht_la_DEPENDENCIES = \
+  $(top_builddir)/src/block/libgnunetblock.la 
+
+
+
 bin_PROGRAMS = \
  gnunet-service-dht \
  gnunet-dht-get \
@@ -44,6 +65,7 @@ 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/ats/libgnunetats.la \
   $(top_builddir)/src/transport/libgnunettransport.la \
   $(top_builddir)/src/peerinfo/libgnunetpeerinfo.la \
   $(top_builddir)/src/hello/libgnunethello.la \
@@ -76,15 +98,21 @@ 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_line \
+ test_dht_2dtorus \
+ test_dht_monitor
 
 if ENABLE_TEST_RUN
 TESTS = test_dht_api $(check_SCRIPTS) \
  test_dht_twopeer \
  test_dht_twopeer_put_get \
  test_dht_twopeer_get_put \
- test_dht_twopeer_path_tracking 
-# test_dht_multipeer 
+ test_dht_twopeer_path_tracking \
+ test_dht_multipeer  \
+ test_dht_line \
+ test_dht_2dtorus \
+ test_dht_monitor
 endif
 
 test_dht_api_SOURCES = \
@@ -130,12 +158,37 @@ 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_2dtorus_SOURCES = \
+ test_dht_topo.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
 
+test_dht_line_SOURCES = \
+ test_dht_topo.c
+test_dht_line_LDADD = \
+ $(top_builddir)/src/util/libgnunetutil.la \
+ $(top_builddir)/src/testing/libgnunettesting.la \
+ $(top_builddir)/src/dht/libgnunetdht.la
+test_dht_line_DEPENDENCIES = \
+  libgnunetdht.la
+
+test_dht_monitor_SOURCES = test_dht_monitor.c
+test_dht_monitor_LDADD = \
+ $(top_builddir)/src/util/libgnunetutil.la \
+ $(top_builddir)/src/testing/libgnunettesting.la \
+ $(top_builddir)/src/dht/libgnunetdht.la
+test_dht_monitor_DEPENDENCIES = \
+  libgnunetdht.la
 
 EXTRA_DIST = \
   $(check_SCRIPTS) \
@@ -143,6 +196,7 @@ EXTRA_DIST = \
   test_dht_api_peer1.conf \
   test_dht_twopeer_data.conf \
   test_dht_multipeer_data.conf \
+  test_dht_2dtorus.conf \
   multipeer_topo.dat
 
 check_SCRIPTS = \