-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
libexecdir= $(pkglibdir)/libexec/
pkgcfg_DATA = \
- dht.conf
-
-if HAVE_ZLIB
- ZLIB_LNK = -lz
-endif
+ dht.conf
if USE_COVERAGE
AM_CFLAGS = --coverage -O0
endif
lib_LTLIBRARIES = \
- libgnunetdht.la
+ libgnunetdht.la
libgnunetdht_la_SOURCES = \
- dht_api.c dht.h
+ dht_api.c dht.h
libgnunetdht_la_LIBADD = \
$(top_builddir)/src/util/libgnunetutil.la \
$(XLIB) \
$(LTLIBINTL)
libgnunetdht_la_LDFLAGS = \
$(GN_LIB_LDFLAGS) $(WINFLAGS) \
- -version-info 1:0:1
+ -version-info 2:0:2
plugin_LTLIBRARIES = \
- libgnunet_plugin_block_dht.la
+ libgnunet_plugin_block_dht.la
libgnunet_plugin_block_dht_la_SOURCES = \
plugin_block_dht.c
libgnunet_plugin_block_dht_la_LDFLAGS = \
$(GN_PLUGIN_LDFLAGS)
libgnunet_plugin_block_dht_la_DEPENDENCIES = \
- $(top_builddir)/src/block/libgnunetblock.la
+ $(top_builddir)/src/block/libgnunetblock.la
libexec_PROGRAMS = \
- gnunet-service-dht
+ gnunet-service-dht
noinst_PROGRAMS = \
gnunet-dht-monitor \
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_routing.c gnunet-service-dht_routing.h
gnunet_service_dht_LDADD = \
$(top_builddir)/src/statistics/libgnunetstatistics.la \
$(top_builddir)/src/core/libgnunetcore.la \
-lm
gnunet_dht_get_SOURCES = \
- gnunet-dht-get.c
+ 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
+ $(top_builddir)/src/util/libgnunetutil.la
gnunet_dht_get_DEPENDENCIES = \
- libgnunetdht.la
+ libgnunetdht.la
gnunet_dht_put_SOURCES = \
- gnunet-dht-put.c
+ 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
+ $(top_builddir)/src/util/libgnunetutil.la
gnunet_dht_put_DEPENDENCIES = \
- libgnunetdht.la
+ libgnunetdht.la
gnunet_dht_monitor_SOURCES = \
- gnunet-dht-monitor.c
+ 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
+ $(top_builddir)/src/util/libgnunetutil.la
gnunet_dht_monitor_DEPENDENCIES = \
- libgnunetdht.la
-
+ libgnunetdht.la
+if HAVE_TESTING
noinst_LIBRARIES = libgnunetdhttest.a
+endif
libgnunetdhttest_a_SOURCES = \
dht_test_lib.c dht_test_lib.h
$(top_builddir)/src/testbed/libgnunettestbed.la \
$(top_builddir)/src/dht/libgnunetdht.la
libgnunetdhttest_a_DEPENDENCIES = \
- libgnunetdht.la
+ libgnunetdht.la
+if HAVE_TESTING
check_PROGRAMS = \
test_dht_api \
test_dht_twopeer \
test_dht_line \
test_dht_2dtorus \
test_dht_monitor
+endif
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
test_dht_twopeer \
test_dht_line \
test_dht_monitor \
- $(NEW_TESTS)
+ $(NEW_TESTS)
endif
test_dht_api_SOURCES = \
$(top_builddir)/src/hello/libgnunethello.la \
$(top_builddir)/src/dht/libgnunetdht.la
test_dht_api_DEPENDENCIES = \
- libgnunetdht.la
+ 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/testing_old/libgnunettesting_old.la \
- $(top_builddir)/src/testbed/libgnunettestbed.la \
$(top_builddir)/src/dht/libgnunetdhttest.a \
- $(top_builddir)/src/dht/libgnunetdht.la
+ $(top_builddir)/src/testbed/libgnunettestbed.la \
+ $(top_builddir)/src/dht/libgnunetdht.la
test_dht_twopeer_DEPENDENCIES = \
- libgnunetdht.la
+ libgnunetdht.la
test_dht_2dtorus_SOURCES = \
test_dht_topo.c
$(top_builddir)/src/dht/libgnunetdhttest.a \
$(top_builddir)/src/util/libgnunetutil.la \
$(top_builddir)/src/testbed/libgnunettestbed.la \
- $(top_builddir)/src/dht/libgnunetdht.la
+ $(top_builddir)/src/dht/libgnunetdht.la
test_dht_line_DEPENDENCIES = \
libgnunetdht.la
$(top_builddir)/src/util/libgnunetutil.la \
$(top_builddir)/src/statistics/libgnunetstatistics.la \
$(top_builddir)/src/testbed/libgnunettestbed.la \
- $(top_builddir)/src/dht/libgnunetdht.la
+ $(top_builddir)/src/dht/libgnunetdht.la
test_dht_multipeer_DEPENDENCIES = \
- libgnunetdht.la
+ libgnunetdht.la
test_dht_monitor_SOURCES = \
test_dht_monitor.c
$(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_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'