Makefile.am | Makefile.am | |||
---|---|---|---|---|
INCLUDES = -I$(top_srcdir)/src/include -I$(top_builddir)/src/include | INCLUDES = -I$(top_srcdir)/src/include -I$(top_builddir)/src/include | |||
plugindir = $(libdir)/gnunet | plugindir = $(libdir)/gnunet | |||
pkgcfgdir= $(pkgdatadir)/config.d/ | pkgcfgdir= $(pkgdatadir)/config.d/ | |||
dist_pkgcfg_DATA = \ | pkgcfg_DATA = \ | |||
transport.conf | transport.conf | |||
if HAVE_MHD | if HAVE_MHD | |||
GN_LIBMHD = -lmicrohttpd | GN_LIBMHD = -lmicrohttpd | |||
HTTP_PLUGIN_LA = libgnunet_plugin_transport_http.la | HTTP_PLUGIN_LA = libgnunet_plugin_transport_http.la | |||
HTTP_API_TEST = test_transport_api_http | HTTP_API_TEST = test_transport_api_http | |||
HTTP_NAT_API_TEST = test_transport_api_http_nat | HTTP_NAT_API_TEST = test_transport_api_http_nat | |||
HTTP_API_TIMEOUT_TEST = test_transport_api_timeout_http | HTTP_API_TIMEOUT_TEST = test_transport_api_timeout_http | |||
HTTP_REL_TEST = test_transport_api_reliability_http | HTTP_REL_TEST = test_transport_api_reliability_http | |||
HTTP_NAT_REL_TEST = test_transport_api_reliability_http_nat | HTTP_NAT_REL_TEST = test_transport_api_reliability_http_nat | |||
skipping to change at line 55 | skipping to change at line 55 | |||
install-exec-hook: | install-exec-hook: | |||
$(SUDO_BINARY) chown root:root $(bindir)/gnunet-helper-transport-wla n || true | $(SUDO_BINARY) chown root:root $(bindir)/gnunet-helper-transport-wla n || true | |||
$(SUDO_BINARY) chmod u+s $(bindir)/gnunet-helper-transport-wlan || t rue | $(SUDO_BINARY) chmod u+s $(bindir)/gnunet-helper-transport-wlan || t rue | |||
else | else | |||
install-exec-hook: | install-exec-hook: | |||
endif | endif | |||
if !MINGW | if !MINGW | |||
UNIX_PLUGIN_LA = libgnunet_plugin_transport_unix.la | UNIX_PLUGIN_LA = libgnunet_plugin_transport_unix.la | |||
UNIX_PLUGIN_TEST = test_transport_api_unix | UNIX_PLUGIN_TEST = test_transport_api_unix | |||
UNIX_PLUGIN_TIMEOUT_TEST = test_transport_api_timeout_unix | ||||
UNIX_REL_TEST = test_transport_api_unreliability_unix | UNIX_REL_TEST = test_transport_api_unreliability_unix | |||
UNIX_QUOTA_TEST = test_quota_compliance_unix \ | UNIX_QUOTA_TEST = test_quota_compliance_unix \ | |||
test_quota_compliance_unix_asymmetric | test_quota_compliance_unix_asymmetric | |||
endif | endif | |||
noinst_PROGRAMS = \ | noinst_PROGRAMS = \ | |||
$(WLAN_BIN_DUMMY) \ | $(WLAN_BIN_DUMMY) \ | |||
$(WLAN_BIN_SENDER) | $(WLAN_BIN_SENDER) | |||
# gnunet-transport-connect-running-peers | # gnunet-transport-connect-running-peers | |||
skipping to change at line 188 | skipping to change at line 189 | |||
libgnunet_plugin_transport_wlan_la_LIBADD = \ | libgnunet_plugin_transport_wlan_la_LIBADD = \ | |||
$(top_builddir)/src/hello/libgnunethello.la \ | $(top_builddir)/src/hello/libgnunethello.la \ | |||
$(top_builddir)/src/statistics/libgnunetstatistics.la \ | $(top_builddir)/src/statistics/libgnunetstatistics.la \ | |||
$(top_builddir)/src/peerinfo/libgnunetpeerinfo.la \ | $(top_builddir)/src/peerinfo/libgnunetpeerinfo.la \ | |||
$(top_builddir)/src/fragmentation/libgnunetfragmentation.la \ | $(top_builddir)/src/fragmentation/libgnunetfragmentation.la \ | |||
$(top_builddir)/src/util/libgnunetutil.la | $(top_builddir)/src/util/libgnunetutil.la | |||
libgnunet_plugin_transport_wlan_la_LDFLAGS = \ | libgnunet_plugin_transport_wlan_la_LDFLAGS = \ | |||
$(GN_PLUGIN_LDFLAGS) | $(GN_PLUGIN_LDFLAGS) | |||
libgnunet_plugin_transport_udp_la_SOURCES = \ | libgnunet_plugin_transport_udp_la_SOURCES = \ | |||
plugin_transport_udp.c | plugin_transport_udp.c plugin_transport_udp.h \ | |||
plugin_transport_udp_broadcasting.c | ||||
libgnunet_plugin_transport_udp_la_LIBADD = \ | libgnunet_plugin_transport_udp_la_LIBADD = \ | |||
$(top_builddir)/src/hello/libgnunethello.la \ | $(top_builddir)/src/hello/libgnunethello.la \ | |||
$(top_builddir)/src/fragmentation/libgnunetfragmentation.la \ | $(top_builddir)/src/fragmentation/libgnunetfragmentation.la \ | |||
$(top_builddir)/src/statistics/libgnunetstatistics.la \ | $(top_builddir)/src/statistics/libgnunetstatistics.la \ | |||
$(top_builddir)/src/peerinfo/libgnunetpeerinfo.la \ | $(top_builddir)/src/peerinfo/libgnunetpeerinfo.la \ | |||
$(top_builddir)/src/nat/libgnunetnat.la \ | $(top_builddir)/src/nat/libgnunetnat.la \ | |||
$(top_builddir)/src/util/libgnunetutil.la | $(top_builddir)/src/util/libgnunetutil.la | |||
libgnunet_plugin_transport_udp_la_LDFLAGS = \ | libgnunet_plugin_transport_udp_la_LDFLAGS = \ | |||
$(GN_PLUGIN_LDFLAGS) | $(GN_PLUGIN_LDFLAGS) | |||
skipping to change at line 248 | skipping to change at line 250 | |||
$(GN_LIBMHD) \ | $(GN_LIBMHD) \ | |||
$(GN_PLUGIN_LDFLAGS) | $(GN_PLUGIN_LDFLAGS) | |||
libgnunet_plugin_transport_https_la_CFLAGS = \ | libgnunet_plugin_transport_https_la_CFLAGS = \ | |||
$(CFLAGS) -DBUILD_HTTPS | $(CFLAGS) -DBUILD_HTTPS | |||
libgnunet_plugin_transport_https_la_CPPFLAGS = \ | libgnunet_plugin_transport_https_la_CPPFLAGS = \ | |||
@LIBCURL_CPPFLAGS@ | @LIBCURL_CPPFLAGS@ | |||
check_PROGRAMS = \ | check_PROGRAMS = \ | |||
test_transport_testing \ | test_transport_testing \ | |||
test_transport_startonly \ | test_transport_startonly \ | |||
test_transport_api_blacklisting \ | ||||
test_transport_api_disconnect_tcp \ | test_transport_api_disconnect_tcp \ | |||
test_transport_api_bidirectional_connect \ | test_transport_api_bidirectional_connect \ | |||
test_transport_api_tcp \ | test_transport_api_tcp \ | |||
test_transport_api_restart_1peer \ | test_transport_api_restart_1peer \ | |||
test_transport_api_restart_2peers \ | test_transport_api_restart_2peers \ | |||
test_transport_api_timeout_tcp \ | test_transport_api_timeout_tcp \ | |||
test_transport_api_limited_sockets_tcp \ | test_transport_api_limited_sockets_tcp \ | |||
test_transport_api_tcp_nat \ | test_transport_api_tcp_nat \ | |||
test_transport_api_udp \ | test_transport_api_udp \ | |||
test_transport_api_timeout_udp \ | ||||
$(UNIX_PLUGIN_TEST) \ | $(UNIX_PLUGIN_TEST) \ | |||
$(UNIX_PLUGIN_TIMEOUT_TEST) \ | ||||
test_transport_api_udp_nat \ | test_transport_api_udp_nat \ | |||
$(HTTP_API_TEST) \ | $(HTTP_API_TEST) \ | |||
$(HTTP_NAT_API_TEST) \ | $(HTTP_NAT_API_TEST) \ | |||
$(HTTP_API_TIMEOUT_TEST) \ | $(HTTP_API_TIMEOUT_TEST) \ | |||
$(HTTPS_API_TEST) \ | $(HTTPS_API_TEST) \ | |||
$(HTTPS_NAT_API_TEST) \ | $(HTTPS_NAT_API_TEST) \ | |||
$(HTTPS_API_TIMEOUT_TEST) \ | $(HTTPS_API_TIMEOUT_TEST) \ | |||
test_transport_api_multi \ | test_transport_api_multi \ | |||
test_transport_api_reliability_tcp \ | test_transport_api_reliability_tcp \ | |||
test_transport_api_reliability_tcp_nat \ | test_transport_api_reliability_tcp_nat \ | |||
skipping to change at line 289 | skipping to change at line 294 | |||
$(HTTP_QUOTA_TEST) \ | $(HTTP_QUOTA_TEST) \ | |||
$(HTTPS_QUOTA_TEST) \ | $(HTTPS_QUOTA_TEST) \ | |||
$(WLAN_API_TEST) \ | $(WLAN_API_TEST) \ | |||
$(WLAN_REL_TEST) \ | $(WLAN_REL_TEST) \ | |||
$(WLAN_UREL_TEST) | $(WLAN_UREL_TEST) | |||
if ENABLE_TEST_RUN | if ENABLE_TEST_RUN | |||
TESTS = \ | TESTS = \ | |||
test_transport_testing \ | test_transport_testing \ | |||
test_transport_startonly \ | test_transport_startonly \ | |||
test_transport_api_blacklisting \ | ||||
test_transport_api_disconnect_tcp \ | test_transport_api_disconnect_tcp \ | |||
test_transport_api_bidirectional_connect \ | test_transport_api_bidirectional_connect \ | |||
test_transport_api_tcp \ | test_transport_api_tcp \ | |||
test_transport_api_restart_1peer \ | test_transport_api_restart_1peer \ | |||
test_transport_api_restart_2peers \ | test_transport_api_restart_2peers \ | |||
test_transport_api_timeout_tcp \ | test_transport_api_timeout_tcp \ | |||
test_transport_api_limited_sockets_tcp \ | test_transport_api_limited_sockets_tcp \ | |||
test_transport_api_tcp_nat \ | test_transport_api_tcp_nat \ | |||
test_transport_api_udp \ | test_transport_api_udp \ | |||
test_transport_api_timeout_udp \ | ||||
$(UNIX_PLUGIN_TEST) \ | $(UNIX_PLUGIN_TEST) \ | |||
$(UNIX_PLUGIN_TIMEOUT_TEST) \ | ||||
test_transport_api_udp_nat \ | test_transport_api_udp_nat \ | |||
$(HTTP_API_TEST) \ | $(HTTP_API_TEST) \ | |||
$(HTTP_NAT_API_TEST) \ | $(HTTP_NAT_API_TEST) \ | |||
$(HTTP_API_TIMEOUT_TEST) \ | $(HTTP_API_TIMEOUT_TEST) \ | |||
$(HTTPS_API_TEST) \ | $(HTTPS_API_TEST) \ | |||
$(HTTPS_NAT_API_TEST) \ | $(HTTPS_NAT_API_TEST) \ | |||
$(HTTPS_API_TIMEOUT_TEST) \ | $(HTTPS_API_TIMEOUT_TEST) \ | |||
test_transport_api_multi \ | test_transport_api_multi \ | |||
test_transport_api_reliability_tcp \ | test_transport_api_reliability_tcp \ | |||
test_transport_api_reliability_tcp_nat \ | test_transport_api_reliability_tcp_nat \ | |||
skipping to change at line 343 | skipping to change at line 351 | |||
$(top_builddir)/src/transport/libgnunettransporttesting.la | $(top_builddir)/src/transport/libgnunettransporttesting.la | |||
#gnunet_transport_connect_running_peers_SOURCES = \ | #gnunet_transport_connect_running_peers_SOURCES = \ | |||
# gnunet-transport-connect-running-peers.c | # gnunet-transport-connect-running-peers.c | |||
#gnunet_transport_connect_running_peers_LDADD = \ | #gnunet_transport_connect_running_peers_LDADD = \ | |||
# $(top_builddir)/src/transport/libgnunettransport.la \ | # $(top_builddir)/src/transport/libgnunettransport.la \ | |||
# $(top_builddir)/src/hello/libgnunethello.la \ | # $(top_builddir)/src/hello/libgnunethello.la \ | |||
# $(top_builddir)/src/util/libgnunetutil.la \ | # $(top_builddir)/src/util/libgnunetutil.la \ | |||
# $(top_builddir)/src/transport/libgnunettransporttesting.la | # $(top_builddir)/src/transport/libgnunettransporttesting.la | |||
test_transport_api_blacklisting_SOURCES = \ | ||||
test_transport_api_blacklisting.c | ||||
test_transport_api_blacklisting_LDADD = \ | ||||
$(top_builddir)/src/transport/libgnunettransport.la \ | ||||
$(top_builddir)/src/hello/libgnunethello.la \ | ||||
$(top_builddir)/src/statistics/libgnunetstatistics.la \ | ||||
$(top_builddir)/src/util/libgnunetutil.la \ | ||||
$(top_builddir)/src/transport/libgnunettransporttesting.la | ||||
test_transport_api_disconnect_tcp_SOURCES = \ | test_transport_api_disconnect_tcp_SOURCES = \ | |||
test_transport_api_disconnect.c | test_transport_api_disconnect.c | |||
test_transport_api_disconnect_tcp_LDADD = \ | test_transport_api_disconnect_tcp_LDADD = \ | |||
$(top_builddir)/src/transport/libgnunettransport.la \ | $(top_builddir)/src/transport/libgnunettransport.la \ | |||
$(top_builddir)/src/hello/libgnunethello.la \ | $(top_builddir)/src/hello/libgnunethello.la \ | |||
$(top_builddir)/src/statistics/libgnunetstatistics.la \ | $(top_builddir)/src/statistics/libgnunetstatistics.la \ | |||
$(top_builddir)/src/util/libgnunetutil.la \ | $(top_builddir)/src/util/libgnunetutil.la \ | |||
$(top_builddir)/src/transport/libgnunettransporttesting.la | $(top_builddir)/src/transport/libgnunettransporttesting.la | |||
test_transport_startonly_SOURCES = \ | test_transport_startonly_SOURCES = \ | |||
skipping to change at line 427 | skipping to change at line 444 | |||
$(top_builddir)/src/transport/libgnunettransporttesting.la | $(top_builddir)/src/transport/libgnunettransporttesting.la | |||
test_transport_api_timeout_tcp_SOURCES = \ | test_transport_api_timeout_tcp_SOURCES = \ | |||
test_transport_api_timeout.c | test_transport_api_timeout.c | |||
test_transport_api_timeout_tcp_LDADD = \ | test_transport_api_timeout_tcp_LDADD = \ | |||
$(top_builddir)/src/transport/libgnunettransport.la \ | $(top_builddir)/src/transport/libgnunettransport.la \ | |||
$(top_builddir)/src/hello/libgnunethello.la \ | $(top_builddir)/src/hello/libgnunethello.la \ | |||
$(top_builddir)/src/util/libgnunetutil.la \ | $(top_builddir)/src/util/libgnunetutil.la \ | |||
$(top_builddir)/src/transport/libgnunettransporttesting.la | $(top_builddir)/src/transport/libgnunettransporttesting.la | |||
test_transport_api_timeout_unix_SOURCES = \ | ||||
test_transport_api_timeout.c | ||||
test_transport_api_timeout_unix_LDADD = \ | ||||
$(top_builddir)/src/transport/libgnunettransport.la \ | ||||
$(top_builddir)/src/hello/libgnunethello.la \ | ||||
$(top_builddir)/src/util/libgnunetutil.la \ | ||||
$(top_builddir)/src/transport/libgnunettransporttesting.la | ||||
test_transport_api_timeout_http_SOURCES = \ | test_transport_api_timeout_http_SOURCES = \ | |||
test_transport_api_timeout.c | test_transport_api_timeout.c | |||
test_transport_api_timeout_http_LDADD = \ | test_transport_api_timeout_http_LDADD = \ | |||
$(top_builddir)/src/transport/libgnunettransport.la \ | $(top_builddir)/src/transport/libgnunettransport.la \ | |||
$(top_builddir)/src/hello/libgnunethello.la \ | $(top_builddir)/src/hello/libgnunethello.la \ | |||
$(top_builddir)/src/util/libgnunetutil.la \ | $(top_builddir)/src/util/libgnunetutil.la \ | |||
$(top_builddir)/src/transport/libgnunettransporttesting.la | $(top_builddir)/src/transport/libgnunettransporttesting.la | |||
test_transport_api_timeout_https_SOURCES = \ | test_transport_api_timeout_https_SOURCES = \ | |||
test_transport_api_timeout.c | test_transport_api_timeout.c | |||
skipping to change at line 475 | skipping to change at line 500 | |||
$(top_builddir)/src/transport/libgnunettransporttesting.la | $(top_builddir)/src/transport/libgnunettransporttesting.la | |||
test_transport_api_udp_SOURCES = \ | test_transport_api_udp_SOURCES = \ | |||
test_transport_api.c | test_transport_api.c | |||
test_transport_api_udp_LDADD = \ | test_transport_api_udp_LDADD = \ | |||
$(top_builddir)/src/transport/libgnunettransport.la \ | $(top_builddir)/src/transport/libgnunettransport.la \ | |||
$(top_builddir)/src/hello/libgnunethello.la \ | $(top_builddir)/src/hello/libgnunethello.la \ | |||
$(top_builddir)/src/util/libgnunetutil.la \ | $(top_builddir)/src/util/libgnunetutil.la \ | |||
$(top_builddir)/src/transport/libgnunettransporttesting.la | $(top_builddir)/src/transport/libgnunettransporttesting.la | |||
test_transport_api_timeout_udp_SOURCES = \ | ||||
test_transport_api_timeout.c | ||||
test_transport_api_timeout_udp_LDADD = \ | ||||
$(top_builddir)/src/transport/libgnunettransport.la \ | ||||
$(top_builddir)/src/hello/libgnunethello.la \ | ||||
$(top_builddir)/src/util/libgnunetutil.la \ | ||||
$(top_builddir)/src/transport/libgnunettransporttesting.la | ||||
test_transport_api_udp_nat_SOURCES = \ | test_transport_api_udp_nat_SOURCES = \ | |||
test_transport_api.c | test_transport_api.c | |||
test_transport_api_udp_nat_LDADD = \ | test_transport_api_udp_nat_LDADD = \ | |||
$(top_builddir)/src/transport/libgnunettransport.la \ | $(top_builddir)/src/transport/libgnunettransport.la \ | |||
$(top_builddir)/src/hello/libgnunethello.la \ | $(top_builddir)/src/hello/libgnunethello.la \ | |||
$(top_builddir)/src/util/libgnunetutil.la \ | $(top_builddir)/src/util/libgnunetutil.la \ | |||
$(top_builddir)/src/transport/libgnunettransporttesting.la | $(top_builddir)/src/transport/libgnunettransporttesting.la | |||
test_transport_api_unix_SOURCES = \ | test_transport_api_unix_SOURCES = \ | |||
test_transport_api.c | test_transport_api.c | |||
test_transport_api_unix_LDADD = \ | test_transport_api_unix_LDADD = \ | |||
$(top_builddir)/src/transport/libgnunettransport.la \ | $(top_builddir)/src/transport/libgnunettransport.la \ | |||
$(top_builddir)/src/hello/libgnunethello.la \ | $(top_builddir)/src/hello/libgnunethello.la \ | |||
$(top_builddir)/src/util/libgnunetutil.la \ | $(top_builddir)/src/util/libgnunetutil.la \ | |||
$(top_builddir)/src/transport/libgnunettransporttesting.la | $(top_builddir)/src/transport/libgnunettransporttesting.la | |||
#test_plugin_transport_http_SOURCES = \ | ||||
# test_plugin_transport_http.c | ||||
#test_plugin_transport_http_LDADD = \ | ||||
# $(top_builddir)/src/statistics/libgnunetstatistics.la \ | ||||
# @LIBCURL@ \ | ||||
# $(top_builddir)/src/hello/libgnunethello.la \ | ||||
# $(top_builddir)/src/util/libgnunetutil.la | ||||
test_transport_api_http_SOURCES = \ | test_transport_api_http_SOURCES = \ | |||
test_transport_api.c | test_transport_api.c | |||
test_transport_api_http_LDADD = \ | test_transport_api_http_LDADD = \ | |||
$(top_builddir)/src/transport/libgnunettransport.la \ | $(top_builddir)/src/transport/libgnunettransport.la \ | |||
$(top_builddir)/src/hello/libgnunethello.la \ | $(top_builddir)/src/hello/libgnunethello.la \ | |||
$(top_builddir)/src/util/libgnunetutil.la \ | $(top_builddir)/src/util/libgnunetutil.la \ | |||
$(top_builddir)/src/transport/libgnunettransporttesting.la | $(top_builddir)/src/transport/libgnunettransporttesting.la | |||
test_transport_api_http_nat_SOURCES = \ | test_transport_api_http_nat_SOURCES = \ | |||
test_transport_api.c | test_transport_api.c | |||
skipping to change at line 751 | skipping to change at line 776 | |||
test_transport_api_bidirectional_connect_peer1.conf\ | test_transport_api_bidirectional_connect_peer1.conf\ | |||
test_transport_api_bidirectional_connect_peer2.conf\ | test_transport_api_bidirectional_connect_peer2.conf\ | |||
test_transport_api_tcp_nat_peer1.conf\ | test_transport_api_tcp_nat_peer1.conf\ | |||
test_transport_api_tcp_nat_peer2.conf\ | test_transport_api_tcp_nat_peer2.conf\ | |||
test_transport_api_tcp_peer1.conf\ | test_transport_api_tcp_peer1.conf\ | |||
test_transport_api_tcp_peer2.conf\ | test_transport_api_tcp_peer2.conf\ | |||
test_transport_api_udp_nat_peer1.conf\ | test_transport_api_udp_nat_peer1.conf\ | |||
test_transport_api_udp_nat_peer2.conf\ | test_transport_api_udp_nat_peer2.conf\ | |||
test_transport_api_udp_peer1.conf\ | test_transport_api_udp_peer1.conf\ | |||
test_transport_api_udp_peer2.conf\ | test_transport_api_udp_peer2.conf\ | |||
test_transport_api_timeout_udp_peer1.conf\ | ||||
test_transport_api_timeout_udp_peer2.conf\ | ||||
test_transport_api_unix_peer1.conf\ | test_transport_api_unix_peer1.conf\ | |||
test_transport_api_unix_peer2.conf\ | test_transport_api_unix_peer2.conf\ | |||
test_transport_api_timeout_unix_peer1.conf\ | ||||
test_transport_api_timeout_unix_peer2.conf\ | ||||
test_transport_api_unreliability_udp_peer1.conf\ | test_transport_api_unreliability_udp_peer1.conf\ | |||
test_transport_api_unreliability_udp_peer2.conf\ | test_transport_api_unreliability_udp_peer2.conf\ | |||
test_transport_api_unreliability_unix_peer1.conf\ | test_transport_api_unreliability_unix_peer1.conf\ | |||
test_transport_api_unreliability_unix_peer2.conf\ | test_transport_api_unreliability_unix_peer2.conf\ | |||
test_transport_api_unreliability_wlan_peer1.conf\ | test_transport_api_unreliability_wlan_peer1.conf\ | |||
test_transport_api_unreliability_wlan_peer2.conf\ | test_transport_api_unreliability_wlan_peer2.conf\ | |||
test_transport_api_wlan_peer1.conf\ | test_transport_api_wlan_peer1.conf\ | |||
test_transport_api_wlan_peer2.conf\ | test_transport_api_wlan_peer2.conf\ | |||
test_transport_defaults.conf\ | test_transport_defaults.conf\ | |||
test_transport_startonly.conf\ | test_transport_startonly.conf\ | |||
End of changes. 15 change blocks. | ||||
10 lines changed or deleted | 39 lines changed or added | |||
This html diff was produced by rfcdiff 1.41. The latest version is available from http://tools.ietf.org/tools/rfcdiff/ |