-LRN: new mesh build fixes

diff --git a/src/mesh/Makefile.am b/src/mesh/Makefile.am
index 61ef32974c6c644dc05d4349672833bb9b437913..419ef40f932206f3538196d60e4e2cec936e9255 100644 (file)
--- a/src/mesh/Makefile.am
+++ b/src/mesh/Makefile.am
@@ -31,12 +31,14 @@ 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
+ $(top_builddir)/src/block/libgnunetblock.la \
+ libgnunetmeshblock.la
 
 
 gnunet_service_mesh_SOURCES = \
@@ -47,8 +49,9 @@ gnunet_service_mesh_LDADD = \
   $(top_builddir)/src/dht/libgnunetdht.la \
   $(top_builddir)/src/block/libgnunetblock.la \
   $(top_builddir)/src/util/libgnunetutil.la
- gnunet_service_mesh_DEPENDENCIES = \
+gnunet_service_mesh_DEPENDENCIES = \
   $(top_builddir)/src/core/libgnunetcore.la \
+  $(top_builddir)/src/block/libgnunetblock.la \
   $(top_builddir)/src/dht/libgnunetdht.la \
   $(top_builddir)/src/util/libgnunetutil.la
 
@@ -56,13 +59,15 @@ gnunet_service_mesh_new_SOURCES = \
  gnunet-service-mesh_new.c \
  mesh_tunnel_tree.c mesh_tunnel_tree.h
 gnunet_service_mesh_new_LDADD = \
-  libgnunetmeshblock.la \
+  $(top_builddir)/src/mesh/libgnunetmeshblock.la \
   $(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 = \
+gnunet_service_mesh_new_DEPENDENCIES = \
+  libgnunetmeshblock.la \
   $(top_builddir)/src/core/libgnunetcore.la\
+  $(top_builddir)/src/regex/libgnunetregex.la \
   $(top_builddir)/src/dht/libgnunetdht.la \
   $(top_builddir)/src/util/libgnunetutil.la