AM_CLFAGS = -g
+if HAVE_EXPERIMENTAL
+ EXP_LIB = libgnunetmesh2.la
+ EXP_LIBEXEC = gnunet-service-mesh-new
+endif
+
libexec_PROGRAMS = \
- gnunet-service-mesh gnunet-service-mesh-new
+ gnunet-service-mesh $(EXP_LIBEXEC)
bin_PROGRAMS = \
gnunet-mesh
lib_LTLIBRARIES = \
- libgnunetmesh.la
+ libgnunetmesh.la $(EXP_LIB)
plugin_LTLIBRARIES = \
libgnunet_plugin_block_mesh.la
$(LTLIBINTL)
libgnunetmesh_la_LDFLAGS = \
$(GN_LIB_LDFLAGS) $(WINFLAGS) \
- -version-info 2:0:1
+ -version-info 2:1:1
+
+libgnunetmesh2_la_SOURCES = \
+ mesh2_api.c mesh_common.c
+libgnunetmesh2_la_LIBADD = \
+ $(top_builddir)/src/util/libgnunetutil.la \
+ $(XLIB) \
+ $(LTLIBINTL)
+libgnunetmesh2_la_LDFLAGS = \
+ $(GN_LIB_LDFLAGS) $(WINFLAGS) \
+ -version-info 2:2:1
+
gnunet_service_mesh_SOURCES = \
gnunet-service-mesh.c \
$(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
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 = \
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)
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)
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)
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 = \