diff options
author | David Brodski <david@brodski.eu> | 2011-05-30 23:15:25 +0000 |
---|---|---|
committer | David Brodski <david@brodski.eu> | 2011-05-30 23:15:25 +0000 |
commit | c592ecc8263cd14fe24e3d210e3acbd76958d394 (patch) | |
tree | c254d15e39918b52e4fd2628eb236c82ad0bd387 /src | |
parent | 6d099bc6b713b5a5c0ece6c1dc9a94b8fa751c8a (diff) | |
download | gnunet-c592ecc8263cd14fe24e3d210e3acbd76958d394.tar.gz gnunet-c592ecc8263cd14fe24e3d210e3acbd76958d394.zip |
Fixed makefile to make dummy helper and unrel test
Diffstat (limited to 'src')
-rw-r--r-- | src/transport/Makefile.am | 32 |
1 files changed, 26 insertions, 6 deletions
diff --git a/src/transport/Makefile.am b/src/transport/Makefile.am index 92270bbdd..f1f527e13 100644 --- a/src/transport/Makefile.am +++ b/src/transport/Makefile.am | |||
@@ -34,10 +34,12 @@ endif | |||
34 | 34 | ||
35 | if HAVE_PCAP | 35 | if HAVE_PCAP |
36 | if LINUX | 36 | if LINUX |
37 | WANBIN = gnunet-transport-wlan-helper | 37 | WLAN_BIN = gnunet-transport-wlan-helper |
38 | WLAN_BIN_DUMMY = gnunet-transport-wlan-helper-dummy | ||
38 | WLAN_PLUGIN_LA = libgnunet_plugin_transport_wlan.la | 39 | WLAN_PLUGIN_LA = libgnunet_plugin_transport_wlan.la |
39 | WLAN_API_TEST = test_transport_api_wlan | 40 | WLAN_API_TEST = test_transport_api_wlan |
40 | WLAN_REL_TEST = test_transport_api_reliability_wlan | 41 | WLAN_REL_TEST = test_transport_api_reliability_wlan |
42 | WLAN_UREL_TEST = test_transport_api_unreliability_wlan | ||
41 | endif | 43 | endif |
42 | endif | 44 | endif |
43 | 45 | ||
@@ -78,8 +80,9 @@ libgnunettransport_la_LDFLAGS = \ | |||
78 | 80 | ||
79 | bin_PROGRAMS = \ | 81 | bin_PROGRAMS = \ |
80 | gnunet-transport \ | 82 | gnunet-transport \ |
81 | $(WANBIN) \ | 83 | $(WLAN_BIN) \ |
82 | gnunet-service-transport $(NATBIN) | 84 | gnunet-service-transport $(NATBIN) \ |
85 | $(WLAN_BIN_DUMMY) | ||
83 | 86 | ||
84 | bin_SCRIPTS = \ | 87 | bin_SCRIPTS = \ |
85 | gnunet-transport-certificate-creation | 88 | gnunet-transport-certificate-creation |
@@ -91,13 +94,21 @@ gnunet_nat_server_SOURCES = \ | |||
91 | gnunet_transport_wlan_helper_SOURCES = \ | 94 | gnunet_transport_wlan_helper_SOURCES = \ |
92 | wlan/radiotap-parser.c \ | 95 | wlan/radiotap-parser.c \ |
93 | wlan/helper_common.c \ | 96 | wlan/helper_common.c \ |
94 | wlan/loopback_helper.c \ | ||
95 | gnunet-transport-wlan-helper.c | 97 | gnunet-transport-wlan-helper.c |
96 | 98 | ||
99 | gnunet_transport_wlan_helper_dummy_SOURCES = \ | ||
100 | wlan/radiotap-parser.c \ | ||
101 | wlan/helper_common.c \ | ||
102 | test_plugin_transport_wlan_dummy.c | ||
103 | |||
97 | gnunet_transport_wlan_helper_LDADD = \ | 104 | gnunet_transport_wlan_helper_LDADD = \ |
98 | $(top_builddir)/src/util/libgnunetutil.la \ | 105 | $(top_builddir)/src/util/libgnunetutil.la \ |
99 | -lpcap | 106 | -lpcap |
100 | 107 | ||
108 | gnunet_transport_wlan_helper_dummy_LDADD = \ | ||
109 | $(top_builddir)/src/util/libgnunetutil.la \ | ||
110 | -lpcap | ||
111 | |||
101 | gnunet_nat_client_SOURCES = \ | 112 | gnunet_nat_client_SOURCES = \ |
102 | $(NATCLIENT) | 113 | $(NATCLIENT) |
103 | 114 | ||
@@ -239,6 +250,7 @@ check_PROGRAMS = \ | |||
239 | $(HTTPS_QUOTA_TEST) | 250 | $(HTTPS_QUOTA_TEST) |
240 | # $(WLAN_API_TEST) | 251 | # $(WLAN_API_TEST) |
241 | # $(WLAN_REL_TEST) | 252 | # $(WLAN_REL_TEST) |
253 | # $(WLAN_UREL_TEST) | ||
242 | # TODO: add tests for nat, etc. | 254 | # TODO: add tests for nat, etc. |
243 | 255 | ||
244 | if !DISABLE_TEST_RUN | 256 | if !DISABLE_TEST_RUN |
@@ -267,8 +279,10 @@ TESTS = \ | |||
267 | test_quota_compliance_udp_asymmetric_recv_constant \ | 279 | test_quota_compliance_udp_asymmetric_recv_constant \ |
268 | $(UNIX_QUOTA_TEST) \ | 280 | $(UNIX_QUOTA_TEST) \ |
269 | $(HTTP_QUOTA_TEST) \ | 281 | $(HTTP_QUOTA_TEST) \ |
270 | $(HTTPS_QUOTA_TEST) | 282 | $(HTTPS_QUOTA_TEST) \ |
271 | #$(WLAN_REL_TEST) | 283 | $(WLAN_API_TEST) \ |
284 | $(WLAN_REL_TEST) \ | ||
285 | $(WLAN_UREL_TEST) | ||
272 | endif | 286 | endif |
273 | 287 | ||
274 | test_transport_ats_SOURCES = \ | 288 | test_transport_ats_SOURCES = \ |
@@ -323,6 +337,12 @@ test_transport_api_reliability_wlan_LDADD = \ | |||
323 | $(top_builddir)/src/hello/libgnunethello.la \ | 337 | $(top_builddir)/src/hello/libgnunethello.la \ |
324 | $(top_builddir)/src/util/libgnunetutil.la | 338 | $(top_builddir)/src/util/libgnunetutil.la |
325 | 339 | ||
340 | test_transport_api_unreliability_wlan_SOURCES = \ | ||
341 | test_transport_api_unreliability.c | ||
342 | test_transport_api_unreliability_wlan_LDADD = \ | ||
343 | $(top_builddir)/src/transport/libgnunettransport.la \ | ||
344 | $(top_builddir)/src/hello/libgnunethello.la \ | ||
345 | $(top_builddir)/src/util/libgnunetutil.la | ||
326 | 346 | ||
327 | test_transport_api_udp_SOURCES = \ | 347 | test_transport_api_udp_SOURCES = \ |
328 | test_transport_api.c | 348 | test_transport_api.c |