remove port from transport section because it was getting in the way of making sense...

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

diff --git a/src/transport/Makefile.am b/src/transport/Makefile.am
index 19cd68f2a8109329985e1dfca86f7d9c93e88dca..d0187af8b2e2dd1addc33a2bb79e4a675f170cf0 100644 (file)
--- a/src/transport/Makefile.am
+++ b/src/transport/Makefile.am
@@ -4,35 +4,48 @@ plugindir = $(libdir)/gnunet
 
 if MINGW
   WINFLAGS = -Wl,--no-undefined -Wl,--export-all-symbols
+  NATBIN = gnunet-nat-server gnunet-nat-client
+  NATSERVER = gnunet-nat-server-windows.c
+  NATCLIENT = gnunet-nat-client-windows.c
+else
+  NATSERVER = gnunet-nat-server.c
+  NATCLIENT = gnunet-nat-client.c
 endif
 
 if HAVE_MHD
  GN_LIBMHD = -lmicrohttpd
  HTTP_PLUGIN_LA = libgnunet_plugin_transport_http.la
- HTTP_PLUGIN_CHECK = test_plugin_transport_http \
-                     test_transport_api_http \
-                     test_transport_api_reliability_http
-                     
+ HTTP_PLUGIN_TEST = test_plugin_transport_http
+ HTTP_API_TEST = test_transport_api_http
+ HTTP_REL_TEST = test_transport_api_reliability_http
+
  HTTPS_PLUGIN_LA = libgnunet_plugin_transport_https.la
- HTTPS_PLUGIN_CHECK = test_plugin_transport_https \
-                      test_transport_api_https \
-                      test_transport_api_reliability_https                     
+ HTTPS_PLUGIN_TEST = test_plugin_transport_https
+ HTTPS_API_TEST = test_transport_api_https
+ HTTPS_REL_TEST = test_transport_api_reliability_https                     
 endif
 
 if USE_COVERAGE
   AM_CFLAGS = --coverage -O0
 endif
 
+if HAVE_PCAP
+if LINUX
+WANBIN = gnunet-transport-wlan-helper
+WLAN_PLUGIN_LA = libgnunet_plugin_transport_wlan.la
+endif
+endif
+
 if LINUX
 NATBIN = gnunet-nat-server gnunet-nat-client
 install-exec-hook:
-       chown root $(bindir)/gnunet-nat-server $(bindir)/gnunet-nat-client || true
-       chmod u+s $(bindir)/gnunet-nat-server $(bindir)/gnunet-nat-client || true
+       chown root $(bindir)/gnunet-nat-server $(bindir)/gnunet-nat-client $(bindir)/gnunet-wlan || true
+       chmod u+s $(bindir)/gnunet-nat-server $(bindir)/gnunet-nat-client $(bindir)/gnunet-wlan || true
 else
 install-exec-hook:
-       gnunet-transport-plugin-certificate-creation
 endif
 
+#noinst_PROGRAMS = ${check_PROGRAMS}
 
 lib_LTLIBRARIES = \
   libgnunettransport.la
@@ -52,16 +65,22 @@ libgnunettransport_la_LDFLAGS = \
 
 bin_PROGRAMS = \
  gnunet-transport \
+ $(WANBIN) \
  gnunet-service-transport $(NATBIN)
- 
+
 bin_SCRIPTS = \
  gnunet-transport-certificate-creation
 
 gnunet_nat_server_SOURCES = \
- gnunet-nat-server.c         
+ $(NATSERVER)
+
+gnunet_transport_wlan_helper_SOURCES = \
+ gnunet-transport-wlan-helper.c         
+gnunet_transport_wlan_helper_LDADD = \
+ -lpcap
 
 gnunet_nat_client_SOURCES = \
- gnunet-nat-client.c         
+ $(NATCLIENT)         
 
 gnunet_transport_SOURCES = \
  gnunet-transport.c         
@@ -85,6 +104,7 @@ plugin_LTLIBRARIES = \
   libgnunet_plugin_transport_udp.la \
   $(HTTP_PLUGIN_LA) \
   $(HTTPS_PLUGIN_LA) \
+  $(WLAN_PLUGIN_LA) \
   libgnunet_plugin_transport_template.la
 # TODO: add nat, etc.
 
@@ -105,6 +125,20 @@ libgnunet_plugin_transport_template_la_LIBADD = \
 libgnunet_plugin_transport_template_la_LDFLAGS = \
  $(GN_PLUGIN_LDFLAGS)
 
+if HAVE_PCAP
+if LINUX
+libgnunet_plugin_transport_wlan_la_SOURCES = \
+       plugin_transport_wlan.c
+libgnunet_plugin_transport_wlan_la_LIBADD = \
+       $(top_builddir)/src/hello/libgnunethello.la \
+       $(top_builddir)/src/statistics/libgnunetstatistics.la \
+       $(top_builddir)/src/peerinfo/libgnunetpeerinfo.la \
+       $(top_builddir)/src/util/libgnunetutil.la 
+libgnunet_plugin_transport_wlan_la_LDFLAGS = \
+       $(GN_PLUGIN_LDFLAGS)
+endif
+endif
+
 libgnunet_plugin_transport_udp_la_SOURCES = \
   plugin_transport_udp.c
 libgnunet_plugin_transport_udp_la_LIBADD = \
@@ -139,7 +173,7 @@ libgnunet_plugin_transport_http_la_LDFLAGS = \
  $(GN_PLUGIN_LDFLAGS)
  
 libgnunet_plugin_transport_https_la_SOURCES = \
-  plugin_transport_https.c
+  plugin_transport_http.c
 libgnunet_plugin_transport_https_la_LIBADD = \
   $(top_builddir)/src/hello/libgnunethello.la \
   $(top_builddir)/src/statistics/libgnunetstatistics.la \
@@ -148,30 +182,42 @@ libgnunet_plugin_transport_https_la_LIBADD = \
   $(top_builddir)/src/util/libgnunetutil.la 
 libgnunet_plugin_transport_https_la_LDFLAGS = \
  $(GN_LIBMHD) \
- $(GN_PLUGIN_LDFLAGS) 
+ $(GN_PLUGIN_LDFLAGS)
+libgnunet_plugin_transport_https_la_CFLAGS = \
+ $(CFLAGS) -DBUILD_HTTPS  
 endif
 
 check_PROGRAMS = \
  test_transport_api_tcp \
  test_transport_api_tcp_nat \
  test_transport_api_udp \
- $(HTTP_PLUGIN_CHECK) \
- $(HTTPS_PLUGIN_CHECK) \
  test_transport_api_udp_nat \
+ $(HTTP_PLUGIN_TEST) \
+ $(HTTP_API_TEST) \
+ $(HTTPS_PLUGIN_TEST) \
+ $(HTTPS_API_TEST) \
  test_transport_api_reliability_tcp \
  test_transport_api_reliability_tcp_nat \
- test_transport_api_reliability_udp
+ test_transport_api_reliability_udp \
+ $(HTTP_REL_TEST) \
+ $(HTTPS_REL_TEST)
 # TODO: add tests for nat, etc.
 
+if !DISABLE_TEST_RUN
 TESTS = \
  test_transport_api_tcp \
  test_transport_api_tcp_nat \
  test_transport_api_udp \
  test_transport_api_udp_nat \
- $(HTTP_PLUGIN_CHECK) \
- $(HTTPS_PLUGIN_CHECK) \
+ $(HTTP_PLUGIN_TEST) \
+ $(HTTP_API_TEST) \
+ $(HTTPS_PLUGIN_TEST) \
+ $(HTTPS_API_TEST) \
  test_transport_api_reliability_tcp \
- test_transport_api_reliability_tcp_nat
+ test_transport_api_reliability_tcp_nat \
+ $(HTTP_REL_TEST) \
+ $(HTTPS_REL_TEST)
+endif
 
 test_transport_api_tcp_SOURCES = \
  test_transport_api.c
@@ -250,12 +296,13 @@ test_transport_api_https_SOURCES = \
 test_transport_api_https_LDADD = \
  $(top_builddir)/src/transport/libgnunettransport.la \
  $(top_builddir)/src/util/libgnunetutil.la  
- 
+
 test_transport_api_reliability_https_SOURCES = \
  test_transport_api_reliability.c
 test_transport_api_reliability_https_LDADD = \
  $(top_builddir)/src/transport/libgnunettransport.la \
- $(top_builddir)/src/util/libgnunetutil.la    
+ $(top_builddir)/src/util/libgnunetutil.la
+
 endif
 
 EXTRA_DIST = \
@@ -277,4 +324,4 @@ EXTRA_DIST = \
   test_transport_api_rel_http_peer2.conf \
   test_transport_api_rel_https_peer1.conf \
   test_transport_api_rel_https_peer2.conf \
-  test_plugin_transport_data_http.conf
\ No newline at end of file
+  test_plugin_transport_data_http.conf