1 files changed, 36 insertions, 3 deletions

diff --git a/src/transport/Makefile.am b/src/transport/Makefile.am
index 4ea3b58c4..8bd35b5a3 100644
--- a/src/transport/Makefile.am
+++ b/src/transport/Makefile.am
@@ -161,11 +161,13 @@ libgnunettransporttesting_la_LDFLAGS = \
 
 libgnunettransporttesting2_la_SOURCES = \
   transport_api_cmd_connecting_peers.c \
+  transport_api_cmd_connecting_peers_v2.c \
   transport_api_cmd_start_peer.c \
+  transport_api_cmd_start_peer_v2.c \
   transport_api_cmd_stop_peer.c \
   transport_api_cmd_send_simple.c \
+  transport_api_cmd_send_simple_v2.c \
   transport-testing2.c transport-testing2.h \
-  transport-testing-ng.h \
   transport-testing-cmds.h \
   transport-testing-filenames2.c \
   transport-testing-loggers2.c \
@@ -391,7 +393,8 @@ plugin_LTLIBRARIES = \
   $(HTTPS_SERVER_PLUGIN_LA) \
   $(WLAN_PLUGIN_LA) \
   $(BT_PLUGIN_LA) \
-  libgnunet_test_transport_plugin_cmd_simple_send.la
+  libgnunet_test_transport_plugin_cmd_simple_send.la \
+  libgnunet_test_transport_plugin_cmd_simple_send_v2.la
 
 libgnunet_test_transport_plugin_cmd_simple_send_la_SOURCES = \
  test_transport_plugin_cmd_simple_send.c
@@ -410,6 +413,23 @@ libgnunet_test_transport_plugin_cmd_simple_send_la_LIBADD = \
 libgnunet_test_transport_plugin_cmd_simple_send_la_LDFLAGS = \
   $(GN_PLUGIN_LDFLAGS)
 
+libgnunet_test_transport_plugin_cmd_simple_send_v2_la_SOURCES = \
+ test_transport_plugin_cmd_simple_send_v2.c
+libgnunet_test_transport_plugin_cmd_simple_send_v2_la_LIBADD = \
+  libgnunettransporttesting2.la \
+  libgnunettransportapplication.la \
+  libgnunettransport.la \
+  $(top_builddir)/src/testing/libgnunettesting.la \
+  $(top_builddir)/src/peerstore/libgnunetpeerstore.la \
+  $(top_builddir)/src/statistics/libgnunetstatistics.la \
+  $(top_builddir)/src/hello/libgnunethello.la \
+  $(top_builddir)/src/ats/libgnunetats.la \
+  $(top_builddir)/src/arm/libgnunetarm.la \
+  $(top_builddir)/src/util/libgnunetutil.la \
+  $(LTLIBINTL)
+libgnunet_test_transport_plugin_cmd_simple_send_v2_la_LDFLAGS = \
+  $(GN_PLUGIN_LDFLAGS)
+
 if HAVE_EXPERIMENTAL
 plugin_LTLIBRARIES += \
   libgnunet_plugin_transport_udp.la
@@ -557,6 +577,7 @@ libgnunet_plugin_transport_https_server_la_CFLAGS = \
 if HAVE_TESTING
 check_PROGRAMS = \
  test_transport_simple_send \
+ test_transport_simple_send_v2 \
  test_transport_address_switch_tcp \
  test_transport_testing_startstop \
  test_transport_testing_restart \
@@ -706,6 +727,7 @@ endif
 if HAVE_EXPERIMENTAL
 TESTS += \
   test_transport_simple_send \
+  test_transport_simple_send_v2 \
   test_transport_address_switch_udp \
   test_plugin_udp \
   test_transport_api_udp \
@@ -724,7 +746,8 @@ endif
 endif
 
 check_SCRIPTS= \
-  test_transport_simple_send.sh
+  test_transport_simple_send.sh \
+  test_transport_simple_send_v2.sh
 
 test_transport_simple_send_SOURCES = \
  test_transport_simple_send.c
@@ -736,6 +759,16 @@ test_transport_simple_send_LDADD = \
  libgnunettransport.la \
  libgnunettransporttesting.la
 
+test_transport_simple_send_v2_SOURCES = \
+ test_transport_simple_send_v2.c
+test_transport_simple_send_v2_LDADD = \
+ $(top_builddir)/src/testing/libgnunettesting.la \
+ $(top_builddir)/src/util/libgnunetutil.la \
+ $(top_builddir)/src/testbed/libgnunettestbed.la \
+ $(top_builddir)/src/hello/libgnunethello.la \
+ libgnunettransport.la \
+ libgnunettransporttesting.la
+
 test_transport_testing_startstop_SOURCES = \
  test_transport_testing_startstop.c
 test_transport_testing_startstop_LDADD = \