pkgcfgdir= $(pkgdatadir)/config.d/
+libexecdir= $(pkglibdir)/libexec/
+
pkgcfg_DATA = \
mesh.conf
AM_CLFAGS = -g
-bin_PROGRAMS = \
- gnunet-service-mesh
+libexec_PROGRAMS = \
+ gnunet-service-mesh gnunet-service-mesh-new
lib_LTLIBRARIES = \
libgnunetmesh.la \
$(LTLIBINTL)
libgnunetmeshblock_la_LDFLAGS = \
$(GN_LIB_LDFLAGS) $(WINFLAGS) \
- -version-info 1:0:0
+ -version-info 2:0:0
gnunet_service_mesh_SOURCES = \
gnunet-service-mesh.c \
gnunet_service_mesh_LDFLAGS = -lrt
endif
+gnunet_service_mesh_new_SOURCES = \
+ gnunet-service-mesh-new.c \
+ mesh_tunnel_tree.c \
+ mesh_common.c
+gnunet_service_mesh_new_CFLAGS = $(AM_CFLAGS)
+gnunet_service_mesh_new_LDADD = \
+ $(top_builddir)/src/util/libgnunetutil.la \
+ $(top_builddir)/src/core/libgnunetcore.la \
+ $(top_builddir)/src/dht/libgnunetdht.la \
+ $(top_builddir)/src/statistics/libgnunetstatistics.la \
+ $(top_builddir)/src/block/libgnunetblock.la \
+ $(top_builddir)/src/mesh/libgnunetmeshblock.la \
+ $(top_builddir)/src/regex/libgnunetregex.la
+gnunet_service_mesh_new_DEPENDENCIES = \
+ $(top_builddir)/src/util/libgnunetutil.la \
+ $(top_builddir)/src/core/libgnunetcore.la \
+ $(top_builddir)/src/dht/libgnunetdht.la \
+ $(top_builddir)/src/statistics/libgnunetstatistics.la \
+ $(top_builddir)/src/block/libgnunetblock.la \
+ libgnunetmeshblock.la \
+ $(top_builddir)/src/regex/libgnunetregex.la
+if LINUX
+gnunet_service_mesh_new_LDFLAGS = -lrt
+endif
+
+
+noinst_PROGRAMS = \
+ gnunet-regex-profiler \
+ gnunet-service-regexprofiler
+
+gnunet_regex_profiler_SOURCES = \
+ gnunet-regex-profiler.c
+gnunet_regex_profiler_LDADD = \
+ $(top_builddir)/src/util/libgnunetutil.la \
+ $(top_builddir)/src/testbed/libgnunettestbed.la \
+ $(top_builddir)/src/mesh/libgnunetmesh.la \
+ $(top_builddir)/src/regex/libgnunetregex.la \
+ $(top_builddir)/src/statistics/libgnunetstatistics.la
+gnunet_regex_profiler_DEPENDENCIES = \
+ libgnunetmesh.la
+
+gnunet_service_regexprofiler_SOURCES = \
+ gnunet-service-regexprofiler.c
+gnunet_service_regexprofiler_LDADD = \
+ $(top_builddir)/src/util/libgnunetutil.la \
+ $(top_builddir)/src/mesh/libgnunetmesh.la \
+ $(top_builddir)/src/statistics/libgnunetstatistics.la
+gnunet_service_regexprofiler_DEPENDENCIES = \
+ libgnunetmesh.la
+
check_PROGRAMS = \
test_mesh_api \
test_mesh_tree_api \
test_mesh_small_speed \
test_mesh_small_speed_nobuf \
test_mesh_small_speed_min \
+ test_mesh_small_speed_backwards \
+ test_mesh_small_speed_nobuf_backwards \
+ test_mesh_small_speed_min_backwards \
test_mesh_small_speed_ack
test_mesh_api_SOURCES = \
test_mesh_small_multicast_DEPENDENCIES = \
libgnunetmesh.la
+test_mesh_small_speed_ack_SOURCES = \
+ test_mesh_small.c
+test_mesh_small_speed_ack_LDADD = \
+ $(top_builddir)/src/mesh/libgnunetmesh.la \
+ $(top_builddir)/src/util/libgnunetutil.la \
+ $(top_builddir)/src/testing_old/libgnunettesting_old.la
+test_mesh_small_speed_ack_DEPENDENCIES = \
+ libgnunetmesh.la
+
test_mesh_small_speed_SOURCES = \
test_mesh_small.c
test_mesh_small_speed_LDADD = \
test_mesh_small_speed_nobuf_DEPENDENCIES = \
libgnunetmesh.la
-test_mesh_small_speed_ack_SOURCES = \
+test_mesh_small_speed_backwards_SOURCES = \
test_mesh_small.c
-test_mesh_small_speed_ack_LDADD = \
+test_mesh_small_speed_backwards_LDADD = \
$(top_builddir)/src/mesh/libgnunetmesh.la \
$(top_builddir)/src/util/libgnunetutil.la \
$(top_builddir)/src/testing_old/libgnunettesting_old.la
-test_mesh_small_speed_ack_DEPENDENCIES = \
+test_mesh_small_speed_backwards_DEPENDENCIES = \
libgnunetmesh.la
+test_mesh_small_speed_min_backwards_SOURCES = \
+ test_mesh_small.c
+test_mesh_small_speed_min_backwards_LDADD = \
+ $(top_builddir)/src/mesh/libgnunetmesh.la \
+ $(top_builddir)/src/util/libgnunetutil.la \
+ $(top_builddir)/src/testing_old/libgnunettesting_old.la
+test_mesh_small_speed_min_backwards_DEPENDENCIES = \
+ libgnunetmesh.la
+
+test_mesh_small_speed_nobuf_backwards_SOURCES = \
+ test_mesh_small.c
+test_mesh_small_speed_nobuf_backwards_LDADD = \
+ $(top_builddir)/src/mesh/libgnunetmesh.la \
+ $(top_builddir)/src/util/libgnunetutil.la \
+ $(top_builddir)/src/testing_old/libgnunettesting_old.la
+test_mesh_small_speed_nobuf_backwards_DEPENDENCIES = \
+ libgnunetmesh.la
+
+
if ENABLE_TEST_RUN
TESTS = test_mesh_api \
test_mesh_tree_api \
test_mesh_local_traffic_both \
test_mesh_2dtorus test_mesh_regex \
test_mesh_small_unicast test_mesh_small_multicast \
- test_mesh_small_speed
+ test_mesh_small_speed \
+ test_mesh_small_speed_min \
+ test_mesh_small_speed_nobuf \
+ test_mesh_small_speed_backwards \
+ test_mesh_small_speed_min_backwards
endif
EXTRA_DIST = \
test_mesh.conf \
test_mesh_2dtorus.conf \
- test_mesh_small.conf \
- test_mesh_path.conf
+ test_mesh_small.conf