more code cleanup

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

diff --git a/src/transport/Makefile.am b/src/transport/Makefile.am
index 8b6e91a57c4ed0254b2855a25f0b8e4c73683286..db5a76cfd63fa32518c38095ec9ac968a67fa863 100644 (file)
--- a/src/transport/Makefile.am
+++ b/src/transport/Makefile.am
@@ -4,35 +4,47 @@ 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
+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-certificate-creation
 endif
 
+#noinst_PROGRAMS = ${check_PROGRAMS}
 
 lib_LTLIBRARIES = \
   libgnunettransport.la
@@ -52,16 +64,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         
@@ -155,23 +173,33 @@ 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
@@ -255,7 +283,8 @@ 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 +306,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