projects
/
oweals
/
gnunet.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
-memory is cheap, default to heap
[oweals/gnunet.git]
/
src
/
dht
/
Makefile.am
diff --git
a/src/dht/Makefile.am
b/src/dht/Makefile.am
index 0baf6b00e0618560f97534395bada34453b271e9..b6d3317eb7ee604313d4bcecc543abfec037c156 100644
(file)
--- 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) \
$(LTLIBINTL)
libgnunetdht_la_LDFLAGS = \
$(GN_LIB_LDFLAGS) $(WINFLAGS) \
- -version-info 1:
0
:1
+ -version-info 1:
1
:1
plugin_LTLIBRARIES = \
plugin_LTLIBRARIES = \
@@
-125,21
+125,21
@@
check_PROGRAMS = \
test_dht_twopeer \
test_dht_multipeer \
test_dht_line \
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
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 \
endif
if ENABLE_TEST_RUN
TESTS = test_dht_api $(check_SCRIPTS) \
test_dht_twopeer \
test_dht_line \
+ test_dht_monitor \
$(NEW_TESTS)
$(NEW_TESTS)
-# test_dht_monitor
endif
test_dht_api_SOURCES = \
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 = \
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/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
$(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 = \
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/util/libgnunetutil.la \
$(top_builddir)/src/statistics/libgnunetstatistics.la \
- $(top_builddir)/src/test
ing_old/libgnunettesting_ol
d.la \
+ $(top_builddir)/src/test
bed/libgnunettestbe
d.la \
$(top_builddir)/src/dht/libgnunetdht.la
test_dht_multipeer_DEPENDENCIES = \
libgnunetdht.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 = \
test_dht_monitor_LDADD = \
+ $(top_builddir)/src/dht/libgnunetdhttest.a \
$(top_builddir)/src/util/libgnunetutil.la \
$(top_builddir)/src/util/libgnunetutil.la \
- $(top_builddir)/src/test
ing_old/libgnunettesting_ol
d.la \
+ $(top_builddir)/src/test
bed/libgnunettestbe
d.la \
$(top_builddir)/src/dht/libgnunetdht.la
test_dht_monitor_DEPENDENCIES = \
libgnunetdht.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 \
$(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 \
test_dht_multipeer.conf \
test_dht_2dtorus.conf \
test_dht_line.conf \