From cf19b5082fe8de33e38957f54d28647635b46b60 Mon Sep 17 00:00:00 2001 From: Bart Polot Date: Fri, 28 Jun 2013 14:34:55 +0000 Subject: Replace mesh with new version --- src/mesh/Makefile.am | 279 ++++++++------------------------------------------- 1 file changed, 42 insertions(+), 237 deletions(-) (limited to 'src/mesh/Makefile.am') diff --git a/src/mesh/Makefile.am b/src/mesh/Makefile.am index c0d66ace3..e1c607d7f 100644 --- a/src/mesh/Makefile.am +++ b/src/mesh/Makefile.am @@ -20,21 +20,6 @@ plugindir = $(libdir)/gnunet 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) @@ -58,6 +43,7 @@ libgnunet_plugin_block_mesh_la_DEPENDENCIES = \ $(top_builddir)/src/block/libgnunetblock.la \ $(top_builddir)/src/util/libgnunetutil.la + libgnunetmesh_la_SOURCES = \ mesh_api.c mesh_common.c libgnunetmesh_la_LIBADD = \ @@ -66,41 +52,7 @@ 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 3:0:0 gnunet_mesh_SOURCES = \ gnunet-mesh.c @@ -110,25 +62,25 @@ gnunet_mesh_LDADD = \ gnunet_mesh_DEPENDENCIES = \ libgnunetmesh.la -gnunet_service_mesh_new_SOURCES = \ - gnunet-service-mesh-new.c \ +gnunet_service_mesh_SOURCES = \ + gnunet-service-mesh.c \ mesh_path.c \ mesh_common.c -gnunet_service_mesh_new_CFLAGS = $(AM_CFLAGS) -gnunet_service_mesh_new_LDADD = \ +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 @@ -144,222 +96,75 @@ libgnunetmeshtest_a_LIBADD = \ 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_local \ + test_mesh_small_forward \ + test_mesh_small_signal \ + test_mesh_small_speed \ + test_mesh_small_speed_ack \ + test_mesh_small_speed_nobuf \ + test_mesh_small_speed_backwards \ + test_mesh_small_speed_nobuf_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/mesh/libgnunetmeshtest.a \ - $(top_builddir)/src/mesh/libgnunetmesh.la \ + $(top_builddir)/src/util/libgnunetutil.la \ + $(top_builddir)/src/testing/libgnunettesting.la \ $(top_builddir)/src/testbed/libgnunettestbed.la \ - $(top_builddir)/src/util/libgnunetutil.la + $(top_builddir)/src/mesh/libgnunetmesh.la \ + $(top_builddir)/src/mesh/libgnunetmeshtest.a dep_mesh_test_lib = \ - libgnunetmeshtest.a \ - libgnunetmesh.la + libgnunetmesh.la \ + libgnunetmeshtest.a -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) -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) - - 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 -- cgit v1.2.3