-INCLUDES = -I$(top_srcdir)/src/include
+AM_CPPFLAGS = -I$(top_srcdir)/src/include
if MINGW
WINFLAGS = -Wl,--no-undefined -Wl,--export-all-symbols
AM_CLFAGS = -g
-if HAVE_EXPERIMENTAL
- noinst_LIB_EXP = libgnunetmesh2test.a
- EXP_LIB = libgnunetmesh2.la
- EXP_LIBEXEC = gnunet-service-mesh-new
- EXP_TESTS = \
- test_mesh2_local \
- test_mesh2_small_forward \
- test_mesh2_small_signal \
- test_mesh2_small_speed \
- test_mesh2_small_speed_ack \
- test_mesh2_small_speed_nobuf \
- test_mesh2_small_speed_backwards \
- test_mesh2_small_speed_nobuf_backwards
-endif
-
libexec_PROGRAMS = \
gnunet-service-mesh $(EXP_LIBEXEC)
$(top_builddir)/src/block/libgnunetblock.la \
$(top_builddir)/src/util/libgnunetutil.la
+
libgnunetmesh_la_SOURCES = \
mesh_api.c mesh_common.c
libgnunetmesh_la_LIBADD = \
$(LTLIBINTL)
libgnunetmesh_la_LDFLAGS = \
$(GN_LIB_LDFLAGS) $(WINFLAGS) \
- -version-info 2:1:1
-
-libgnunetmesh2_la_SOURCES = \
- mesh2_api.c mesh_common.c
-libgnunetmesh2_la_LIBADD = \
- $(top_builddir)/src/util/libgnunetutil.la \
- $(XLIB) \
- $(LTLIBINTL)
-libgnunetmesh2_la_LDFLAGS = \
- $(GN_LIB_LDFLAGS) $(WINFLAGS) \
- -version-info 2:2:1
-
-
-gnunet_service_mesh_SOURCES = \
- gnunet-service-mesh.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/statistics/libgnunetstatistics.la \
- $(top_builddir)/src/regex/libgnunetregex.la \
- $(top_builddir)/src/util/libgnunetutil.la \
- $(top_builddir)/src/core/libgnunetcore.la \
- $(top_builddir)/src/dht/libgnunetdht.la \
- $(top_builddir)/src/block/libgnunetblock.la
-gnunet_service_mesh_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 \
- $(top_builddir)/src/regex/libgnunetregex.la
-if LINUX
-gnunet_service_mesh_LDFLAGS = -lrt
-endif
+ -version-info 4:0:0
gnunet_mesh_SOURCES = \
gnunet-mesh.c
gnunet_mesh_DEPENDENCIES = \
libgnunetmesh.la
-gnunet_service_mesh_new_SOURCES = \
- gnunet-service-mesh-new.c \
+gnunet_service_mesh_SOURCES = \
+ gnunet-service-mesh_tunnel.c \
+ gnunet-service-mesh_connection.c \
+ gnunet-service-mesh_channel.c \
+ gnunet-service-mesh_local.c \
+ gnunet-service-mesh_peer.c \
+ gnunet-service-mesh_dht.c \
mesh_path.c \
- mesh_common.c
-gnunet_service_mesh_new_CFLAGS = $(AM_CFLAGS)
-gnunet_service_mesh_new_LDADD = \
+ mesh_common.c \
+ gnunet-service-mesh.c
+gnunet_service_mesh_CFLAGS = $(AM_CFLAGS)
+gnunet_service_mesh_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
-gnunet_service_mesh_new_DEPENDENCIES = \
+gnunet_service_mesh_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
if LINUX
-gnunet_service_mesh_new_LDFLAGS = -lrt
+ gnunet_service_mesh_LDFLAGS = -lrt
endif
+
if HAVE_TESTING
-noinst_LIBRARIES = libgnunetmeshtest.a $(noinst_LIB_EXP)
+ noinst_LIBRARIES = libgnunetmeshtest.a $(noinst_LIB_EXP)
endif
libgnunetmeshtest_a_SOURCES = \
libgnunetmeshtest_a_DEPENDENCIES = \
libgnunetmesh.la
-libgnunetmesh2test_a_SOURCES = \
- mesh2_test_lib.c mesh2_test_lib.h
-libgnunetmesh2test_a_LIBADD = \
- $(top_builddir)/src/util/libgnunetutil.la \
- $(top_builddir)/src/testbed/libgnunettestbed.la \
- $(top_builddir)/src/mesh/libgnunetmesh2.la
-libgnunetmesh2test_a_DEPENDENCIES = \
- libgnunetmesh2.la
-
if HAVE_TESTING
check_PROGRAMS = \
- test_mesh_api \
- test_mesh_tree_api \
- test_mesh_local_1 \
- test_mesh_local_2 \
- test_mesh_local_traffic_fwd \
- test_mesh_local_traffic_bck \
- test_mesh_local_traffic_both \
- test_mesh_2dtorus \
- test_mesh_small_unicast \
- test_mesh_small_signal \
- test_mesh_small_speed \
- test_mesh_small_speed_nobuf \
- test_mesh_small_speed_backwards \
- test_mesh_small_speed_nobuf_backwards \
- test_mesh_small_speed_ack \
- $(EXP_TESTS)
+ test_mesh_single \
+ test_mesh_local \
+ test_mesh_small_forward \
+ test_mesh_small_signal \
+ test_mesh_small_speed \
+ test_mesh_small_speed_ack \
+ test_mesh_small_speed_backwards \
+ test_mesh_small_speed_reliable \
+ test_mesh_small_speed_reliable_backwards
endif
-test_mesh_api_SOURCES = \
- test_mesh_api.c
-test_mesh_api_LDADD = \
- $(top_builddir)/src/util/libgnunetutil.la \
- $(top_builddir)/src/testing/libgnunettesting.la \
- $(top_builddir)/src/mesh/libgnunetmesh.la
-test_mesh_api_DEPENDENCIES = \
- libgnunetmesh.la \
- $(top_builddir)/src/util/libgnunetutil.la
-
-test_mesh_tree_api_SOURCES = \
- test_mesh_tree_api.c
-test_mesh_tree_api_LDADD = \
- $(top_builddir)/src/util/libgnunetutil.la \
- $(top_builddir)/src/dht/libgnunetdht.la
-test_mesh_tree_api_DEPENDENCIES = \
- libgnunetmesh.la \
- $(top_builddir)/src/dht/libgnunetdht.la
-
-test_mesh_local_1_SOURCES = \
- test_mesh_local_1.c
-test_mesh_local_1_LDADD = \
- $(top_builddir)/src/util/libgnunetutil.la \
- $(top_builddir)/src/testing/libgnunettesting.la \
- $(top_builddir)/src/mesh/libgnunetmesh.la
-test_mesh_local_1_DEPENDENCIES = \
- libgnunetmesh.la
-
-test_mesh_local_2_SOURCES = \
- test_mesh_local_2.c
-test_mesh_local_2_LDADD = \
- $(top_builddir)/src/util/libgnunetutil.la \
- $(top_builddir)/src/testing/libgnunettesting.la \
- $(top_builddir)/src/mesh/libgnunetmesh.la
-test_mesh_local_2_DEPENDENCIES = \
- libgnunetmesh.la
-
-test_mesh_local_traffic_fwd_SOURCES = \
- test_mesh_local_traffic.c
-test_mesh_local_traffic_fwd_LDADD = \
- $(top_builddir)/src/util/libgnunetutil.la \
- $(top_builddir)/src/testing/libgnunettesting.la \
- $(top_builddir)/src/mesh/libgnunetmesh.la
-test_mesh_local_traffic_fwd_DEPENDENCIES = \
- libgnunetmesh.la
-
-test_mesh_local_traffic_bck_SOURCES = \
- test_mesh_local_traffic.c
-test_mesh_local_traffic_bck_LDADD = \
- $(top_builddir)/src/util/libgnunetutil.la \
- $(top_builddir)/src/testing/libgnunettesting.la \
- $(top_builddir)/src/mesh/libgnunetmesh.la
-test_mesh_local_traffic_bck_DEPENDENCIES = \
- libgnunetmesh.la
-
-test_mesh_local_traffic_both_SOURCES = \
- test_mesh_local_traffic.c
-test_mesh_local_traffic_both_LDADD = \
- $(top_builddir)/src/util/libgnunetutil.la \
- $(top_builddir)/src/testing/libgnunettesting.la \
- $(top_builddir)/src/mesh/libgnunetmesh.la
-test_mesh_local_traffic_both_DEPENDENCIES = \
- libgnunetmesh.la
-
-
ld_mesh_test_lib = \
+ $(top_builddir)/src/util/libgnunetutil.la \
+ $(top_builddir)/src/testing/libgnunettesting.la \
$(top_builddir)/src/mesh/libgnunetmeshtest.a \
$(top_builddir)/src/mesh/libgnunetmesh.la \
- $(top_builddir)/src/testbed/libgnunettestbed.la \
- $(top_builddir)/src/util/libgnunetutil.la
+ $(top_builddir)/src/testbed/libgnunettestbed.la
dep_mesh_test_lib = \
- libgnunetmeshtest.a \
- libgnunetmesh.la
+ libgnunetmesh.la \
+ libgnunetmeshtest.a
+
+test_mesh_single_SOURCES = \
+ test_mesh_single.c
+test_mesh_single_LDADD = $(ld_mesh_test_lib)
+test_mesh_single_DEPENDENCIES = $(dep_mesh_test_lib)
-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_local_SOURCES = \
+ test_mesh_local.c
+test_mesh_local_LDADD = $(ld_mesh_test_lib)
+test_mesh_local_DEPENDENCIES = $(dep_mesh_test_lib)
-test_mesh_small_unicast_SOURCES = \
- test_mesh_small.c
-test_mesh_small_unicast_LDADD = $(ld_mesh_test_lib)
-test_mesh_small_unicast_DEPENDENCIES = $(dep_mesh_test_lib)
+test_mesh_small_forward_SOURCES = \
+ test_mesh_small.c
+test_mesh_small_forward_LDADD = $(ld_mesh_test_lib)
+test_mesh_small_forward_DEPENDENCIES = $(dep_mesh_test_lib)
test_mesh_small_signal_SOURCES = \
- test_mesh_small.c
+ test_mesh_small.c
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 = $(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.c
test_mesh_small_speed_LDADD = $(ld_mesh_test_lib)
test_mesh_small_speed_DEPENDENCIES = $(dep_mesh_test_lib)
+test_mesh_small_speed_ack_SOURCES = \
+ test_mesh_small.c
+test_mesh_small_speed_ack_LDADD = $(ld_mesh_test_lib)
+test_mesh_small_speed_ack_DEPENDENCIES = $(dep_mesh_test_lib)
+
test_mesh_small_speed_nobuf_SOURCES = \
- test_mesh_small.c
+ test_mesh_small.c
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.c
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.c
test_mesh_small_speed_nobuf_backwards_LDADD = $(ld_mesh_test_lib)
test_mesh_small_speed_nobuf_backwards_DEPENDENCIES = $(dep_mesh_test_lib)
+test_mesh_small_speed_reliable_SOURCES = \
+ test_mesh_small.c
+test_mesh_small_speed_reliable_LDADD = $(ld_mesh_test_lib)
+test_mesh_small_speed_reliable_DEPENDENCIES = $(dep_mesh_test_lib)
-ld_mesh2_test_lib = \
- $(top_builddir)/src/mesh/libgnunetmesh2test.a \
- $(top_builddir)/src/mesh/libgnunetmesh2.la \
- $(top_builddir)/src/testing/libgnunettesting.la \
- $(top_builddir)/src/testbed/libgnunettestbed.la \
- $(top_builddir)/src/util/libgnunetutil.la
-
-dep_mesh2_test_lib = \
- libgnunetmesh2test.a \
- libgnunetmesh2.la
-
-test_mesh2_local_SOURCES = \
- test_mesh2_local.c
-test_mesh2_local_LDADD = $(ld_mesh2_test_lib)
-test_mesh2_local_DEPENDENCIES = $(dep_mesh2_test_lib)
-
-test_mesh2_small_forward_SOURCES = \
- test_mesh2_small.c
-test_mesh2_small_forward_LDADD = $(ld_mesh2_test_lib)
-test_mesh2_small_forward_DEPENDENCIES = $(dep_mesh2_test_lib)
-
-test_mesh2_small_signal_SOURCES = \
- test_mesh2_small.c
-test_mesh2_small_signal_LDADD = $(ld_mesh2_test_lib)
-test_mesh2_small_signal_DEPENDENCIES = $(dep_mesh2_test_lib)
-
-test_mesh2_small_speed_SOURCES = \
- test_mesh2_small.c
-test_mesh2_small_speed_LDADD = $(ld_mesh2_test_lib)
-test_mesh2_small_speed_DEPENDENCIES = $(dep_mesh2_test_lib)
-
-test_mesh2_small_speed_ack_SOURCES = \
- test_mesh2_small.c
-test_mesh2_small_speed_ack_LDADD = $(ld_mesh2_test_lib)
-test_mesh2_small_speed_ack_DEPENDENCIES = $(dep_mesh2_test_lib)
-
-test_mesh2_small_speed_nobuf_SOURCES = \
- test_mesh2_small.c
-test_mesh2_small_speed_nobuf_LDADD = $(ld_mesh2_test_lib)
-test_mesh2_small_speed_nobuf_DEPENDENCIES = $(dep_mesh2_test_lib)
-
-test_mesh2_small_speed_backwards_SOURCES = \
- test_mesh2_small.c
-test_mesh2_small_speed_backwards_LDADD = $(ld_mesh2_test_lib)
-test_mesh2_small_speed_backwards_DEPENDENCIES = $(dep_mesh2_test_lib)
-
-test_mesh2_small_speed_nobuf_backwards_SOURCES = \
- test_mesh2_small.c
-test_mesh2_small_speed_nobuf_backwards_LDADD = $(ld_mesh2_test_lib)
-test_mesh2_small_speed_nobuf_backwards_DEPENDENCIES = $(dep_mesh2_test_lib)
+test_mesh_small_speed_reliable_backwards_SOURCES = \
+ test_mesh_small.c
+test_mesh_small_speed_reliable_backwards_LDADD = $(ld_mesh_test_lib)
+test_mesh_small_speed_reliable_backwards_DEPENDENCIES = $(dep_mesh_test_lib)
if ENABLE_TEST_RUN
TESTS = \
- $(EXP_TESTS) \
- test_mesh_api \
- test_mesh_tree_api \
- test_mesh_local_1 test_mesh_local_2 \
- test_mesh_local_traffic_fwd \
- test_mesh_local_traffic_bck \
- test_mesh_local_traffic_both \
- test_mesh_2dtorus \
- test_mesh_small_unicast \
- test_mesh_small_signal \
- test_mesh_small_speed \
- test_mesh_small_speed_nobuf \
- test_mesh_small_speed_backwards
+ $(check_PROGRAMS)
endif
EXTRA_DIST = \
mesh.h mesh_protocol.h \
- test_mesh.conf \
- test_mesh_2dtorus.conf \
- test_mesh_small.conf
+ test_mesh.conf
projects / oweals / gnunet.git / blobdiff