From 5bb46d9a3ab568145f594c5a3cfa31ead3df38eb Mon Sep 17 00:00:00 2001
From: Christian Grothoff <christian@grothoff.org>
Date: Tue, 24 Aug 2021 15:21:32 +0200
Subject: -remove dead ats-tests, fix strange Debian build issues

---
 src/transport/Makefile.am                    | 29 +++++++++++++---------------
 src/transport/transport_api_cmd_start_peer.c |  7 +++++--
 2 files changed, 18 insertions(+), 18 deletions(-)

(limited to 'src/transport')

diff --git a/src/transport/Makefile.am b/src/transport/Makefile.am
index afa37bac5..70687f7b5 100644
--- a/src/transport/Makefile.am
+++ b/src/transport/Makefile.am
@@ -156,13 +156,6 @@ libgnunettransporttesting_la_LIBADD = \
   $(top_builddir)/src/testing/libgnunettesting.la \
   $(top_builddir)/src/arm/libgnunetarm.la \
   $(GN_LIBINTL)
-libgnunettransporttesting_la_DEPENDENCIES = \
-  libgnunettransport.la \
-  $(top_builddir)/src/hello/libgnunethello.la \
-  $(top_builddir)/src/ats/libgnunetats.la \
-  $(top_builddir)/src/util/libgnunetutil.la \
-  $(top_builddir)/src/testing/libgnunettesting.la \
-  $(top_builddir)/src/arm/libgnunetarm.la
 libgnunettransporttesting_la_LDFLAGS = \
  $(GN_LIB_LDFLAGS)
 
@@ -190,7 +183,8 @@ libgnunettransporttesting2_la_LIBADD = \
   $(top_builddir)/src/util/libgnunetutil.la
 libgnunettransporttesting2_la_LDFLAGS = \
   $(GN_LIBINTL) \
-  $(GN_LIB_LDFLAGS)
+  $(GN_LIB_LDFLAGS) \
+  -version-info 0:0:0
 
 libgnunettransport_la_SOURCES = \
   transport.h \
@@ -208,10 +202,6 @@ libgnunettransport_la_LIBADD = \
   $(top_builddir)/src/ats/libgnunetats.la \
   $(top_builddir)/src/util/libgnunetutil.la \
   $(GN_LIBINTL)
-libgnunettransport_la_DEPENDENCIES = \
-  $(top_builddir)/src/hello/libgnunethello.la \
-  $(top_builddir)/src/ats/libgnunetats.la \
-  $(top_builddir)/src/util/libgnunetutil.la
 libgnunettransport_la_LDFLAGS = \
   $(GN_LIB_LDFLAGS)  \
   -version-info 4:0:2
@@ -406,16 +396,23 @@ plugin_LTLIBRARIES = \
 libgnunet_test_transport_plugin_cmd_simple_send_la_SOURCES = \
  test_transport_plugin_cmd_simple_send.c
 libgnunet_test_transport_plugin_cmd_simple_send_la_LIBADD = \
-  $(top_builddir)/src/util/libgnunetutil.la \
+  libgnunettransporttesting2.la \
+  libgnunettransportapplication.la \
+  libgnunettransport.la \
   $(top_builddir)/src/testing/libgnunettesting.la \
+  $(top_builddir)/src/peerstore/libgnunetpeerstore.la \
   $(top_builddir)/src/statistics/libgnunetstatistics.la \
-  libgnunettransporttesting2.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_la_LDFLAGS = \
   $(GN_PLUGIN_LDFLAGS)
 
 if HAVE_EXPERIMENTAL
-plugin_LTLIBRARIES += libgnunet_plugin_transport_udp.la
+plugin_LTLIBRARIES += \
+  libgnunet_plugin_transport_udp.la
 endif
 
 # Note: real plugins of course need to be added
@@ -731,8 +728,8 @@ test_transport_api_cmd_simple_send_LDADD = \
  $(top_builddir)/src/testing/libgnunettesting.la \
  $(top_builddir)/src/util/libgnunetutil.la \
  $(top_builddir)/src/testbed/libgnunettestbed.la \
- libgnunettransport.la \
  $(top_builddir)/src/hello/libgnunethello.la \
+ libgnunettransport.la \
  libgnunettransporttesting.la
 
 test_transport_testing_startstop_SOURCES = \
diff --git a/src/transport/transport_api_cmd_start_peer.c b/src/transport/transport_api_cmd_start_peer.c
index 9277bc346..729d981c0 100644
--- a/src/transport/transport_api_cmd_start_peer.c
+++ b/src/transport/transport_api_cmd_start_peer.c
@@ -69,9 +69,9 @@ hello_iter_cb (void *cb_cls,
 }
 
 
-
 /**
- * Function to start the retrival task to retrieve the hello of this peer from the peerstore.
+ * Function to start the retrieval task to retrieve the hello of this peer
+ * from the peerstore.
  *
  */
 static void
@@ -170,6 +170,7 @@ notify_connect (void *cls,
   return ret;
 }
 
+
 /**
  * The run method of this cmd will start all services of a peer to test the transport service.
  *
@@ -309,6 +310,7 @@ start_peer_run (void *cls,
   sps->rh_task = GNUNET_SCHEDULER_add_now (retrieve_hello, sps);
 }
 
+
 /**
  * The cleanup function of this cmd frees resources the cmd allocated.
  *
@@ -434,6 +436,7 @@ GNUNET_TRANSPORT_get_trait_hello_size (const struct
                       (unsigned int) 4);
 }
 
+
 /**
  * Function to get the trait with the hello.
  *
-- 
cgit v1.2.3