-fix fix

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

diff --git a/src/mesh/Makefile.am b/src/mesh/Makefile.am
index 78674751849141c6b53c2fcc9100dec6af4e2261..cf008d43b1de9d257bbd60f41f697feca5f15e12 100644 (file)
--- a/src/mesh/Makefile.am
+++ b/src/mesh/Makefile.am
@@ -11,6 +11,8 @@ endif
 
 pkgcfgdir= $(pkgdatadir)/config.d/
 
+libexecdir= $(pkglibdir)/libexec/
+
 pkgcfg_DATA = \
   mesh.conf
 
@@ -18,8 +20,8 @@ plugindir = $(libdir)/gnunet
 
 AM_CLFAGS = -g
 
-bin_PROGRAMS = \
- gnunet-service-mesh
+libexec_PROGRAMS = \
+ gnunet-service-mesh gnunet-service-mesh-new
 
 lib_LTLIBRARIES = \
   libgnunetmesh.la \
@@ -59,7 +61,7 @@ libgnunetmeshblock_la_LIBADD = \
   $(LTLIBINTL)
 libgnunetmeshblock_la_LDFLAGS = \
   $(GN_LIB_LDFLAGS) $(WINFLAGS) \
-  -version-info 1:0:0
+  -version-info 2:0:0
 
 gnunet_service_mesh_SOURCES = \
  gnunet-service-mesh.c \
@@ -86,8 +88,35 @@ if LINUX
 gnunet_service_mesh_LDFLAGS = -lrt
 endif
 
+gnunet_service_mesh_new_SOURCES = \
+ gnunet-service-mesh-new.c \
+ mesh_tunnel_tree.c \
+ mesh_common.c
+gnunet_service_mesh_new_CFLAGS = $(AM_CFLAGS)
+gnunet_service_mesh_new_LDADD = \
+  $(top_builddir)/src/util/libgnunetutil.la \
+  $(top_builddir)/src/core/libgnunetcore.la \
+  $(top_builddir)/src/dht/libgnunetdht.la \
+  $(top_builddir)/src/statistics/libgnunetstatistics.la \
+  $(top_builddir)/src/block/libgnunetblock.la \
+  $(top_builddir)/src/mesh/libgnunetmeshblock.la \
+  $(top_builddir)/src/regex/libgnunetregex.la
+gnunet_service_mesh_new_DEPENDENCIES = \
+  $(top_builddir)/src/util/libgnunetutil.la \
+  $(top_builddir)/src/core/libgnunetcore.la \
+  $(top_builddir)/src/dht/libgnunetdht.la \
+  $(top_builddir)/src/statistics/libgnunetstatistics.la \
+  $(top_builddir)/src/block/libgnunetblock.la \
+  libgnunetmeshblock.la \
+  $(top_builddir)/src/regex/libgnunetregex.la
+if LINUX
+gnunet_service_mesh_new_LDFLAGS = -lrt
+endif
+
+
 noinst_PROGRAMS = \
-gnunet-regex-profiler
+  gnunet-regex-profiler \
+  gnunet-service-regexprofiler
 
 gnunet_regex_profiler_SOURCES = \
   gnunet-regex-profiler.c
@@ -100,6 +129,15 @@ gnunet_regex_profiler_LDADD = \
 gnunet_regex_profiler_DEPENDENCIES = \
   libgnunetmesh.la
 
+gnunet_service_regexprofiler_SOURCES = \
+  gnunet-service-regexprofiler.c
+gnunet_service_regexprofiler_LDADD = \
+  $(top_builddir)/src/util/libgnunetutil.la \
+  $(top_builddir)/src/mesh/libgnunetmesh.la \
+  $(top_builddir)/src/statistics/libgnunetstatistics.la
+gnunet_service_regexprofiler_DEPENDENCIES = \
+  libgnunetmesh.la
+
 check_PROGRAMS = \
  test_mesh_api \
  test_mesh_tree_api \
@@ -302,5 +340,4 @@ endif
 EXTRA_DIST = \
   test_mesh.conf \
   test_mesh_2dtorus.conf \
-  test_mesh_small.conf \
-  test_mesh_path.conf
+  test_mesh_small.conf