more code

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

diff --git a/src/transport/Makefile.am b/src/transport/Makefile.am
index fd82bdd183991a12d165e79aca5b4c08b15fce0d..e5c50765579bfc76893e109bdc75518ad3aa98ec 100644 (file)
--- a/src/transport/Makefile.am
+++ b/src/transport/Makefile.am
@@ -18,10 +18,18 @@ if HAVE_MHD
 endif
 
 if HAVE_LIBCURL
+ HTTP_CLIENT_PLUGIN_TEST = test_plugin_http_client
+ HTTPS_CLIENT_PLUGIN_TEST = test_plugin_https_client
  HTTP_CLIENT_PLUGIN_LA = libgnunet_plugin_transport_http_client.la
  HTTPS_CLIENT_PLUGIN_LA = libgnunet_plugin_transport_https_client.la
 endif
 
+if HAVE_MHD 
+if HAVE_LIBCURL
+ HTTP_API_TEST = test_transport_api_http
+endif
+endif 
+
 if FALSE 
  HTTP_API_TEST = test_transport_api_http
  HTTP_NAT_API_TEST = test_transport_api_http_nat
@@ -304,6 +312,8 @@ check_PROGRAMS = \
  test_plugin_udp \
  $(UNIX_TEST) \
  $(WLAN_PLUGIN_TEST) \
+ $(HTTP_CLIENT_PLUGIN_TEST) \
+ $(HTTPS_CLIENT_PLUGIN_TEST) \
  $(HTTP_SERVER_PLUGIN_TEST) \
  $(HTTPS_SERVER_PLUGIN_TEST) \
  test_transport_api_blacklisting \
@@ -371,6 +381,7 @@ TESTS = \
  $(UNIX_PLUGIN_TEST) \
  $(UNIX_PLUGIN_TIMEOUT_TEST) \
  test_transport_api_udp_nat \
+ test_transport_api_http \
  $(HTTP_API_TEST) \
  $(HTTP_NAT_API_TEST) \
  $(HTTP_API_TIMEOUT_TEST) \
@@ -498,11 +509,29 @@ test_plugin_http_server_LDADD = \
 test_plugin_https_server_SOURCES = \
  test_plugin_transport.c
 test_plugin_https_server_LDADD = \
+ $(top_builddir)/src/transport/libgnunettransport.la \
+ $(top_builddir)/src/statistics/libgnunetstatistics.la \
+ $(top_builddir)/src/hello/libgnunethello.la \
+ $(top_builddir)/src/util/libgnunetutil.la  \
+ $(top_builddir)/src/transport/libgnunettransporttesting.la
+ 
+test_plugin_http_client_SOURCES = \
+ test_plugin_transport.c
+test_plugin_http_client_LDADD = \
  $(top_builddir)/src/transport/libgnunettransport.la \
  $(top_builddir)/src/statistics/libgnunetstatistics.la \
  $(top_builddir)/src/hello/libgnunethello.la \
  $(top_builddir)/src/util/libgnunetutil.la  \
  $(top_builddir)/src/transport/libgnunettransporttesting.la 
+ 
+test_plugin_https_client_SOURCES = \
+ test_plugin_transport.c
+test_plugin_https_client_LDADD = \
+ $(top_builddir)/src/transport/libgnunettransport.la \
+ $(top_builddir)/src/statistics/libgnunetstatistics.la \
+ $(top_builddir)/src/hello/libgnunethello.la \
+ $(top_builddir)/src/util/libgnunetutil.la  \
+ $(top_builddir)/src/transport/libgnunettransporttesting.la  
 
 test_transport_api_tcp_SOURCES = \
  test_transport_api.c
@@ -635,6 +664,15 @@ test_transport_api_unix_LDADD = \
  $(top_builddir)/src/transport/libgnunettransporttesting.la 
 
 # HTTP/S tests
+
+test_transport_api_http_SOURCES = \
+ test_transport_api.c
+test_transport_api_http_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 
+
 if FALSE
 
 test_transport_api_timeout_http_SOURCES = \
@@ -653,15 +691,6 @@ test_transport_api_timeout_https_LDADD = \
  $(top_builddir)/src/util/libgnunetutil.la \
  $(top_builddir)/src/transport/libgnunettransporttesting.la 
 
-
-test_transport_api_http_SOURCES = \
- test_transport_api.c
-test_transport_api_http_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_http_nat_SOURCES = \
  test_transport_api.c
 test_transport_api_http_nat_LDADD = \