wip

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

diff --git a/src/transport/Makefile.am b/src/transport/Makefile.am
index ee01b00cfb0ea05c2607be84af1bb2ef5f1e8d7e..699e8efcaba7c758f1909e3a576194195db43ee6 100644 (file)
--- a/src/transport/Makefile.am
+++ b/src/transport/Makefile.am
@@ -34,11 +34,10 @@ endif
 
 if HAVE_PCAP
 if LINUX
-if HAVE_EXPERIMENTAL
  WANBIN = gnunet-transport-wlan-helper
  WLAN_PLUGIN_LA = libgnunet_plugin_transport_wlan.la
  WLAN_API_TEST = test_transport_api_wlan
-endif
+ WLAN_REL_TEST = test_transport_api_reliability_wlan
 endif
 endif
 
@@ -85,9 +84,13 @@ bin_SCRIPTS = \
 gnunet_nat_server_SOURCES = \
  $(NATSERVER)
 
-    
+
 gnunet_transport_wlan_helper_SOURCES = \
+ wlan/radiotap-parser.c \
+ wlan/helper_common.c \
+ wlan/loopback_helper.c \
  gnunet-transport-wlan-helper.c
+
 gnunet_transport_wlan_helper_LDADD = \
   $(top_builddir)/src/util/libgnunetutil.la \
  -lpcap
@@ -104,17 +107,21 @@ gnunet_transport_LDADD = \
 gnunet_transport_DEPENDENCIES = \
   libgnunettransport.la                                
 
+if HAVE_LIBGLPK
+  GN_GLPK = -lglpk
+endif
+
 gnunet_service_transport_SOURCES = \
- gnunet-service-transport.c  
+ gnunet-service-transport.c
 gnunet_service_transport_LDADD = \
   $(top_builddir)/src/hello/libgnunethello.la \
   $(top_builddir)/src/peerinfo/libgnunetpeerinfo.la \
   $(top_builddir)/src/statistics/libgnunetstatistics.la \
   $(top_builddir)/src/util/libgnunetutil.la \
+  $(GN_GLPK) \
   $(GN_LIBINTL)
 gnunet_service_transport_DEPENDENCIES = \
-  libgnunettransport.la                                
-
+  libgnunettransport.la                                  
 
 plugin_LTLIBRARIES = \
   libgnunet_plugin_transport_tcp.la \
@@ -202,6 +209,8 @@ libgnunet_plugin_transport_https_la_CFLAGS = \
 
 
 check_PROGRAMS = \
+ test_transport_ats \
+ test_transport_ats_perf \
  test_transport_api_tcp \
  test_transport_api_tcp_nat \
  test_transport_api_udp \
@@ -212,6 +221,7 @@ check_PROGRAMS = \
  $(HTTPS_PLUGIN_TEST) \
  $(HTTPS_API_TEST) \
  $(WLAN_API_TEST) \
+ $(WLAN_REL_TEST) \
  test_transport_api_multi \
  test_transport_api_reliability_tcp \
  test_transport_api_reliability_tcp_nat \
@@ -231,6 +241,8 @@ check_PROGRAMS = \
 
 if !DISABLE_TEST_RUN
 TESTS = \
+ test_transport_ats \
+ test_transport_ats_perf \
  test_transport_api_tcp \
  test_transport_api_tcp_nat \
  test_transport_api_udp \
@@ -257,6 +269,19 @@ TESTS = \
  $(HTTPS_QUOTA_TEST)
 endif
 
+test_transport_ats_SOURCES = \
+ test_transport_ats.c
+test_transport_ats_LDADD = \
+ $(top_builddir)/src/testing/libgnunettesting.la \
+ $(top_builddir)/src/util/libgnunetutil.la  
+
+test_transport_ats_perf_SOURCES = \
+ test_transport_ats_perf.c
+test_transport_ats_perf_LDADD = \
+ $(top_builddir)/src/testing/libgnunettesting.la \
+ $(GN_GLPK) \
+ $(top_builddir)/src/util/libgnunetutil.la  
+
 test_transport_api_tcp_SOURCES = \
  test_transport_api.c
 test_transport_api_tcp_LDADD = \
@@ -285,6 +310,14 @@ test_transport_api_reliability_tcp_nat_LDADD = \
  $(top_builddir)/src/hello/libgnunethello.la \
  $(top_builddir)/src/util/libgnunetutil.la 
 
+test_transport_api_reliability_wlan_SOURCES = \
+ test_transport_api_reliability.c
+test_transport_api_reliability_wlan_LDADD = \
+ $(top_builddir)/src/transport/libgnunettransport.la \
+ $(top_builddir)/src/hello/libgnunethello.la \
+ $(top_builddir)/src/util/libgnunetutil.la
+
+
 test_transport_api_udp_SOURCES = \
  test_transport_api.c
 test_transport_api_udp_LDADD = \
@@ -351,7 +384,7 @@ test_transport_api_reliability_https_LDADD = \
  $(top_builddir)/src/transport/libgnunettransport.la \
  $(top_builddir)/src/hello/libgnunethello.la \
  $(top_builddir)/src/util/libgnunetutil.la
- 
+
 test_transport_api_unreliability_unix_SOURCES = \
  test_transport_api_unreliability.c
 test_transport_api_unreliability_unix_LDADD = \