X-Git-Url: https://git.librecmc.org/?a=blobdiff_plain;f=src%2Fdht%2FMakefile.am;h=b6d3317eb7ee604313d4bcecc543abfec037c156;hb=2381efb4d1dd277a9a39d69a0a0fbc3368fdad4d;hp=0baf6b00e0618560f97534395bada34453b271e9;hpb=c6ef80f13164795b0b53bc7c4c7cae2452cf861e;p=oweals%2Fgnunet.git

diff --git a/src/dht/Makefile.am b/src/dht/Makefile.am
index 0baf6b00e..b6d3317eb 100644
--- a/src/dht/Makefile.am
+++ b/src/dht/Makefile.am
@@ -32,7 +32,7 @@ libgnunetdht_la_LIBADD = \
   $(LTLIBINTL)
 libgnunetdht_la_LDFLAGS = \
   $(GN_LIB_LDFLAGS) $(WINFLAGS) \
-  -version-info 1:0:1
+  -version-info 1:1:1
 
 
 plugin_LTLIBRARIES = \
@@ -125,21 +125,21 @@ check_PROGRAMS = \
  test_dht_twopeer \
  test_dht_multipeer \
  test_dht_line \
- test_dht_2dtorus 
-# test_dht_monitor
+ test_dht_2dtorus \
+ test_dht_monitor
 
 if HAVE_EXPERIMENTAL
 # These tests still do not work as testbed does
 # not support the respective topology op
- NEW_TESTS = test_dht_2dtorus test_dht_multipeer
+ NEW_TESTS = test_dht_2dtorus test_dht_multipeer 
 endif
 
 if ENABLE_TEST_RUN
 TESTS = test_dht_api $(check_SCRIPTS) \
  test_dht_twopeer \
  test_dht_line \
+ test_dht_monitor \
  $(NEW_TESTS) 
-# test_dht_monitor
 endif
 
 test_dht_api_SOURCES = \
@@ -155,8 +155,10 @@ test_dht_api_DEPENDENCIES = \
 test_dht_twopeer_SOURCES = \
  test_dht_topo.c
 test_dht_twopeer_LDADD = \
+ $(top_builddir)/src/dht/libgnunetdhttest.a \
  $(top_builddir)/src/util/libgnunetutil.la \
- $(top_builddir)/src/testing_old/libgnunettesting_old.la \
+ $(top_builddir)/src/dht/libgnunetdhttest.a \
+ $(top_builddir)/src/testbed/libgnunettestbed.la \
  $(top_builddir)/src/dht/libgnunetdht.la    
 test_dht_twopeer_DEPENDENCIES = \
   libgnunetdht.la			    
@@ -184,18 +186,20 @@ test_dht_line_DEPENDENCIES = \
 test_dht_multipeer_SOURCES = \
  test_dht_topo.c
 test_dht_multipeer_LDADD = \
+ $(top_builddir)/src/dht/libgnunetdhttest.a \
  $(top_builddir)/src/util/libgnunetutil.la \
  $(top_builddir)/src/statistics/libgnunetstatistics.la \
- $(top_builddir)/src/testing_old/libgnunettesting_old.la \
+ $(top_builddir)/src/testbed/libgnunettestbed.la \
  $(top_builddir)/src/dht/libgnunetdht.la  
 test_dht_multipeer_DEPENDENCIES = \
   libgnunetdht.la			    
 
-# fixme, rewrite based on test_dht_topo.c!
-test_dht_monitor_SOURCES = test_dht_monitor.c
+test_dht_monitor_SOURCES = \
+  test_dht_monitor.c
 test_dht_monitor_LDADD = \
+ $(top_builddir)/src/dht/libgnunetdhttest.a \
  $(top_builddir)/src/util/libgnunetutil.la \
- $(top_builddir)/src/testing_old/libgnunettesting_old.la \
+ $(top_builddir)/src/testbed/libgnunettestbed.la \
  $(top_builddir)/src/dht/libgnunetdht.la
 test_dht_monitor_DEPENDENCIES = \
   libgnunetdht.la
@@ -204,7 +208,7 @@ EXTRA_DIST = \
   $(check_SCRIPTS) \
   test_dht_api_data.conf \
   test_dht_api_peer1.conf \
-  test_dht_twopeer_data.conf \
+  test_dht_monitor.conf \
   test_dht_multipeer.conf \
   test_dht_2dtorus.conf \
   test_dht_line.conf \