-INCLUDES = -I$(top_srcdir)/src/include
-
+AM_CPPFLAGS = -I$(top_srcdir)/src/include
if MINGW
WINFLAGS = -Wl,--no-undefined -Wl,--export-all-symbols -lole32 -lshell32 -liconv -lstdc++ -lcomdlg32 -lgdi32
endif
+plugindir = $(libdir)/gnunet
+
+pkgcfgdir= $(pkgdatadir)/config.d/
+
+libexecdir= $(pkglibdir)/libexec/
+
+pkgcfg_DATA = \
+ dht.conf
+
if USE_COVERAGE
AM_CFLAGS = --coverage -O0
XLIB = -lgcov
endif
-lib_LTLIBRARIES = libgnunetdht.la
+lib_LTLIBRARIES = \
+ libgnunetdht.la
libgnunetdht_la_SOURCES = \
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 2:0:2
+
+
+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 \
+ $(LTLIBINTL)
+libgnunet_plugin_block_dht_la_LDFLAGS = \
+ $(GN_PLUGIN_LDFLAGS)
+libgnunet_plugin_block_dht_la_DEPENDENCIES = \
+ $(top_builddir)/src/block/libgnunetblock.la
+
-bin_PROGRAMS = \
+libexec_PROGRAMS = \
gnunet-service-dht
+noinst_PROGRAMS = \
+ gnunet-dht-monitor \
+ gnunet-dht-get \
+ gnunet-dht-put
+
gnunet_service_dht_SOURCES = \
- gnunet-service-dht.c
+ gnunet-service-dht.c gnunet-service-dht.h \
+ gnunet-service-dht_clients.c gnunet-service-dht_clients.h \
+ gnunet-service-dht_datacache.c gnunet-service-dht_datacache.h \
+ gnunet-service-dht_hello.c gnunet-service-dht_hello.h \
+ gnunet-service-dht_nse.c gnunet-service-dht_nse.h \
+ gnunet-service-dht_neighbours.c gnunet-service-dht_neighbours.h \
+ gnunet-service-dht_routing.c gnunet-service-dht_routing.h
gnunet_service_dht_LDADD = \
$(top_builddir)/src/statistics/libgnunetstatistics.la \
$(top_builddir)/src/core/libgnunetcore.la \
- $(top_builddir)/src/datastore/libgnunetdatastore.la \
- $(top_builddir)/src/util/libgnunetutil.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 \
+ $(top_builddir)/src/block/libgnunetblock.la \
+ $(top_builddir)/src/datacache/libgnunetdatacache.la \
+ $(top_builddir)/src/util/libgnunetutil.la \
+ -lm
+
+gnunet_dht_get_SOURCES = \
+ gnunet-dht-get.c
+gnunet_dht_get_LDADD = \
+ $(top_builddir)/src/dht/libgnunetdht.la \
+ $(top_builddir)/src/core/libgnunetcore.la \
+ $(top_builddir)/src/util/libgnunetutil.la
+gnunet_dht_get_DEPENDENCIES = \
+ libgnunetdht.la
+
+gnunet_dht_put_SOURCES = \
+ gnunet-dht-put.c
+gnunet_dht_put_LDADD = \
+ $(top_builddir)/src/dht/libgnunetdht.la \
+ $(top_builddir)/src/core/libgnunetcore.la \
+ $(top_builddir)/src/util/libgnunetutil.la
+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
+if HAVE_TESTING
+noinst_LIBRARIES = libgnunetdhttest.a
+endif
+
+libgnunetdhttest_a_SOURCES = \
+ dht_test_lib.c dht_test_lib.h
+libgnunetdhttest_a_LIBADD = \
+ $(top_builddir)/src/util/libgnunetutil.la \
+ $(top_builddir)/src/testbed/libgnunettestbed.la \
+ $(top_builddir)/src/dht/libgnunetdht.la
+libgnunetdhttest_a_DEPENDENCIES = \
+ libgnunetdht.la
+
+if HAVE_TESTING
check_PROGRAMS = \
- test_dht_api
+ test_dht_api \
+ test_dht_twopeer \
+ test_dht_multipeer \
+ test_dht_line \
+ test_dht_2dtorus \
+ test_dht_monitor
+endif
-TESTS = $(check_PROGRAMS) # $(check_SCRIPTS)
+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
+endif
+
+if ENABLE_TEST_RUN
+TESTS = test_dht_api $(check_SCRIPTS) \
+ test_dht_twopeer \
+ test_dht_line \
+ test_dht_monitor \
+ $(NEW_TESTS)
+endif
test_dht_api_SOURCES = \
test_dht_api.c
test_dht_api_LDADD = \
$(top_builddir)/src/util/libgnunetutil.la \
- $(top_builddir)/src/dht/libgnunetdht.la
+ $(top_builddir)/src/testing/libgnunettesting.la \
+ $(top_builddir)/src/hello/libgnunethello.la \
+ $(top_builddir)/src/dht/libgnunetdht.la
+test_dht_api_DEPENDENCIES = \
+ libgnunetdht.la
+
+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/dht/libgnunetdhttest.a \
+ $(top_builddir)/src/testbed/libgnunettestbed.la \
+ $(top_builddir)/src/dht/libgnunetdht.la
+test_dht_twopeer_DEPENDENCIES = \
+ libgnunetdht.la
+
+test_dht_2dtorus_SOURCES = \
+ test_dht_topo.c
+test_dht_2dtorus_LDADD = \
+ $(top_builddir)/src/dht/libgnunetdhttest.a \
+ $(top_builddir)/src/util/libgnunetutil.la \
+ $(top_builddir)/src/testbed/libgnunettestbed.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/dht/libgnunetdhttest.a \
+ $(top_builddir)/src/util/libgnunetutil.la \
+ $(top_builddir)/src/testbed/libgnunettestbed.la \
+ $(top_builddir)/src/dht/libgnunetdht.la
+test_dht_line_DEPENDENCIES = \
+ libgnunetdht.la
+
+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/testbed/libgnunettestbed.la \
+ $(top_builddir)/src/dht/libgnunetdht.la
+test_dht_multipeer_DEPENDENCIES = \
+ libgnunetdht.la
+
+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/testbed/libgnunettestbed.la \
+ $(top_builddir)/src/dht/libgnunetdht.la
+test_dht_monitor_DEPENDENCIES = \
+ libgnunetdht.la
EXTRA_DIST = \
- test_dht_api_data.conf
+ $(check_SCRIPTS) \
+ test_dht_api_data.conf \
+ test_dht_api_peer1.conf \
+ test_dht_monitor.conf \
+ test_dht_multipeer.conf \
+ test_dht_2dtorus.conf \
+ test_dht_line.conf \
+ test_dht_tools.py.in \
+ test_dht_multipeer_topology.dat
+
+if HAVE_PYTHON
+check_SCRIPTS = \
+ test_dht_tools.py
+endif
+
+do_subst = $(SED) -e 's,[@]PYTHON[@],$(PYTHON),g'
+
+%.py: %.py.in Makefile
+ $(do_subst) < $(srcdir)/$< > $@
+ chmod +x $@
-#check_SCRIPTS = \
-# test_gnunet_peerinfo.sh
+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