diff options
author | Christian Grothoff <christian@grothoff.org> | 2017-03-17 11:53:24 +0100 |
---|---|---|
committer | Christian Grothoff <christian@grothoff.org> | 2017-03-17 11:53:24 +0100 |
commit | c253a40bae417335fab8446f3c7182c8c5d4833f (patch) | |
tree | 0517ab35f90bf290744e5a9ddfeb75ca9547cdbe /src/transport/Makefile.am | |
parent | 273188e646ed4d91ced1dac443e976336be877b4 (diff) | |
parent | 79fb947eb8fba243ea65e19b40b65e04f8806865 (diff) | |
download | gnunet-c253a40bae417335fab8446f3c7182c8c5d4833f.tar.gz gnunet-c253a40bae417335fab8446f3c7182c8c5d4833f.zip |
Merge branch 'master' into getopt
Diffstat (limited to 'src/transport/Makefile.am')
-rw-r--r-- | src/transport/Makefile.am | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/src/transport/Makefile.am b/src/transport/Makefile.am index acc2557c6..7687f2348 100644 --- a/src/transport/Makefile.am +++ b/src/transport/Makefile.am | |||
@@ -191,6 +191,8 @@ libexec_PROGRAMS = \ | |||
191 | $(BT_BIN) \ | 191 | $(BT_BIN) \ |
192 | gnunet-service-transport | 192 | gnunet-service-transport |
193 | 193 | ||
194 | |||
195 | |||
194 | bin_PROGRAMS = \ | 196 | bin_PROGRAMS = \ |
195 | gnunet-transport \ | 197 | gnunet-transport \ |
196 | gnunet-transport-certificate-creation | 198 | gnunet-transport-certificate-creation |
@@ -561,7 +563,7 @@ TESTS = \ | |||
561 | $(HTTP_API_TIMEOUT_TEST) \ | 563 | $(HTTP_API_TIMEOUT_TEST) \ |
562 | $(HTTPS_API_TIMEOUT_TEST) \ | 564 | $(HTTPS_API_TIMEOUT_TEST) \ |
563 | $(WLAN_TIMEOUT_TEST) \ | 565 | $(WLAN_TIMEOUT_TEST) \ |
564 | $(BT_TIMEOUT_TEST) | 566 | $(BT_TIMEOUT_TEST) |
565 | if HAVE_GETOPT_BINARY | 567 | if HAVE_GETOPT_BINARY |
566 | TESTS += \ | 568 | TESTS += \ |
567 | test_transport_api_slow_ats | 569 | test_transport_api_slow_ats |