aboutsummaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorDavid Brodski <david@brodski.eu>2011-05-30 23:15:25 +0000
committerDavid Brodski <david@brodski.eu>2011-05-30 23:15:25 +0000
commitc592ecc8263cd14fe24e3d210e3acbd76958d394 (patch)
treec254d15e39918b52e4fd2628eb236c82ad0bd387 /src
parent6d099bc6b713b5a5c0ece6c1dc9a94b8fa751c8a (diff)
downloadgnunet-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.am32
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
35if HAVE_PCAP 35if HAVE_PCAP
36if LINUX 36if 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
41endif 43endif
42endif 44endif
43 45
@@ -78,8 +80,9 @@ libgnunettransport_la_LDFLAGS = \
78 80
79bin_PROGRAMS = \ 81bin_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
84bin_SCRIPTS = \ 87bin_SCRIPTS = \
85 gnunet-transport-certificate-creation 88 gnunet-transport-certificate-creation
@@ -91,13 +94,21 @@ gnunet_nat_server_SOURCES = \
91gnunet_transport_wlan_helper_SOURCES = \ 94gnunet_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
99gnunet_transport_wlan_helper_dummy_SOURCES = \
100 wlan/radiotap-parser.c \
101 wlan/helper_common.c \
102 test_plugin_transport_wlan_dummy.c
103
97gnunet_transport_wlan_helper_LDADD = \ 104gnunet_transport_wlan_helper_LDADD = \
98 $(top_builddir)/src/util/libgnunetutil.la \ 105 $(top_builddir)/src/util/libgnunetutil.la \
99 -lpcap 106 -lpcap
100 107
108gnunet_transport_wlan_helper_dummy_LDADD = \
109 $(top_builddir)/src/util/libgnunetutil.la \
110 -lpcap
111
101gnunet_nat_client_SOURCES = \ 112gnunet_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
244if !DISABLE_TEST_RUN 256if !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)
272endif 286endif
273 287
274test_transport_ats_SOURCES = \ 288test_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
340test_transport_api_unreliability_wlan_SOURCES = \
341 test_transport_api_unreliability.c
342test_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
327test_transport_api_udp_SOURCES = \ 347test_transport_api_udp_SOURCES = \
328 test_transport_api.c 348 test_transport_api.c