Fixed id counters' cycling

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

diff --git a/src/mesh/Makefile.am b/src/mesh/Makefile.am
index 3623a48ad1eb679f4e636031f69a98f4ee244f71..aebe06e6eb90cda12607bec46787f15470602bff 100644 (file)
--- a/src/mesh/Makefile.am
+++ b/src/mesh/Makefile.am
@@ -15,18 +15,7 @@ bin_PROGRAMS = \
  gnunet-service-mesh
 
 lib_LTLIBRARIES = \
-  libgnunetmesh.la \
-  libgnunetmeshnew.la
-
-libgnunetmesh_la_SOURCES = \
-  mesh_api.c mesh_protocol.h
-libgnunetmesh_la_LIBADD = \
-  $(top_builddir)/src/util/libgnunetutil.la \
-  $(top_builddir)/src/core/libgnunetcore.la \
-  $(GN_LIBINTL) $(XLIB)
-libgnunetmesh_la_LDFLAGS = \
-  $(GN_LIB_LDFLAGS) $(WINFLAGS) \
-  -version-info 0:0:0
+  libgnunetmesh.la
 
 gnunet_service_mesh_SOURCES = \
  gnunet-service-mesh.c mesh_tunnel_tree.c
@@ -39,12 +28,12 @@ gnunet_service_mesh_LDADD = \
   $(top_builddir)/src/dht/libgnunetdht.la \
   $(top_builddir)/src/util/libgnunetutil.la
 
-libgnunetmeshnew_la_SOURCES = \
-  mesh_api_new.c mesh.h
-libgnunetmeshnew_la_LIBADD = \
+libgnunetmesh_la_SOURCES = \
+  mesh_api.c mesh.h
+libgnunetmesh_la_LIBADD = \
   $(top_builddir)/src/util/libgnunetutil.la \
   $(XLIB)
-libgnunetmeshnew_la_LDFLAGS = \
+libgnunetmesh_la_LDFLAGS = \
   $(GN_LIB_LDFLAGS) $(WINFLAGS) \
   -version-info 0:0:0
 
@@ -53,16 +42,17 @@ check_PROGRAMS = \
  test_mesh_path_api \
  test_mesh_local_1 \
  test_mesh_local_2 \
- test_mesh_small \
- test_mesh_small_unicast
+ test_mesh_small_unicast \
+ test_mesh_small_unicast_far \
+ test_mesh_small_multicast
 
 test_mesh_api_SOURCES = \
  test_mesh_api.c
 test_mesh_api_LDADD = \
  $(top_builddir)/src/util/libgnunetutil.la \
- $(top_builddir)/src/mesh/libgnunetmeshnew.la
+ $(top_builddir)/src/mesh/libgnunetmesh.la
 test_mesh_api_DEPENDENCIES = \
-  libgnunetmeshnew.la \
+  libgnunetmesh.la \
    $(top_builddir)/src/util/libgnunetutil.la
 
 test_mesh_path_api_SOURCES = \
@@ -71,49 +61,58 @@ test_mesh_path_api_LDADD = \
  $(top_builddir)/src/util/libgnunetutil.la \
   $(top_builddir)/src/dht/libgnunetdht.la
 test_mesh_path_api_DEPENDENCIES = \
-  libgnunetmeshnew.la \
+  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/mesh/libgnunetmeshnew.la
+ $(top_builddir)/src/mesh/libgnunetmesh.la
 test_mesh_local_1_DEPENDENCIES = \
-  libgnunetmeshnew.la
+  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/mesh/libgnunetmeshnew.la
+ $(top_builddir)/src/mesh/libgnunetmesh.la
 test_mesh_local_2_DEPENDENCIES = \
-  libgnunetmeshnew.la
+  libgnunetmesh.la
 
-test_mesh_small_SOURCES = \
+test_mesh_small_unicast_SOURCES = \
  test_mesh_small.c
-test_mesh_small_LDADD = \
-  $(top_builddir)/src/mesh/libgnunetmeshnew.la \
+test_mesh_small_unicast_LDADD = \
+  $(top_builddir)/src/mesh/libgnunetmesh.la \
   $(top_builddir)/src/util/libgnunetutil.la \
   $(top_builddir)/src/testing/libgnunettesting.la
-test_mesh_small_DEPENDENCIES = \
-  libgnunetmeshnew.la
+test_mesh_small_unicast_DEPENDENCIES = \
+  libgnunetmesh.la
 
-test_mesh_small_unicast_SOURCES = \
- test_mesh_small_unicast.c
-test_mesh_small_unicast_LDADD = \
-  $(top_builddir)/src/mesh/libgnunetmeshnew.la \
+test_mesh_small_unicast_far_SOURCES = \
+ test_mesh_small.c
+test_mesh_small_unicast_far_LDADD = \
+  $(top_builddir)/src/mesh/libgnunetmesh.la \
   $(top_builddir)/src/util/libgnunetutil.la \
   $(top_builddir)/src/testing/libgnunettesting.la
-test_mesh_small_unicast_DEPENDENCIES = \
-  libgnunetmeshnew.la
+test_mesh_small_unicast_far_DEPENDENCIES = \
+  libgnunetmesh.la
+
+test_mesh_small_multicast_SOURCES = \
+ test_mesh_small.c
+test_mesh_small_multicast_LDADD = \
+  $(top_builddir)/src/mesh/libgnunetmesh.la \
+  $(top_builddir)/src/util/libgnunetutil.la \
+  $(top_builddir)/src/testing/libgnunettesting.la
+test_mesh_small_multicast_DEPENDENCIES = \
+  libgnunetmesh.la
+
 
 if ENABLE_TEST_RUN
-if HAVE_EXPERIMENTAL
-TESTS = test_mesh_api test_mesh_path_api test_mesh_local_1 test_mesh_local_2 test_mesh_small_unicast
-endif
+TESTS = test_0 test_mesh_api test_mesh_path_api test_mesh_local_1 test_mesh_local_2 test_1 test_mesh_small_unicast
 endif
 
 EXTRA_DIST = \
   test_mesh.conf \
-  test_mesh_path.conf
\ No newline at end of file
+  test_mesh_path.conf \
+  test_mesh_small.conf
\ No newline at end of file