- changes to round system, stats collection

[oweals/gnunet.git] / src / mesh / Makefile.am

diff --git a/src/mesh/Makefile.am b/src/mesh/Makefile.am
index df1c74c8784774b20a2a7fc8a9877b92bc7cbc8b..1406c54ff3df2f67d185ac13ac7a9810d1b4370f 100644 (file)
--- a/src/mesh/Makefile.am
+++ b/src/mesh/Makefile.am
@@ -20,12 +20,6 @@ plugindir = $(libdir)/gnunet
 
 AM_CLFAGS = -g
 
-EXP_LIB = \
- libgnunetmeshenc.la
-
-EXP_LIBEXEC = \
- gnunet-service-mesh-enc
-
 libexec_PROGRAMS = \
  gnunet-service-mesh $(EXP_LIBEXEC)
 
@@ -35,21 +29,6 @@ bin_PROGRAMS = \
 lib_LTLIBRARIES = \
   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/block/libgnunetblock.la \
- $(top_builddir)/src/util/libgnunetutil.la
-libgnunet_plugin_block_mesh_la_LDFLAGS = \
- $(GN_PLUGIN_LDFLAGS)
-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 = \
@@ -58,19 +37,7 @@ libgnunetmesh_la_LIBADD = \
   $(LTLIBINTL)
 libgnunetmesh_la_LDFLAGS = \
   $(GN_LIB_LDFLAGS) $(WINFLAGS) \
-  -version-info 3:0:0
-
-
-libgnunetmeshenc_la_SOURCES = \
-  mesh_api_enc.c mesh_common.c
-libgnunetmeshenc_la_LIBADD = \
-  $(top_builddir)/src/util/libgnunetutil.la \
-  $(XLIB) \
-  $(LTLIBINTL)
-libgnunetmeshenc_la_LDFLAGS = \
-  $(GN_LIB_LDFLAGS) $(WINFLAGS) \
-  -version-info 1:0:0
-
+  -version-info 4:0:0
 
 gnunet_mesh_SOURCES = \
   gnunet-mesh.c
@@ -81,56 +48,43 @@ gnunet_mesh_DEPENDENCIES = \
   libgnunetmesh.la
 
 gnunet_service_mesh_SOURCES = \
- gnunet-service-mesh.c \
- mesh_path.c \
- mesh_common.c
+ gnunet-service-mesh_tunnel.c gnunet-service-mesh_tunnel.h \
+ gnunet-service-mesh_connection.c gnunet-service-mesh_connection.h \
+ gnunet-service-mesh_channel.c gnunet-service-mesh_channel.h \
+ gnunet-service-mesh_local.c gnunet-service-mesh_local.h \
+ gnunet-service-mesh_peer.c gnunet-service-mesh_peer.h \
+ gnunet-service-mesh_dht.c gnunet-service-mesh_dht.h \
+ gnunet-service-mesh_hello.c gnunet-service-mesh_hello.h \
+ mesh_path.c mesh_path.h \
+ 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/transport/libgnunettransport.la \
   $(top_builddir)/src/core/libgnunetcore.la \
   $(top_builddir)/src/dht/libgnunetdht.la \
   $(top_builddir)/src/statistics/libgnunetstatistics.la \
+  $(top_builddir)/src/peerinfo/libgnunetpeerinfo.la \
+  $(top_builddir)/src/hello/libgnunethello.la \
   $(top_builddir)/src/block/libgnunetblock.la
 gnunet_service_mesh_DEPENDENCIES = \
   $(top_builddir)/src/util/libgnunetutil.la \
+  $(top_builddir)/src/transport/libgnunettransport.la \
   $(top_builddir)/src/core/libgnunetcore.la \
   $(top_builddir)/src/dht/libgnunetdht.la \
   $(top_builddir)/src/statistics/libgnunetstatistics.la \
+  $(top_builddir)/src/peerinfo/libgnunetpeerinfo.la \
+  $(top_builddir)/src/hello/libgnunethello.la \
   $(top_builddir)/src/block/libgnunetblock.la
 if LINUX
   gnunet_service_mesh_LDFLAGS = -lrt
 endif
 
-gnunet_service_mesh_enc_SOURCES = \
- gnunet-service-mesh-enc.c \
- gnunet-service-mesh_tunnel.c \
- gnunet-service-mesh_channel.c \
- gnunet-service-mesh_connection.c \
- gnunet-service-mesh_peer.c \
- gnunet-service-mesh_dht.c \
- gnunet-service-mesh_local.c \
- mesh_path.c \
- mesh_common.c
-gnunet_service_mesh_enc_CFLAGS = $(AM_CFLAGS)
-gnunet_service_mesh_enc_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_enc_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_enc_LDFLAGS = -lrt
-endif
-
 
 if HAVE_TESTING
  noinst_LIBRARIES = libgnunetmeshtest.a $(noinst_LIB_EXP)
+ noinst_PROGRAMS = gnunet-mesh-profiler
 endif
 
 libgnunetmeshtest_a_SOURCES = \
@@ -138,21 +92,20 @@ libgnunetmeshtest_a_SOURCES = \
 libgnunetmeshtest_a_LIBADD = \
  $(top_builddir)/src/util/libgnunetutil.la \
  $(top_builddir)/src/testbed/libgnunettestbed.la \
- $(top_builddir)/src/mesh/libgnunetmeshenc.la
+ $(top_builddir)/src/mesh/libgnunetmesh.la
 libgnunetmeshtest_a_DEPENDENCIES = \
-  libgnunetmeshenc.la
+  libgnunetmesh.la
 
 if HAVE_TESTING
 check_PROGRAMS = \
   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_nobuf  \
-  test_mesh_small_speed_backwards  \
-  test_mesh_small_speed_nobuf_backwards \
+  test_mesh_small_signal \
+  test_mesh_small_keepalive \
+  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
@@ -161,12 +114,21 @@ 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/libgnunetmeshenc.la \
-  $(top_builddir)/src/testbed/libgnunettestbed.la
+  $(top_builddir)/src/mesh/libgnunetmesh.la \
+  $(top_builddir)/src/testbed/libgnunettestbed.la \
+  $(top_builddir)/src/statistics/libgnunetstatistics.la
 
 dep_mesh_test_lib = \
-  libgnunetmeshenc.la \
-  libgnunetmeshtest.a
+  libgnunetmesh.la \
+  libgnunetmeshtest.a \
+  $(top_builddir)/src/statistics/libgnunetstatistics.la
+
+
+gnunet_mesh_profiler_SOURCES = \
+  gnunet-mesh-profiler.c
+gnunet_mesh_profiler_LDADD = $(ld_mesh_test_lib)
+gnunet_mesh_profiler_DEPENDENCIES = $(dep_mesh_test_lib)
+
 
 test_mesh_single_SOURCES = \
   test_mesh_single.c
@@ -188,6 +150,11 @@ test_mesh_small_signal_SOURCES = \
 test_mesh_small_signal_LDADD = $(ld_mesh_test_lib)
 test_mesh_small_signal_DEPENDENCIES = $(dep_mesh_test_lib)
 
+test_mesh_small_keepalive_SOURCES = \
+  test_mesh_small.c
+test_mesh_small_keepalive_LDADD = $(ld_mesh_test_lib)
+test_mesh_small_keepalive_DEPENDENCIES = $(dep_mesh_test_lib)
+
 test_mesh_small_speed_SOURCES = \
   test_mesh_small.c
 test_mesh_small_speed_LDADD = $(ld_mesh_test_lib)
@@ -225,10 +192,13 @@ test_mesh_small_speed_reliable_backwards_DEPENDENCIES = $(dep_mesh_test_lib)
 
 
 if ENABLE_TEST_RUN
+AM_TESTS_ENVIRONMENT=export GNUNET_PREFIX=$${GNUNET_PREFIX:-@libdir@};export PATH=$${GNUNET_PREFIX:-@prefix@}/bin:$$PATH;
 TESTS = \
  $(check_PROGRAMS)
 endif
 
 EXTRA_DIST = \
   mesh.h mesh_protocol.h \
-  test_mesh.conf
+  test_mesh.conf \
+  test_mesh_drop.conf
+