- fixes

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

diff --git a/src/mesh/Makefile.am b/src/mesh/Makefile.am
index c0733cafd59d0e3976f0af29c410f759e162567f..84d4838b3803d1acfd97e00a6a584b0c5ee92e3b 100644 (file)
--- a/src/mesh/Makefile.am
+++ b/src/mesh/Makefile.am
@@ -110,15 +110,13 @@ gnunet_service_mesh_new_LDADD = \
   $(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/regex/libgnunetregex.la
+  $(top_builddir)/src/block/libgnunetblock.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 \
-  $(top_builddir)/src/regex/libgnunetregex.la
+  $(top_builddir)/src/block/libgnunetblock.la
 if LINUX
 gnunet_service_mesh_new_LDFLAGS = -lrt
 endif
@@ -145,16 +143,12 @@ check_PROGRAMS = \
  test_mesh_local_traffic_bck \
  test_mesh_local_traffic_both \
  test_mesh_2dtorus \
- test_mesh_regex \
  test_mesh_small_unicast \
- test_mesh_small_multicast \
  test_mesh_small_signal \
  test_mesh_small_speed \
  test_mesh_small_speed_nobuf \
- test_mesh_small_speed_min \
  test_mesh_small_speed_backwards \
  test_mesh_small_speed_nobuf_backwards \
- test_mesh_small_speed_min_backwards \
  test_mesh_small_speed_ack
 
 test_mesh_api_SOURCES = \
@@ -237,21 +231,11 @@ test_mesh_2dtorus_SOURCES = \
 test_mesh_2dtorus_LDADD = $(ld_mesh_test_lib)
 test_mesh_2dtorus_DEPENDENCIES = $(dep_mesh_test_lib)
 
-test_mesh_regex_SOURCES = \
- test_mesh_regex.c
-test_mesh_regex_LDADD = $(ld_mesh_test_lib)
-test_mesh_regex_DEPENDENCIES = $(dep_mesh_test_lib)
-
 test_mesh_small_unicast_SOURCES = \
  test_mesh_small.c
 test_mesh_small_unicast_LDADD = $(ld_mesh_test_lib)
 test_mesh_small_unicast_DEPENDENCIES = $(dep_mesh_test_lib)
 
-test_mesh_small_multicast_SOURCES = \
- test_mesh_small.c
-test_mesh_small_multicast_LDADD = $(ld_mesh_test_lib)
-test_mesh_small_multicast_DEPENDENCIES = $(dep_mesh_test_lib)
-
 test_mesh_small_signal_SOURCES = \
  test_mesh_small.c
 test_mesh_small_signal_LDADD = $(ld_mesh_test_lib)
@@ -267,11 +251,6 @@ test_mesh_small_speed_SOURCES = \
 test_mesh_small_speed_LDADD = $(ld_mesh_test_lib)
 test_mesh_small_speed_DEPENDENCIES = $(dep_mesh_test_lib)
 
-test_mesh_small_speed_min_SOURCES = \
- test_mesh_small.c
-test_mesh_small_speed_min_LDADD = $(ld_mesh_test_lib)
-test_mesh_small_speed_min_DEPENDENCIES = $(dep_mesh_test_lib)
-
 test_mesh_small_speed_nobuf_SOURCES = \
  test_mesh_small.c
 test_mesh_small_speed_nobuf_LDADD = $(ld_mesh_test_lib)
@@ -282,11 +261,6 @@ test_mesh_small_speed_backwards_SOURCES = \
 test_mesh_small_speed_backwards_LDADD = $(ld_mesh_test_lib)
 test_mesh_small_speed_backwards_DEPENDENCIES = $(dep_mesh_test_lib)
 
-test_mesh_small_speed_min_backwards_SOURCES = \
- test_mesh_small.c
-test_mesh_small_speed_min_backwards_LDADD = $(ld_mesh_test_lib)
-test_mesh_small_speed_min_backwards_DEPENDENCIES = $(dep_mesh_test_lib)
-
 test_mesh_small_speed_nobuf_backwards_SOURCES = \
  test_mesh_small.c
 test_mesh_small_speed_nobuf_backwards_LDADD = $(ld_mesh_test_lib)
@@ -300,14 +274,12 @@ TESTS = test_mesh_api \
  test_mesh_local_traffic_fwd \
  test_mesh_local_traffic_bck \
  test_mesh_local_traffic_both \
- test_mesh_2dtorus test_mesh_regex \
- test_mesh_small_unicast test_mesh_small_multicast \
+ test_mesh_2dtorus \
+ test_mesh_small_unicast \
  test_mesh_small_signal \
  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
+ test_mesh_small_speed_backwards
 endif
 
 EXTRA_DIST = \