AM_CLFAGS = -g
+if HAVE_EXPERIMENTAL
+ EXP_LIB = libgnunetmesh2.la
+ EXP_LIBEXEC = gnunet-service-mesh-new
+endif
+
libexec_PROGRAMS = \
- gnunet-service-mesh gnunet-service-mesh-new
+ gnunet-service-mesh $(EXP_LIBEXEC)
+
+bin_PROGRAMS = \
+ gnunet-mesh
lib_LTLIBRARIES = \
- libgnunetmesh.la \
- libgnunetmeshblock.la
+ libgnunetmesh.la $(EXP_LIB)
plugin_LTLIBRARIES = \
libgnunet_plugin_block_mesh.la
libgnunet_plugin_block_mesh_la_SOURCES = \
plugin_block_mesh.c
libgnunet_plugin_block_mesh_la_LIBADD = \
- $(top_builddir)/src/mesh/libgnunetmeshblock.la \
$(top_builddir)/src/block/libgnunetblock.la \
$(top_builddir)/src/util/libgnunetutil.la
libgnunet_plugin_block_mesh_la_LDFLAGS = \
$(GN_PLUGIN_LDFLAGS)
libgnunet_plugin_block_mesh_la_DEPENDENCIES = \
- libgnunetmeshblock.la \
$(top_builddir)/src/block/libgnunetblock.la \
$(top_builddir)/src/util/libgnunetutil.la
$(LTLIBINTL)
libgnunetmesh_la_LDFLAGS = \
$(GN_LIB_LDFLAGS) $(WINFLAGS) \
- -version-info 1:0:0
+ -version-info 2:1:1
-libgnunetmeshblock_la_SOURCES = \
- mesh_block_lib.c
-libgnunetmeshblock_la_LIBADD = \
+libgnunetmesh2_la_SOURCES = \
+ mesh2_api.c mesh_common.c
+libgnunetmesh2_la_LIBADD = \
$(top_builddir)/src/util/libgnunetutil.la \
$(XLIB) \
$(LTLIBINTL)
-libgnunetmeshblock_la_LDFLAGS = \
+libgnunetmesh2_la_LDFLAGS = \
$(GN_LIB_LDFLAGS) $(WINFLAGS) \
- -version-info 2:0:0
+ -version-info 2:2:1
+
gnunet_service_mesh_SOURCES = \
gnunet-service-mesh.c \
- mesh_tunnel_tree.c \
+ mesh_tunnel_tree.c mesh_tunnel_tree.h \
mesh_common.c
gnunet_service_mesh_CFLAGS = $(AM_CFLAGS)
gnunet_service_mesh_LDADD = \
$(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_DEPENDENCIES = \
$(top_builddir)/src/util/libgnunetutil.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_LDFLAGS = -lrt
endif
+gnunet_mesh_SOURCES = \
+ gnunet-mesh.c
+gnunet_mesh_LDADD = \
+ $(top_builddir)/src/mesh/libgnunetmesh.la \
+ $(top_builddir)/src/util/libgnunetutil.la
+gnunet_mesh_DEPENDENCIES = \
+ libgnunetmesh.la
+
gnunet_service_mesh_new_SOURCES = \
gnunet-service-mesh-new.c \
mesh_tunnel_tree.c \
$(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
+ $(top_builddir)/src/block/libgnunetblock.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
+ $(top_builddir)/src/block/libgnunetblock.la
if LINUX
gnunet_service_mesh_new_LDFLAGS = -lrt
endif
-noinst_PROGRAMS = \
- gnunet-regex-profiler \
- gnunet-service-regexprofiler
+noinst_LIBRARIES = libgnunetmeshtest.a
-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 = \
+libgnunetmeshtest_a_SOURCES = \
+ mesh_test_lib.c mesh_test_lib.h
+libgnunetmeshtest_a_LIBADD = \
+ $(top_builddir)/src/util/libgnunetutil.la \
+ $(top_builddir)/src/testbed/libgnunettestbed.la \
+ $(top_builddir)/src/mesh/libgnunetmesh.la
+libgnunetmeshtest_a_DEPENDENCIES = \
libgnunetmesh.la
-gnunet_service_regexprofiler_SOURCES = \
- gnunet-service-regexprofiler.c
-gnunet_service_regexprofiler_LDADD = \
- $(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_local_traffic_bck \
test_mesh_local_traffic_both \
test_mesh_2dtorus \
- test_mesh_regex \
test_mesh_small_unicast \
- test_mesh_small_multicast \
+ test_mesh_small_signal \
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 = \
libgnunetmesh.la
-test_mesh_2dtorus_SOURCES = \
- test_mesh_2dtorus.c
-test_mesh_2dtorus_LDADD = \
- $(top_builddir)/src/util/libgnunetutil.la \
- $(top_builddir)/src/testing_old/libgnunettesting_old.la
-
-test_mesh_regex_SOURCES = \
- test_mesh_regex.c
-test_mesh_regex_LDADD = \
+ld_mesh_test_lib = \
+ $(top_builddir)/src/mesh/libgnunetmeshtest.a \
$(top_builddir)/src/mesh/libgnunetmesh.la \
- $(top_builddir)/src/util/libgnunetutil.la \
- $(top_builddir)/src/testing_old/libgnunettesting_old.la
-test_mesh_regex_DEPENDENCIES = \
+ $(top_builddir)/src/testbed/libgnunettestbed.la \
+ $(top_builddir)/src/util/libgnunetutil.la
+
+dep_mesh_test_lib = \
+ libgnunetmeshtest.a \
libgnunetmesh.la
+test_mesh_2dtorus_SOURCES = \
+ test_mesh_2dtorus.c
+test_mesh_2dtorus_LDADD = $(ld_mesh_test_lib)
+test_mesh_2dtorus_DEPENDENCIES = $(dep_mesh_test_lib)
test_mesh_small_unicast_SOURCES = \
test_mesh_small.c
-test_mesh_small_unicast_LDADD = \
- $(top_builddir)/src/mesh/libgnunetmesh.la \
- $(top_builddir)/src/util/libgnunetutil.la \
- $(top_builddir)/src/testing_old/libgnunettesting_old.la
-test_mesh_small_unicast_DEPENDENCIES = \
- libgnunetmesh.la
+test_mesh_small_unicast_LDADD = $(ld_mesh_test_lib)
+test_mesh_small_unicast_DEPENDENCIES = $(dep_mesh_test_lib)
-test_mesh_small_multicast_SOURCES = \
+test_mesh_small_signal_SOURCES = \
test_mesh_small.c
-test_mesh_small_multicast_LDADD = \
- $(top_builddir)/src/mesh/libgnunetmesh.la \
- $(top_builddir)/src/util/libgnunetutil.la \
- $(top_builddir)/src/testing_old/libgnunettesting_old.la
-test_mesh_small_multicast_DEPENDENCIES = \
- libgnunetmesh.la
+test_mesh_small_signal_LDADD = $(ld_mesh_test_lib)
+test_mesh_small_signal_DEPENDENCIES = $(dep_mesh_test_lib)
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_ack_LDADD = $(ld_mesh_test_lib)
+test_mesh_small_speed_ack_DEPENDENCIES = $(dep_mesh_test_lib)
test_mesh_small_speed_SOURCES = \
test_mesh_small.c
-test_mesh_small_speed_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_DEPENDENCIES = \
- libgnunetmesh.la
-
-test_mesh_small_speed_min_SOURCES = \
- test_mesh_small.c
-test_mesh_small_speed_min_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_DEPENDENCIES = \
- libgnunetmesh.la
+test_mesh_small_speed_LDADD = $(ld_mesh_test_lib)
+test_mesh_small_speed_DEPENDENCIES = $(dep_mesh_test_lib)
test_mesh_small_speed_nobuf_SOURCES = \
test_mesh_small.c
-test_mesh_small_speed_nobuf_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_DEPENDENCIES = \
- libgnunetmesh.la
+test_mesh_small_speed_nobuf_LDADD = $(ld_mesh_test_lib)
+test_mesh_small_speed_nobuf_DEPENDENCIES = $(dep_mesh_test_lib)
test_mesh_small_speed_backwards_SOURCES = \
test_mesh_small.c
-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_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_backwards_LDADD = $(ld_mesh_test_lib)
+test_mesh_small_speed_backwards_DEPENDENCIES = $(dep_mesh_test_lib)
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
+test_mesh_small_speed_nobuf_backwards_LDADD = $(ld_mesh_test_lib)
+test_mesh_small_speed_nobuf_backwards_DEPENDENCIES = $(dep_mesh_test_lib)
if ENABLE_TEST_RUN
test_mesh_local_traffic_fwd \
test_mesh_local_traffic_bck \
test_mesh_local_traffic_both \
- test_mesh_2dtorus test_mesh_regex \
- test_mesh_small_unicast test_mesh_small_multicast \
+ test_mesh_2dtorus \
+ test_mesh_small_unicast \
+ test_mesh_small_signal \
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
+ test_mesh_small_speed_backwards
endif
EXTRA_DIST = \
+ mesh.h mesh_protocol.h \
test_mesh.conf \
test_mesh_2dtorus.conf \
- test_mesh_small.conf \
- regex_profiler_test.conf
+ test_mesh_small.conf