fix more leaks

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

diff --git a/src/transport/Makefile.am b/src/transport/Makefile.am
index 4524f9897d481f267e93e4596ac0b9795778bfdf..212ad2ba9a050e6c98c157333a7c507c74bf0d84 100644 (file)
--- a/src/transport/Makefile.am
+++ b/src/transport/Makefile.am
@@ -1,4 +1,4 @@
-INCLUDES = -I$(top_srcdir)/src/include -I$(top_builddir)/src/include
+AM_CPPFLAGS = -I$(top_srcdir)/src/include -I$(top_builddir)/src/include
 
 plugindir = $(libdir)/gnunet
 
@@ -68,7 +68,17 @@ endif
 
 if LINUX
 if HAVE_LIBBLUETOOTH
- AM_LDFLAGS = -lbluetooth
+ BT_BIN = gnunet-helper-transport-bluetooth
+ BT_PLUGIN_LA = libgnunet_plugin_transport_bluetooth.la
+ BT_PLUGIN_TEST = test_plugin_bluetooth
+ BT_API_TEST = test_transport_api_bluetooth
+ BT_REL_TEST = test_transport_api_reliability_bluetooth
+ BT_UREL_TEST = test_transport_api_unreliability_bluetooth
+ BT_QUOTA_TEST = test_quota_compliance_bluetooth \
+    test_quota_compliance_bluetooth_asymmetric
+endif
+else
+if MINGW
  BT_BIN = gnunet-helper-transport-bluetooth
  BT_PLUGIN_LA = libgnunet_plugin_transport_bluetooth.la
 endif
@@ -169,6 +179,13 @@ gnunet_transport_wlan_receiver_LDADD = \
 
 gnunet_helper_transport_bluetooth_SOURCES = \
  gnunet-helper-transport-bluetooth.c
+if MINGW
+ gnunet_helper_transport_bluetooth_LDADD = \
+  $(top_builddir)/src/util/libgnunetutil.la 
+ gnunet_helper_transport_bluetooth_LDFLAGS = -lws2_32
+else
+ gnunet_helper_transport_bluetooth_LDFLAGS = -lbluetooth
+endif
 
 gnunet_transport_SOURCES = \
  gnunet-transport.c         
@@ -296,7 +313,7 @@ libgnunet_plugin_transport_http_client_la_LDFLAGS = \
 libgnunet_plugin_transport_http_client_la_CFLAGS = \
  $(CFLAGS) 
 libgnunet_plugin_transport_http_client_la_CPPFLAGS = \
- @LIBCURL_CPPFLAGS@
+ @LIBCURL_CPPFLAGS@ $(AM_CPPFLAGS)
 
 
 libgnunet_plugin_transport_http_server_la_SOURCES = \
@@ -327,7 +344,7 @@ libgnunet_plugin_transport_https_client_la_LDFLAGS = \
 libgnunet_plugin_transport_https_client_la_CFLAGS = \
  $(CFLAGS) -DBUILD_HTTPS 
 libgnunet_plugin_transport_https_client_la_CPPFLAGS = \
- @LIBCURL_CPPFLAGS@
+ @LIBCURL_CPPFLAGS@ $(AM_CPPFLAGS)
 
 
 libgnunet_plugin_transport_https_server_la_SOURCES = \
@@ -355,6 +372,7 @@ check_PROGRAMS = \
  test_plugin_udp \
  $(UNIX_TEST) \
  $(WLAN_PLUGIN_TEST) \
+ $(BT_PLUGIN_TEST) \
  test_http_common \
  $(HTTP_CLIENT_PLUGIN_TEST) \
  $(HTTPS_CLIENT_PLUGIN_TEST) \
@@ -380,6 +398,7 @@ check_PROGRAMS = \
  $(HTTPS_API_TEST) \
  $(HTTPS_API_TIMEOUT_TEST) \
  $(WLAN_API_TEST) \
+ $(BT_API_TEST) \
  test_transport_api_multi \
  test_transport_blacklisting_no_bl \
  test_transport_blacklisting_outbound_bl_full \
@@ -399,13 +418,16 @@ check_PROGRAMS = \
  $(HTTPS_REL_TEST) \
  $(WLAN_REL_TEST) \
  $(WLAN_UREL_TEST) \
+ $(BT_REL_TEST) \
+ $(BT_UREL_TEST) \
  test_quota_compliance_tcp \
  test_quota_compliance_tcp_asymmetric \
  test_quota_compliance_udp \
  $(UNIX_QUOTA_TEST) \
  $(HTTP_QUOTA_TEST) \
  $(HTTPS_QUOTA_TEST) \
- $(WLAN_QUOTA_TEST)
+ $(WLAN_QUOTA_TEST) \
+ $(BT_QUOTA_TEST)
 endif
 
 if ENABLE_TEST_RUN
@@ -418,6 +440,7 @@ TESTS = \
  test_plugin_udp \
  $(UNIX_TEST) \
  $(WLAN_PLUGIN_TEST) \
+ $(BT_PLUGIN_TEST) \
  test_transport_api_blacklisting \
  test_transport_api_disconnect_tcp \
  test_transport_api_bidirectional_connect \
@@ -437,6 +460,7 @@ TESTS = \
  $(HTTPS_API_TEST) \
  $(HTTPS_API_TIMEOUT_TEST) \
  $(WLAN_API_TEST) \
+ $(BT_API_TEST) \
  test_transport_api_multi \
  test_transport_blacklisting_no_bl \
  test_transport_blacklisting_outbound_bl_full \
@@ -456,6 +480,8 @@ TESTS = \
  $(HTTPS_REL_TEST) \
  $(WLAN_REL_TEST) \
  $(WLAN_UREL_TEST) \
+ $(BT_REL_TEST) \
+ $(BT_UREL_TEST) \
  test_quota_compliance_tcp \
  test_quota_compliance_tcp_asymmetric \
  test_quota_compliance_udp \
@@ -578,7 +604,7 @@ test_plugin_tcp_LDADD = \
  $(top_builddir)/src/hello/libgnunethello.la \
  $(top_builddir)/src/util/libgnunetutil.la  \
  $(top_builddir)/src/transport/libgnunettransporttesting.la
- 
+
 test_plugin_udp_SOURCES = \
  test_plugin_transport.c
 test_plugin_udp_LDADD = \
@@ -606,6 +632,14 @@ test_plugin_wlan_LDADD = \
  $(top_builddir)/src/util/libgnunetutil.la  \
  $(top_builddir)/src/transport/libgnunettransporttesting.la 
 
+test_plugin_bluetooth_SOURCES = \
+ test_plugin_transport.c
+test_plugin_bluetooth_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_http_common_SOURCES = \
  test_http_common.c plugin_transport_http_common.c
@@ -763,6 +797,14 @@ test_transport_api_reliability_tcp_nat_LDADD = \
 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 \
+ $(top_builddir)/src/transport/libgnunettransporttesting.la
+
+test_transport_api_reliability_bluetooth_SOURCES = \
+ test_transport_api_reliability.c
+test_transport_api_reliability_bluetooth_LDADD = \
  $(top_builddir)/src/transport/libgnunettransport.la \
  $(top_builddir)/src/hello/libgnunethello.la \
  $(top_builddir)/src/util/libgnunetutil.la \
@@ -776,6 +818,14 @@ test_transport_api_unreliability_wlan_LDADD = \
  $(top_builddir)/src/util/libgnunetutil.la \
  $(top_builddir)/src/transport/libgnunettransporttesting.la 
 
+test_transport_api_unreliability_bluetooth_SOURCES = \
+ test_transport_api_unreliability.c
+test_transport_api_unreliability_bluetooth_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_udp_SOURCES = \
  test_transport_api.c
 test_transport_api_udp_LDADD = \
@@ -933,6 +983,18 @@ test_transport_api_wlan_LDADD = \
  $(top_builddir)/src/transport/libgnunettransporttesting.la  
 endif
 
+if LINUX
+if HAVE_LIBBLUETOOTH
+test_transport_api_bluetooth_SOURCES = \
+ test_transport_api.c
+test_transport_api_bluetooth_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  
+endif
+endif
+
 test_quota_compliance_tcp_SOURCES = \
  test_quota_compliance.c
 test_quota_compliance_tcp_LDADD = \
@@ -989,6 +1051,22 @@ test_quota_compliance_wlan_asymmetric_LDADD = \
  $(top_builddir)/src/util/libgnunetutil.la \
  $(top_builddir)/src/transport/libgnunettransporttesting.la
 
+test_quota_compliance_bluetooth_SOURCES = \
+ test_quota_compliance.c
+test_quota_compliance_bluetooth_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_quota_compliance_bluetooth_asymmetric_SOURCES = \
+ test_quota_compliance.c
+test_quota_compliance_bluetooth_asymmetric_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_multi_SOURCES = \
  test_transport_api.c
 test_transport_api_multi_LDADD = \
@@ -1018,6 +1096,8 @@ test_quota_compliance_unix_peer1.conf\
 test_quota_compliance_unix_peer2.conf\
 test_quota_compliance_wlan_peer1.conf\
 test_quota_compliance_wlan_peer2.conf\
+test_quota_compliance_bluetooth_peer1.conf\
+test_quota_compliance_bluetooth_peer2.conf\
 test_quota_compliance_http_asymmetric_peer1.conf\
 test_quota_compliance_http_asymmetric_peer2.conf\
 test_quota_compliance_https_asymmetric_peer1.conf\
@@ -1028,6 +1108,8 @@ test_quota_compliance_unix_asymmetric_peer1.conf\
 test_quota_compliance_unix_asymmetric_peer2.conf\
 test_quota_compliance_wlan_asymmetric_peer1.conf\
 test_quota_compliance_wlan_asymmetric_peer2.conf\
+test_quota_compliance_bluetooth_asymmetric_peer1.conf\
+test_quota_compliance_bluetooth_asymmetric_peer2.conf\
 test_transport_api_data.conf\
 test_transport_api_http_peer1.conf\
 test_transport_api_http_peer2.conf\
@@ -1049,6 +1131,8 @@ test_transport_api_reliability_tcp_peer1.conf\
 test_transport_api_reliability_tcp_peer2.conf\
 test_transport_api_reliability_wlan_peer1.conf\
 test_transport_api_reliability_wlan_peer2.conf\
+test_transport_api_reliability_bluetooth_peer1.conf\
+test_transport_api_reliability_bluetooth_peer2.conf\
 test_transport_api_bidirectional_connect_peer1.conf\
 test_transport_api_bidirectional_connect_peer2.conf\
 test_transport_api_manipulation_send_tcp_peer1.conf\
@@ -1077,8 +1161,12 @@ test_transport_api_unreliability_unix_peer1.conf\
 test_transport_api_unreliability_unix_peer2.conf\
 test_transport_api_unreliability_wlan_peer1.conf\
 test_transport_api_unreliability_wlan_peer2.conf\
+test_transport_api_unreliability_bluetooth_peer1.conf\
+test_transport_api_unreliability_bluetooth_peer2.conf\
 test_transport_api_wlan_peer1.conf\
 test_transport_api_wlan_peer2.conf\
+test_transport_api_bluetooth_peer1.conf\
+test_transport_api_bluetooth_peer2.conf\
 test_transport_defaults.conf\
 test_transport_startonly.conf\
 test_transport_api_disconnect_tcp_peer1.conf\