- fix error check

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

diff --git a/src/mesh/Makefile.am b/src/mesh/Makefile.am
index e116b889a59913df8241e30a6908ea5a7b648ae9..cabf5c1e5c64c1d59246361db7051ad5f7602fe2 100644 (file)
--- a/src/mesh/Makefile.am
+++ b/src/mesh/Makefile.am
@@ -14,40 +14,35 @@ pkgcfgdir= $(pkgdatadir)/config.d/
 pkgcfg_DATA = \
   mesh.conf
 
+plugindir = $(libdir)/gnunet
+
 AM_CLFAGS = -g
 
 bin_PROGRAMS = \
- gnunet-service-mesh  gnunet-service-mesh_new
+ gnunet-service-mesh
 
 lib_LTLIBRARIES = \
-  libgnunetmesh.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/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/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
+  libgnunetmesh.la \
+  libgnunetmeshblock.la
+
+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/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 = \
+ 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) \
@@ -56,12 +51,48 @@ 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
+
 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 \
@@ -71,6 +102,7 @@ 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 \
@@ -80,7 +112,7 @@ 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
+ $(top_builddir)/src/dht/libgnunetdht.la
 test_mesh_tree_api_DEPENDENCIES = \
   libgnunetmesh.la \
   $(top_builddir)/src/dht/libgnunetdht.la
@@ -89,6 +121,7 @@ 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
@@ -97,16 +130,55 @@ 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
+
+
 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 = \
@@ -144,8 +216,14 @@ 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
 endif
 
 EXTRA_DIST = \