- Remove deprecated code, coverity 10236

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

diff --git a/src/mesh/Makefile.am b/src/mesh/Makefile.am
index d78cf004ee320681c93025d2fa5864bf26b6485c..2c9fd8db4f89c27330e2e063b09629dfda424f4c 100644 (file)
--- a/src/mesh/Makefile.am
+++ b/src/mesh/Makefile.am
@@ -19,10 +19,11 @@ plugindir = $(libdir)/gnunet
 AM_CLFAGS = -g
 
 bin_PROGRAMS = \
- gnunet-service-mesh  gnunet-service-mesh_new
+ gnunet-service-mesh
 
 lib_LTLIBRARIES = \
-  libgnunetmesh.la
+  libgnunetmesh.la \
+  libgnunetmeshblock.la
 
 plugin_LTLIBRARIES = \
  libgnunet_plugin_block_mesh.la
@@ -30,42 +31,18 @@ plugin_LTLIBRARIES = \
 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 = \
- $(top_builddir)/src/block/libgnunetblock.la
-
-
-gnunet_service_mesh_SOURCES = \
- gnunet-service-mesh.c \
- mesh_tunnel_tree.c mesh_tunnel_tree.h
-gnunet_service_mesh_LDADD = \
-  $(top_builddir)/src/core/libgnunetcore.la \
-  $(top_builddir)/src/dht/libgnunetdht.la \
-  $(top_builddir)/src/block/libgnunetblock.la \
-  $(top_builddir)/src/util/libgnunetutil.la
- gnunet_service_mesh_DEPENDENCIES = \
-  $(top_builddir)/src/core/libgnunetcore.la\
-  $(top_builddir)/src/dht/libgnunetdht.la \
-  $(top_builddir)/src/util/libgnunetutil.la
-
-gnunet_service_mesh_new_SOURCES = \
- gnunet-service-mesh_new.c \
- mesh_tunnel_tree.c mesh_tunnel_tree.h
-gnunet_service_mesh_new_LDADD = \
-  $(top_builddir)/src/core/libgnunetcore.la\
-  $(top_builddir)/src/dht/libgnunetdht.la \
-  $(top_builddir)/src/regex/libgnunetregex.la \
-  $(top_builddir)/src/util/libgnunetutil.la
- gnunet_service_mesh_new_DEPENDENCIES = \
-  $(top_builddir)/src/core/libgnunetcore.la\
-  $(top_builddir)/src/dht/libgnunetdht.la \
-  $(top_builddir)/src/util/libgnunetutil.la
+ libgnunetmeshblock.la \
+ $(top_builddir)/src/block/libgnunetblock.la \
+ $(top_builddir)/src/util/libgnunetutil.la
 
 libgnunetmesh_la_SOURCES = \
-  mesh_api.c mesh.h mesh_protocol.h
+  mesh_api.c mesh_common.c
 libgnunetmesh_la_LIBADD = \
   $(top_builddir)/src/util/libgnunetutil.la \
   $(XLIB) \
@@ -74,12 +51,51 @@ libgnunetmesh_la_LDFLAGS = \
   $(GN_LIB_LDFLAGS) $(WINFLAGS) \
   -version-info 1:0:0
 
+libgnunetmeshblock_la_SOURCES = \
+  mesh_block_lib.c
+libgnunetmeshblock_la_LIBADD = \
+  $(top_builddir)/src/util/libgnunetutil.la \
+  $(XLIB) \
+  $(LTLIBINTL)
+libgnunetmeshblock_la_LDFLAGS = \
+  $(GN_LIB_LDFLAGS) $(WINFLAGS) \
+  -version-info 1:0:0
+
+gnunet_service_mesh_SOURCES = \
+ gnunet-service-mesh.c \
+ mesh_tunnel_tree.c \
+ mesh_common.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 \
+  $(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/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
+if LINUX
+gnunet_service_mesh_LDFLAGS = -lrt
+endif
+
 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_regex \
  test_mesh_small_unicast \
  test_mesh_small_multicast \
  test_mesh_small_speed \
@@ -122,12 +138,50 @@ test_mesh_local_2_LDADD = \
 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
+
+
 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 = \
+  $(top_builddir)/src/mesh/libgnunetmesh.la \
+  $(top_builddir)/src/util/libgnunetutil.la \
+  $(top_builddir)/src/testing_old/libgnunettesting_old.la
+test_mesh_regex_DEPENDENCIES = \
+  libgnunetmesh.la
+
+
 test_mesh_small_unicast_SOURCES = \
  test_mesh_small.c
 test_mesh_small_unicast_LDADD = \
@@ -165,8 +219,15 @@ test_mesh_small_speed_ack_DEPENDENCIES = \
   libgnunetmesh.la
 
 if ENABLE_TEST_RUN
-TESTS = test_mesh_api test_mesh_tree_api test_mesh_local_1 test_mesh_local_2 \
- test_mesh_2dtorus test_mesh_small_unicast test_mesh_small_multicast
+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_regex \
+ test_mesh_small_unicast test_mesh_small_multicast \
+ test_mesh_small_speed
 endif
 
 EXTRA_DIST = \