pkgcfgdir= $(pkgdatadir)/config.d/
-dist_pkgcfg_DATA = \
+pkgcfg_DATA = \
dht.conf
if HAVE_ZLIB
dht_api.c dht.h
libgnunetdht_la_LIBADD = \
$(top_builddir)/src/util/libgnunetutil.la \
- $(XLIB)
+ $(XLIB) \
+ $(LTLIBINTL)
libgnunetdht_la_LDFLAGS = \
$(GN_LIB_LDFLAGS) $(WINFLAGS) \
- -version-info 0:0:0
+ -version-info 1:0:1
plugin_LTLIBRARIES = \
libgnunet_plugin_block_dht_la_LIBADD = \
$(top_builddir)/src/hello/libgnunethello.la \
$(top_builddir)/src/block/libgnunetblock.la \
- $(top_builddir)/src/util/libgnunetutil.la
+ $(top_builddir)/src/util/libgnunetutil.la \
+ $(LTLIBINTL)
libgnunet_plugin_block_dht_la_LDFLAGS = \
$(GN_PLUGIN_LDFLAGS)
libgnunet_plugin_block_dht_la_DEPENDENCIES = \
bin_PROGRAMS = \
gnunet-service-dht \
+ gnunet-dht-monitor \
gnunet-dht-get \
gnunet-dht-put
gnunet_dht_put_DEPENDENCIES = \
libgnunetdht.la
+gnunet_dht_monitor_SOURCES = \
+ gnunet-dht-monitor.c
+gnunet_dht_monitor_LDADD = \
+ $(top_builddir)/src/dht/libgnunetdht.la \
+ $(top_builddir)/src/core/libgnunetcore.la \
+ $(top_builddir)/src/util/libgnunetutil.la
+gnunet_dht_monitor_DEPENDENCIES = \
+ libgnunetdht.la
+
+
check_PROGRAMS = \
test_dht_api \
test_dht_twopeer \
test_dht_twopeer_get_put \
test_dht_twopeer_path_tracking \
test_dht_multipeer \
+ test_dht_line \
test_dht_2dtorus \
test_dht_monitor
test_dht_twopeer_get_put \
test_dht_twopeer_path_tracking \
test_dht_multipeer \
+ test_dht_line \
test_dht_2dtorus \
test_dht_monitor
endif
test_dht_api.c
test_dht_api_LDADD = \
$(top_builddir)/src/util/libgnunetutil.la \
+ $(top_builddir)/src/testing/libgnunettesting.la \
$(top_builddir)/src/hello/libgnunethello.la \
$(top_builddir)/src/dht/libgnunetdht.la
test_dht_api_DEPENDENCIES = \
test_dht_twopeer.c
test_dht_twopeer_LDADD = \
$(top_builddir)/src/util/libgnunetutil.la \
- $(top_builddir)/src/testing/libgnunettesting.la \
+ $(top_builddir)/src/testing_old/libgnunettesting_old.la \
$(top_builddir)/src/dht/libgnunetdht.la
test_dht_twopeer_DEPENDENCIES = \
libgnunetdht.la
test_dht_twopeer_put_get.c
test_dht_twopeer_put_get_LDADD = \
$(top_builddir)/src/util/libgnunetutil.la \
- $(top_builddir)/src/testing/libgnunettesting.la \
+ $(top_builddir)/src/testing_old/libgnunettesting_old.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/testing_old/libgnunettesting_old.la \
$(top_builddir)/src/dht/libgnunetdht.la
test_dht_twopeer_path_tracking_SOURCES = \
test_dht_twopeer_path_tracking.c
test_dht_twopeer_path_tracking_LDADD = \
$(top_builddir)/src/util/libgnunetutil.la \
- $(top_builddir)/src/testing/libgnunettesting.la \
+ $(top_builddir)/src/testing_old/libgnunettesting_old.la \
$(top_builddir)/src/dht/libgnunetdht.la
test_dht_multipeer_SOURCES = \
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/testing_old/libgnunettesting_old.la \
$(top_builddir)/src/dht/libgnunetdht.la
test_dht_multipeer_DEPENDENCIES = \
libgnunetdht.la
test_dht_2dtorus_SOURCES = \
- test_dht_2dtorus.c
+ test_dht_topo.c
test_dht_2dtorus_LDADD = \
$(top_builddir)/src/util/libgnunetutil.la \
- $(top_builddir)/src/testing/libgnunettesting.la \
+ $(top_builddir)/src/testing_old/libgnunettesting_old.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_old/libgnunettesting_old.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/testing_old/libgnunettesting_old.la \
$(top_builddir)/src/dht/libgnunetdht.la
test_dht_monitor_DEPENDENCIES = \
libgnunetdht.la
test_dht_twopeer_data.conf \
test_dht_multipeer_data.conf \
test_dht_2dtorus.conf \
+ test_dht_line.conf \
+ test_dht_tools.py.in \
multipeer_topo.dat
check_SCRIPTS = \
- test_dht_tools.sh
+ test_dht_tools.py
+
+do_subst = $(SED) -e 's,[@]PYTHON[@],$(PYTHON),g'
+
+%.py: %.py.in Makefile
+ $(do_subst) < $(srcdir)/$< > $@
+ chmod +x $@
+
+test_dht_tools.py: test_dht_tools.py.in Makefile
+ $(do_subst) < $(srcdir)/test_dht_tools.py.in > test_dht_tools.py
+ chmod +x test_dht_tools.py