X-Git-Url: https://git.librecmc.org/?a=blobdiff_plain;f=src%2Fmesh%2FMakefile.am;h=610353610618db206df69d864e932eff5087ed8a;hb=9935914f3a3c092954ff7c741524b3624b87063c;hp=4e7e5c323585a9e54f6566eb367a31a42793446b;hpb=9aa7853d6c5fa43d0384ae79476bb45242af61fb;p=oweals%2Fgnunet.git

diff --git a/src/mesh/Makefile.am b/src/mesh/Makefile.am
index 4e7e5c323..610353610 100644
--- a/src/mesh/Makefile.am
+++ b/src/mesh/Makefile.am
@@ -9,28 +9,22 @@ if USE_COVERAGE
   XLIB = -lgcov
 endif
 
+pkgcfgdir= $(pkgdatadir)/config.d/
+
+pkgcfg_DATA = \
+  mesh.conf
+
 AM_CLFAGS = -g
 
 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/transport/libgnunettransport.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
+ 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 \
@@ -40,91 +34,88 @@ 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 mesh_protocol.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
 
 check_PROGRAMS = \
  test_mesh_api \
- test_mesh_path_api \
+ test_mesh_tree_api \
  test_mesh_local_1 \
  test_mesh_local_2 \
+ test_mesh_2dtorus \
  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 = \
- test_mesh_path_api.c mesh_tunnel_tree.c
-test_mesh_path_api_LDADD = \
+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
-test_mesh_path_api_DEPENDENCIES = \
-  libgnunetmeshnew.la \
+test_mesh_tree_api_DEPENDENCIES = \
+  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_unicast_SOURCES = \
- test_mesh_small.c
-test_mesh_small_unicast_LDADD = \
-  $(top_builddir)/src/mesh/libgnunetmeshnew.la \
+test_mesh_2dtorus_SOURCES = \
+ test_mesh_2dtorus.c
+test_mesh_2dtorus_LDADD = \
   $(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_unicast_SOURCES = \
  test_mesh_small.c
-test_mesh_small_unicast_far_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_unicast_far_DEPENDENCIES = \
-  libgnunetmeshnew.la
+test_mesh_small_unicast_DEPENDENCIES = \
+  libgnunetmesh.la
 
 test_mesh_small_multicast_SOURCES = \
  test_mesh_small.c
 test_mesh_small_multicast_LDADD = \
-  $(top_builddir)/src/mesh/libgnunetmeshnew.la \
+  $(top_builddir)/src/mesh/libgnunetmesh.la \
   $(top_builddir)/src/util/libgnunetutil.la \
   $(top_builddir)/src/testing/libgnunettesting.la
 test_mesh_small_multicast_DEPENDENCIES = \
-  libgnunetmeshnew.la
+  libgnunetmesh.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 test_mesh_small_multicast
+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
 endif
 
 EXTRA_DIST = \
   test_mesh.conf \
-  test_mesh_path.conf \
+  test_mesh_2dtorus.conf \
   test_mesh_small.conf
\ No newline at end of file