- 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 35f06f8d2eeae8b429f856b8c8ab2bca71e29e6a..1406c54ff3df2f67d185ac13ac7a9810d1b4370f 100644 (file)
--- a/src/mesh/Makefile.am
+++ b/src/mesh/Makefile.am
@@ -29,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 = \
@@ -99,6 +84,7 @@ endif
 
 if HAVE_TESTING
  noinst_LIBRARIES = libgnunetmeshtest.a $(noinst_LIB_EXP)
+ noinst_PROGRAMS = gnunet-mesh-profiler
 endif
 
 libgnunetmeshtest_a_SOURCES = \
@@ -115,10 +101,11 @@ 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_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
@@ -128,11 +115,20 @@ ld_mesh_test_lib = \
   $(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/testbed/libgnunettestbed.la \
+  $(top_builddir)/src/statistics/libgnunetstatistics.la
 
 dep_mesh_test_lib = \
   libgnunetmesh.la \
-  libgnunetmeshtest.a
+  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
@@ -154,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)