From: Christian Grothoff <christian@grothoff.org>
Date: Wed, 27 Jun 2012 19:38:59 +0000 (+0000)
Subject: -LRN: new mesh build fixes
X-Git-Tag: initial-import-from-subversion-38251~12764
X-Git-Url: https://git.librecmc.org/?a=commitdiff_plain;h=5e0c21e1204115258a743bc3c03b8308af6a7c48;p=oweals%2Fgnunet.git

-LRN: new mesh build fixes
---

diff --git a/src/mesh/Makefile.am b/src/mesh/Makefile.am
index 61ef32974..419ef40f9 100644
--- 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