Fixed a memory leak when receiving a second create path for the same tunnel

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

diff --git a/src/mesh/Makefile.am b/src/mesh/Makefile.am
index b7b248f39d6c215ecdb14f5324d3ee81349cddcc..7f042951d90aaf88ea9c4b20f86ed47e165a7166 100644 (file)
--- a/src/mesh/Makefile.am
+++ b/src/mesh/Makefile.am
@@ -9,15 +9,122 @@ if USE_COVERAGE
   XLIB = -lgcov
 endif
 
+AM_CLFAGS = -g
+
+bin_PROGRAMS = \
+ gnunet-service-mesh
 
 lib_LTLIBRARIES = \
-  libgnunetmesh.la
+  libgnunetmesh.la \
+  libgnunetmeshnew.la
 
 libgnunetmesh_la_SOURCES = \
-  mesh_api.c
+  mesh_api.c mesh_protocol.h
 libgnunetmesh_la_LIBADD = \
   $(top_builddir)/src/util/libgnunetutil.la \
+  $(top_builddir)/src/transport/libgnunettransport.la \
+  $(top_builddir)/src/core/libgnunetcore.la \
   $(GN_LIBINTL) $(XLIB)
 libgnunetmesh_la_LDFLAGS = \
   $(GN_LIB_LDFLAGS) $(WINFLAGS) \
   -version-info 0:0:0
+
+gnunet_service_mesh_SOURCES = \
+ gnunet-service-mesh.c mesh_tunnel_tree.c
+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
+
+libgnunetmeshnew_la_SOURCES = \
+  mesh_api_new.c mesh.h
+libgnunetmeshnew_la_LIBADD = \
+  $(top_builddir)/src/util/libgnunetutil.la \
+  $(XLIB)
+libgnunetmeshnew_la_LDFLAGS = \
+  $(GN_LIB_LDFLAGS) $(WINFLAGS) \
+  -version-info 0:0:0
+
+check_PROGRAMS = \
+ test_mesh_api \
+ test_mesh_path_api \
+ test_mesh_local_1 \
+ test_mesh_local_2 \
+ 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
+test_mesh_api_DEPENDENCIES = \
+  libgnunetmeshnew.la \
+   $(top_builddir)/src/util/libgnunetutil.la
+
+test_mesh_path_api_SOURCES = \
+ test_mesh_path_api.c mesh_tunnel_tree.c
+test_mesh_path_api_LDADD = \
+ $(top_builddir)/src/util/libgnunetutil.la \
+  $(top_builddir)/src/dht/libgnunetdht.la
+test_mesh_path_api_DEPENDENCIES = \
+  libgnunetmeshnew.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
+test_mesh_local_1_DEPENDENCIES = \
+  libgnunetmeshnew.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
+test_mesh_local_2_DEPENDENCIES = \
+  libgnunetmeshnew.la
+
+test_mesh_small_unicast_SOURCES = \
+ test_mesh_small.c
+test_mesh_small_unicast_LDADD = \
+  $(top_builddir)/src/mesh/libgnunetmeshnew.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_SOURCES = \
+ test_mesh_small.c
+test_mesh_small_unicast_far_LDADD = \
+  $(top_builddir)/src/mesh/libgnunetmeshnew.la \
+  $(top_builddir)/src/util/libgnunetutil.la \
+  $(top_builddir)/src/testing/libgnunettesting.la
+test_mesh_small_unicast_far_DEPENDENCIES = \
+  libgnunetmeshnew.la
+
+test_mesh_small_multicast_SOURCES = \
+ test_mesh_small.c
+test_mesh_small_multicast_LDADD = \
+  $(top_builddir)/src/mesh/libgnunetmeshnew.la \
+  $(top_builddir)/src/util/libgnunetutil.la \
+  $(top_builddir)/src/testing/libgnunettesting.la
+test_mesh_small_multicast_DEPENDENCIES = \
+  libgnunetmeshnew.la
+
+
+if ENABLE_TEST_RUN
+TESTS = test_mesh_api test_mesh_path_api test_mesh_local_1 test_mesh_local_2 test_mesh_small_unicast
+endif
+
+EXTRA_DIST = \
+  test_mesh.conf \
+  test_mesh_path.conf \
+  test_mesh_small.conf
\ No newline at end of file