mesh regex profiler

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

diff --git a/src/mesh/Makefile.am b/src/mesh/Makefile.am
index aee4b6c9d4ab35914bce3e4aa70282efd8483a31..5715826c80423b10e165388fc752c842b911083e 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 \
@@ -86,6 +88,46 @@ 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_SOURCES = \
+  gnunet-regex-profiler.c
+gnunet_regex_profiler_LDADD = \
+  $(top_builddir)/src/util/libgnunetutil.la \
+  $(top_builddir)/src/testbed/libgnunettestbed.la \
+  $(top_builddir)/src/mesh/libgnunetmesh.la \
+  $(top_builddir)/src/regex/libgnunetregex.la \
+  $(top_builddir)/src/statistics/libgnunetstatistics.la
+gnunet_regex_profiler_DEPENDENCIES = \
+  libgnunetmesh.la
+
 check_PROGRAMS = \
  test_mesh_api \
  test_mesh_tree_api \
@@ -104,7 +146,7 @@ check_PROGRAMS = \
  test_mesh_small_speed_backwards \
  test_mesh_small_speed_nobuf_backwards \
  test_mesh_small_speed_min_backwards \
- test_mesh_small_speed_ack 
+ test_mesh_small_speed_ack
 
 test_mesh_api_SOURCES = \
  test_mesh_api.c
@@ -278,7 +320,11 @@ TESTS = test_mesh_api \
  test_mesh_local_traffic_both \
  test_mesh_2dtorus test_mesh_regex \
  test_mesh_small_unicast test_mesh_small_multicast \
- test_mesh_small_speed
+ test_mesh_small_speed \
+ test_mesh_small_speed_min \
+ test_mesh_small_speed_nobuf \
+ test_mesh_small_speed_backwards \
+ test_mesh_small_speed_min_backwards
 endif
 
 EXTRA_DIST = \