- fix coverity

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

diff --git a/src/transport/Makefile.am b/src/transport/Makefile.am
index f7f6a93700c9e3409d5e114d364b15f06bd431f0..3a1170c102bf0dbc21e5446a17ec16a33af85bf2 100644 (file)
--- a/src/transport/Makefile.am
+++ b/src/transport/Makefile.am
@@ -95,9 +95,9 @@ endif
 
 if LINUX
 install-exec-hook:
-       $(top_srcdir)/src/transport/install-wlan-helper.sh $(libexecdir) $(SUDO_BINARY) || true
+       $(top_srcdir)/src/transport/install-wlan-helper.sh $(DESTDIR)$(libexecdir) $(SUDO_BINARY) || true
 if HAVE_LIBBLUETOOTH
-       $(top_srcdir)/src/transport/install-bluetooth-helper.sh $(libexecdir) $(SUDO_BINARY) || true
+       $(top_srcdir)/src/transport/install-bluetooth-helper.sh $(DESTDIR)$(libexecdir) $(SUDO_BINARY) || true
 endif
 else
 install-exec-hook:
@@ -154,6 +154,7 @@ libgnunettransporttesting_la_SOURCES = \
 libgnunettransporttesting_la_LIBADD = \
   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 \
   $(GN_LIBINTL)
@@ -165,8 +166,8 @@ libgnunettransport_la_SOURCES = \
   transport_api_blacklist.c \
   transport_api_address_to_string.c \
   transport_api_monitor_peers.c \
-  transport_api_monitor_plugins.c \
-  transport_api_monitor_validation.c
+  transport_api_monitor_plugins.c
+
 libgnunettransport_la_LIBADD = \
   $(top_builddir)/src/hello/libgnunethello.la \
   $(top_builddir)/src/ats/libgnunetats.la \
@@ -228,6 +229,7 @@ gnunet_transport_profiler_LDADD = \
   libgnunettransport.la \
   $(top_builddir)/src/nat/libgnunetnat.la \
   $(top_builddir)/src/hello/libgnunethello.la \
+  $(top_builddir)/src/ats/libgnunetats.la \
   $(top_builddir)/src/util/libgnunetutil.la \
   $(GN_LIBINTL)
 
@@ -278,7 +280,11 @@ plugin_LTLIBRARIES = \
   $(HTTP_SERVER_PLUGIN_LA) \
   $(HTTPS_SERVER_PLUGIN_LA) \
   $(WLAN_PLUGIN_LA) \
-  $(BT_PLUGIN_LA) \
+  $(BT_PLUGIN_LA)
+
+# Note: real plugins of course need to be added
+# to the plugin_LTLIBRARIES above
+noinst_LTLIBRARIES = \
   libgnunet_plugin_transport_template.la
 
 libgnunet_plugin_transport_tcp_la_SOURCES = \
@@ -462,7 +468,6 @@ check_PROGRAMS = \
  $(BT_TIMEOUT_TEST) \
  test_transport_api_multi \
  test_transport_api_monitor_peers \
- test_transport_api_monitor_validation \
  test_transport_blacklisting_no_bl \
  test_transport_blacklisting_outbound_bl_full \
  test_transport_blacklisting_outbound_bl_plugin \
@@ -489,8 +494,11 @@ check_PROGRAMS = \
  $(HTTP_QUOTA_TEST) \
  $(HTTPS_QUOTA_TEST) \
  $(WLAN_QUOTA_TEST) \
- $(BT_QUOTA_TEST) \
- test_transport_api_slow_ats
+ $(BT_QUOTA_TEST)
+if HAVE_GETOPT_BINARY
+check_PROGRAMS += \
+test_transport_api_slow_ats
+endif
 endif
 
 if ENABLE_TEST_RUN
@@ -523,7 +531,6 @@ TESTS = \
  $(BT_API_TEST) \
  test_transport_api_multi \
  test_transport_api_monitor_peers \
- test_transport_api_monitor_validation \
  test_transport_blacklisting_no_bl \
  test_transport_blacklisting_outbound_bl_full \
  test_transport_blacklisting_outbound_bl_plugin \
@@ -549,7 +556,6 @@ TESTS = \
  $(UNIX_QUOTA_TEST) \
  $(HTTP_QUOTA_TEST) \
  $(HTTPS_QUOTA_TEST) \
- test_transport_api_slow_ats \
  test_transport_api_timeout_tcp \
  test_transport_api_timeout_udp \
  $(UNIX_PLUGIN_TIMEOUT_TEST) \
@@ -561,6 +567,10 @@ TESTS = \
  test_transport_address_switch_udp \
  $(HTTP_SWITCH) \
  $(HTTPS_SWITCH)
+if HAVE_GETOPT_BINARY
+TESTS += \
+test_transport_api_slow_ats
+endif
 endif
 
 test_transport_testing_startstop_SOURCES = \
@@ -780,6 +790,7 @@ test_transport_api_restart_1peer_SOURCES = \
 test_transport_api_restart_1peer_LDADD = \
  libgnunettransport.la \
  $(top_builddir)/src/hello/libgnunethello.la \
+ $(top_builddir)/src/ats/libgnunetats.la \
  $(top_builddir)/src/statistics/libgnunetstatistics.la \
  $(top_builddir)/src/util/libgnunetutil.la \
  libgnunettransporttesting.la
@@ -789,7 +800,8 @@ test_transport_api_restart_2peers_SOURCES = \
 test_transport_api_restart_2peers_LDADD = \
  libgnunettransport.la \
  $(top_builddir)/src/hello/libgnunethello.la \
- $(top_builddir)/src/statistics/libgnunetstatistics.la \
+ $(top_builddir)/src/ats/libgnunetats.la \
+$(top_builddir)/src/statistics/libgnunetstatistics.la \
  $(top_builddir)/src/util/libgnunetutil.la \
  libgnunettransporttesting.la
 
@@ -1221,14 +1233,6 @@ test_transport_api_monitor_peers_LDADD = \
  $(top_builddir)/src/util/libgnunetutil.la \
  libgnunettransporttesting.la
 
-test_transport_api_monitor_validation_SOURCES = \
- test_transport_api_monitor_validation.c
-test_transport_api_monitor_validation_LDADD = \
- libgnunettransport.la \
- $(top_builddir)/src/hello/libgnunethello.la \
- $(top_builddir)/src/util/libgnunetutil.la \
- libgnunettransporttesting.la
-
 test_transport_api_slow_ats_SOURCES = \
  test_transport_api.c
 test_transport_api_slow_ats_LDADD = \