doxygen

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

diff --git a/src/transport/Makefile.am b/src/transport/Makefile.am
index 666c4af0636189b79991bb34bc8382d47f028d3e..21a76e2a70385e738e51a3d1a22957a81edf2fe6 100644 (file)
--- a/src/transport/Makefile.am
+++ b/src/transport/Makefile.am
@@ -19,16 +19,13 @@ if HAVE_MHD
  HTTP_API_TEST = test_transport_api_http
  HTTP_REL_TEST = test_transport_api_reliability_http
  HTTP_QUOTA_TEST = test_quota_compliance_http \
-                                  test_quota_compliance_http_asymmetric_recv_constant \
-                                  test_quota_compliance_http_asymmetric_send_constant
-
+                  test_quota_compliance_http_asymmetric_recv_constant
  HTTPS_PLUGIN_LA = libgnunet_plugin_transport_https.la
  HTTPS_PLUGIN_TEST = test_plugin_transport_https
  HTTPS_API_TEST = test_transport_api_https
  HTTPS_REL_TEST = test_transport_api_reliability_https
  HTTPS_QUOTA_TEST = test_quota_compliance_https \
-                                       test_quota_compliance_https_asymmetric_recv_constant \
-                                       test_quota_compliance_https_asymmetric_send_constant
+               test_quota_compliance_https_asymmetric_recv_constant
 endif
 
 if USE_COVERAGE
@@ -39,6 +36,8 @@ if HAVE_PCAP
 if LINUX
  WANBIN = gnunet-transport-wlan-helper
  WLAN_PLUGIN_LA = libgnunet_plugin_transport_wlan.la
+ WLAN_API_TEST =
+# WLAN_API_TEST = test_transport_api_wlan
 endif
 endif
 
@@ -80,9 +79,11 @@ bin_SCRIPTS = \
 gnunet_nat_server_SOURCES = \
  $(NATSERVER)
 
+    
 gnunet_transport_wlan_helper_SOURCES = \
- gnunet-transport-wlan-helper.c         
+ gnunet-transport-wlan-helper.c
 gnunet_transport_wlan_helper_LDADD = \
+  $(top_builddir)/src/util/libgnunetutil.la \
  -lpcap
 
 gnunet_nat_client_SOURCES = \
@@ -94,6 +95,8 @@ gnunet_transport_LDADD = \
   $(top_builddir)/src/transport/libgnunettransport.la \
   $(top_builddir)/src/util/libgnunetutil.la \
   $(GN_LIBINTL)
+gnunet_transport_DEPENDENCIES = \
+  libgnunettransport.la                                
 
 gnunet_service_transport_SOURCES = \
  gnunet-service-transport.c plugin_transport.h 
@@ -103,6 +106,8 @@ gnunet_service_transport_LDADD = \
   $(top_builddir)/src/statistics/libgnunetstatistics.la \
   $(top_builddir)/src/util/libgnunetutil.la \
   $(GN_LIBINTL)
+gnunet_service_transport_DEPENDENCIES = \
+  libgnunettransport.la                                
 
 
 plugin_LTLIBRARIES = \
@@ -120,6 +125,7 @@ libgnunet_plugin_transport_tcp_la_LIBADD = \
   $(top_builddir)/src/hello/libgnunethello.la \
   $(top_builddir)/src/statistics/libgnunetstatistics.la \
   $(top_builddir)/src/peerinfo/libgnunetpeerinfo.la \
+  $(top_builddir)/src/nat/libgnunetnat.la \
   $(top_builddir)/src/util/libgnunetutil.la 
 libgnunet_plugin_transport_tcp_la_LDFLAGS = \
  $(GN_PLUGIN_LDFLAGS)
@@ -177,7 +183,7 @@ libgnunet_plugin_transport_http_la_LIBADD = \
 libgnunet_plugin_transport_http_la_LDFLAGS = \
  $(GN_LIBMHD) \
  $(GN_PLUGIN_LDFLAGS)
- 
+
 libgnunet_plugin_transport_https_la_SOURCES = \
   plugin_transport_http.c
 libgnunet_plugin_transport_https_la_LIBADD = \
@@ -193,6 +199,7 @@ libgnunet_plugin_transport_https_la_CFLAGS = \
  $(CFLAGS) -DBUILD_HTTPS  
 endif
 
+
 check_PROGRAMS = \
  test_transport_api_tcp \
  test_transport_api_tcp_nat \
@@ -202,6 +209,8 @@ check_PROGRAMS = \
  $(HTTP_API_TEST) \
  $(HTTPS_PLUGIN_TEST) \
  $(HTTPS_API_TEST) \
+ $(WLAN_API_TEST) \
+ test_transport_api_multi \
  test_transport_api_reliability_tcp \
  test_transport_api_reliability_tcp_nat \
  test_transport_api_reliability_udp \
@@ -209,9 +218,7 @@ check_PROGRAMS = \
  $(HTTPS_REL_TEST) \
  test_quota_compliance_tcp \
  test_quota_compliance_tcp_asymmetric_recv_constant \
- test_quota_compliance_tcp_asymmetric_send_constant \
  test_quota_compliance_udp \
- test_quota_compliance_udp_asymmetric_send_constant \
  test_quota_compliance_udp_asymmetric_recv_constant \
  $(HTTP_QUOTA_TEST) \
  $(HTTPS_QUOTA_TEST)
@@ -227,15 +234,15 @@ TESTS = \
  $(HTTP_API_TEST) \
  $(HTTPS_PLUGIN_TEST) \
  $(HTTPS_API_TEST) \
+ $(WLAN_API_TEST) \
+ test_transport_api_multi \
  test_transport_api_reliability_tcp \
  test_transport_api_reliability_tcp_nat \
  $(HTTP_REL_TEST) \
  $(HTTPS_REL_TEST) \
  test_quota_compliance_tcp \
  test_quota_compliance_tcp_asymmetric_recv_constant \
- test_quota_compliance_tcp_asymmetric_send_constant \
  test_quota_compliance_udp \
- test_quota_compliance_udp_asymmetric_send_constant \
  test_quota_compliance_udp_asymmetric_recv_constant \
  $(HTTP_QUOTA_TEST) \
  $(HTTPS_QUOTA_TEST)
@@ -283,8 +290,6 @@ test_transport_api_udp_nat_LDADD = \
  $(top_builddir)/src/transport/libgnunettransport.la \
  $(top_builddir)/src/util/libgnunetutil.la  
 
-if HAVE_MHD
-
 test_plugin_transport_http_SOURCES = \
  test_plugin_transport_http.c
 test_plugin_transport_http_LDADD = \
@@ -304,7 +309,7 @@ test_transport_api_reliability_http_SOURCES = \
 test_transport_api_reliability_http_LDADD = \
  $(top_builddir)/src/transport/libgnunettransport.la \
  $(top_builddir)/src/util/libgnunetutil.la
- 
+
 test_plugin_transport_https_SOURCES = \
  test_plugin_transport_https.c
 test_plugin_transport_https_LDADD = \
@@ -325,6 +330,16 @@ test_transport_api_reliability_https_LDADD = \
  $(top_builddir)/src/transport/libgnunettransport.la \
  $(top_builddir)/src/util/libgnunetutil.la
 
+if HAVE_PCAP
+if LINUX
+test_transport_api_wlan_SOURCES = \
+ test_transport_api.c
+test_transport_api_wlan_LDADD = \
+ $(top_builddir)/src/transport/libgnunettransport.la \
+ $(top_builddir)/src/util/libgnunetutil.la  
+endif
+endif
+
 test_quota_compliance_tcp_SOURCES = \
  test_quota_compliance.c
 test_quota_compliance_tcp_LDADD = \
@@ -336,30 +351,30 @@ test_quota_compliance_tcp_asymmetric_recv_constant_SOURCES = \
 test_quota_compliance_tcp_asymmetric_recv_constant_LDADD = \
  $(top_builddir)/src/transport/libgnunettransport.la \
  $(top_builddir)/src/util/libgnunetutil.la
- 
- test_quota_compliance_tcp_asymmetric_send_constant_SOURCES = \
- test_quota_compliance.c
-test_quota_compliance_tcp_asymmetric_send_constant_LDADD = \
- $(top_builddir)/src/transport/libgnunettransport.la \
- $(top_builddir)/src/util/libgnunetutil.la
+
+#test_quota_compliance_tcp_asymmetric_send_constant_SOURCES = \
+# test_quota_compliance.c
+#test_quota_compliance_tcp_asymmetric_send_constant_LDADD = \
+# $(top_builddir)/src/transport/libgnunettransport.la \
+# $(top_builddir)/src/util/libgnunetutil.la
 
 test_quota_compliance_http_SOURCES = \
  test_quota_compliance.c
 test_quota_compliance_http_LDADD = \
  $(top_builddir)/src/transport/libgnunettransport.la \
  $(top_builddir)/src/util/libgnunetutil.la
- 
+
  test_quota_compliance_http_asymmetric_recv_constant_SOURCES = \
  test_quota_compliance.c
 test_quota_compliance_http_asymmetric_recv_constant_LDADD = \
  $(top_builddir)/src/transport/libgnunettransport.la \
  $(top_builddir)/src/util/libgnunetutil.la
- 
- test_quota_compliance_http_asymmetric_send_constant_SOURCES = \
- test_quota_compliance.c
-test_quota_compliance_http_asymmetric_send_constant_LDADD = \
- $(top_builddir)/src/transport/libgnunettransport.la \
- $(top_builddir)/src/util/libgnunetutil.la
+
+#test_quota_compliance_http_asymmetric_send_constant_SOURCES = \
+# test_quota_compliance.c
+#test_quota_compliance_http_asymmetric_send_constant_LDADD = \
+# $(top_builddir)/src/transport/libgnunettransport.la \
+# $(top_builddir)/src/util/libgnunetutil.la
 
 test_quota_compliance_https_SOURCES = \
  test_quota_compliance.c
@@ -372,35 +387,36 @@ test_quota_compliance_https_LDADD = \
 test_quota_compliance_https_asymmetric_recv_constant_LDADD = \
  $(top_builddir)/src/transport/libgnunettransport.la \
  $(top_builddir)/src/util/libgnunetutil.la
- 
- test_quota_compliance_https_asymmetric_send_constant_SOURCES = \
- test_quota_compliance.c
-test_quota_compliance_https_asymmetric_send_constant_LDADD = \
- $(top_builddir)/src/transport/libgnunettransport.la \
- $(top_builddir)/src/util/libgnunetutil.la
 
+#test_quota_compliance_https_asymmetric_send_constant_SOURCES = \
+# test_quota_compliance.c
+#test_quota_compliance_https_asymmetric_send_constant_LDADD = \
+# $(top_builddir)/src/transport/libgnunettransport.la \
+# $(top_builddir)/src/util/libgnunetutil.la
 
 test_quota_compliance_udp_SOURCES = \
  test_quota_compliance.c
 test_quota_compliance_udp_LDADD = \
  $(top_builddir)/src/transport/libgnunettransport.la \
  $(top_builddir)/src/util/libgnunetutil.la
- 
+
 test_quota_compliance_udp_asymmetric_recv_constant_SOURCES = \
  test_quota_compliance.c
 test_quota_compliance_udp_asymmetric_recv_constant_LDADD = \
  $(top_builddir)/src/transport/libgnunettransport.la \
  $(top_builddir)/src/util/libgnunetutil.la
- 
-test_quota_compliance_udp_asymmetric_send_constant_SOURCES = \
- test_quota_compliance.c
-test_quota_compliance_udp_asymmetric_send_constant_LDADD = \
- $(top_builddir)/src/transport/libgnunettransport.la \
- $(top_builddir)/src/util/libgnunetutil.la 
-
-endif
 
+#test_quota_compliance_udp_asymmetric_send_constant_SOURCES = \
+# test_quota_compliance.c
+#test_quota_compliance_udp_asymmetric_send_constant_LDADD = \
+# $(top_builddir)/src/transport/libgnunettransport.la \
+# $(top_builddir)/src/util/libgnunetutil.la 
 
+test_transport_api_multi_SOURCES = \
+ test_transport_api.c
+test_transport_api_multi_LDADD = \
+ $(top_builddir)/src/transport/libgnunettransport.la \
+ $(top_builddir)/src/util/libgnunetutil.la  
 EXTRA_DIST = \
   test_transport_api_data.conf \
   test_transport_api_tcp_peer1.conf \
@@ -416,6 +432,10 @@ EXTRA_DIST = \
   test_transport_api_http_peer2.conf \
   test_transport_api_https_peer1.conf \
   test_transport_api_https_peer2.conf \
+  test_transport_api_wlan_peer1.conf \
+  test_transport_api_wlan_peer2.conf \
+  test_transport_api_multi_peer1.conf \
+  test_transport_api_multi_peer2.conf \
   test_transport_api_rel_http_peer1.conf \
   test_transport_api_rel_http_peer2.conf \
   test_transport_api_rel_https_peer1.conf \
@@ -430,4 +450,4 @@ EXTRA_DIST = \
   test_quota_compliance_https_peer1.conf \
   test_quota_compliance_https_peer2.conf \
   test_quota_compliance_udp_peer1.conf \
-  test_quota_compliance_udp_peer2.conf
\ No newline at end of file
+  test_quota_compliance_udp_peer2.conf