diff options
author | Matthias Wachs <wachs@net.in.tum.de> | 2014-04-08 08:29:59 +0000 |
---|---|---|
committer | Matthias Wachs <wachs@net.in.tum.de> | 2014-04-08 08:29:59 +0000 |
commit | 12a1f586d16f4e4e56b81086c69761a1d70d6242 (patch) | |
tree | 1d61b94db5d9a403c5c964177c26327b9c23ea59 /src/ats-tests | |
parent | 2c8b8355a68805137d10ecaa20093ad678b9f099 (diff) | |
download | gnunet-12a1f586d16f4e4e56b81086c69761a1d70d6242.tar.gz gnunet-12a1f586d16f4e4e56b81086c69761a1d70d6242.zip |
fix bootstrap
Diffstat (limited to 'src/ats-tests')
-rw-r--r-- | src/ats-tests/Makefile.am | 95 |
1 files changed, 14 insertions, 81 deletions
diff --git a/src/ats-tests/Makefile.am b/src/ats-tests/Makefile.am index a8173fb1d..e383ce2cb 100644 --- a/src/ats-tests/Makefile.am +++ b/src/ats-tests/Makefile.am | |||
@@ -31,7 +31,6 @@ TESTING_TESTS = \ | |||
31 | perf_ats_proportional_core_latency \ | 31 | perf_ats_proportional_core_latency \ |
32 | $(PERF_MLP) | 32 | $(PERF_MLP) |
33 | # perf_ats_ril_transport_none perf_ats_ril_core_none perf_ats_ril_transport_bandwidth perf_ats_ril_core_bandwidth perf_ats_ril_transport_latency perf_ats_ril_core_latency | 33 | # perf_ats_ril_transport_none perf_ats_ril_core_none perf_ats_ril_transport_bandwidth perf_ats_ril_core_bandwidth perf_ats_ril_transport_latency perf_ats_ril_core_latency |
34 | |||
35 | endif | 34 | endif |
36 | 35 | ||
37 | lib_LTLIBRARIES = \ | 36 | lib_LTLIBRARIES = \ |
@@ -86,7 +85,6 @@ gnunet_solver_eval_LDADD = \ | |||
86 | gnunet_solver_eval_DEPENDENCIES = \ | 85 | gnunet_solver_eval_DEPENDENCIES = \ |
87 | $(top_builddir)/src/util/libgnunetutil.la | 86 | $(top_builddir)/src/util/libgnunetutil.la |
88 | 87 | ||
89 | |||
90 | perf_ats_proportional_core_none_SOURCES = \ | 88 | perf_ats_proportional_core_none_SOURCES = \ |
91 | perf_ats.c | 89 | perf_ats.c |
92 | perf_ats_proportional_core_none_LDADD = \ | 90 | perf_ats_proportional_core_none_LDADD = \ |
@@ -96,7 +94,7 @@ perf_ats_proportional_core_none_LDADD = \ | |||
96 | $(top_builddir)/src/ats/libgnunetats.la \ | 94 | $(top_builddir)/src/ats/libgnunetats.la \ |
97 | $(top_builddir)/src/core/libgnunetcore.la \ | 95 | $(top_builddir)/src/core/libgnunetcore.la \ |
98 | $(top_builddir)/src/transport/libgnunettransport.la | 96 | $(top_builddir)/src/transport/libgnunettransport.la |
99 | perf_ats_proportional_core_DEPENDENCIES = \ | 97 | perf_ats_proportional_core_none_DEPENDENCIES = \ |
100 | libgnunetatstesting.la \ | 98 | libgnunetatstesting.la \ |
101 | $(top_builddir)/src/util/libgnunetutil.la | 99 | $(top_builddir)/src/util/libgnunetutil.la |
102 | 100 | ||
@@ -165,7 +163,7 @@ perf_ats_proportional_transport_latency_DEPENDENCIES = \ | |||
165 | libgnunetatstesting.la \ | 163 | libgnunetatstesting.la \ |
166 | $(top_builddir)/src/util/libgnunetutil.la | 164 | $(top_builddir)/src/util/libgnunetutil.la |
167 | 165 | ||
168 | if HAVE_LIBGLPK | 166 | if FALSE |
169 | perf_ats_mlp_core_none_SOURCES = \ | 167 | perf_ats_mlp_core_none_SOURCES = \ |
170 | perf_ats.c | 168 | perf_ats.c |
171 | perf_ats_mlp_core_none_LDADD = \ | 169 | perf_ats_mlp_core_none_LDADD = \ |
@@ -245,84 +243,19 @@ perf_ats_mlp_transport_latencyDEPENDENCIES = \ | |||
245 | $(top_builddir)/src/util/libgnunetutil.la | 243 | $(top_builddir)/src/util/libgnunetutil.la |
246 | endif | 244 | endif |
247 | 245 | ||
248 | perf_ats_ril_core_none_SOURCES = \ | 246 | #perf_ats_ril_core_none_SOURCES = \ |
249 | perf_ats.c | 247 | # perf_ats.c |
250 | perf_ats_ril_core_none_LDADD = \ | 248 | #perf_ats_ril_core_none_LDADD = \ |
251 | $(top_builddir)/src/util/libgnunetutil.la \ | 249 | # $(top_builddir)/src/util/libgnunetutil.la \ |
252 | $(top_builddir)/src/ats-tests/libgnunetatstesting.la \ | 250 | # $(top_builddir)/src/ats-tests/libgnunetatstesting.la \ |
253 | $(top_builddir)/src/testbed/libgnunettestbed.la \ | 251 | # $(top_builddir)/src/testbed/libgnunettestbed.la \ |
254 | $(top_builddir)/src/ats/libgnunetats.la \ | 252 | # $(top_builddir)/src/ats/libgnunetats.la \ |
255 | $(top_builddir)/src/core/libgnunetcore.la \ | 253 | # $(top_builddir)/src/core/libgnunetcore.la \ |
256 | $(top_builddir)/src/transport/libgnunettransport.la | 254 | # $(top_builddir)/src/transport/libgnunettransport.la |
257 | perf_ats_ril_core_none_DEPENDENCIES = \ | 255 | #perf_ats_ril_core_none_DEPENDENCIES = \ |
258 | libgnunetatstesting.la \ | 256 | # libgnunetatstesting.la \ |
259 | $(top_builddir)/src/util/libgnunetutil.la | 257 | # $(top_builddir)/src/util/libgnunetutil.la |
260 | |||
261 | perf_ats_ril_transport_none_SOURCES = \ | ||
262 | perf_ats.c | ||
263 | perf_ats_ril_transport_none_LDADD = \ | ||
264 | $(top_builddir)/src/util/libgnunetutil.la \ | ||
265 | $(top_builddir)/src/ats-tests/libgnunetatstesting.la \ | ||
266 | $(top_builddir)/src/testbed/libgnunettestbed.la \ | ||
267 | $(top_builddir)/src/ats/libgnunetats.la \ | ||
268 | $(top_builddir)/src/core/libgnunetcore.la \ | ||
269 | $(top_builddir)/src/transport/libgnunettransport.la | ||
270 | perf_ats_ril_transport_none_DEPENDENCIES = \ | ||
271 | libgnunetatstesting.la \ | ||
272 | $(top_builddir)/src/util/libgnunetutil.la | ||
273 | |||
274 | perf_ats_ril_core_bandwidth_SOURCES = \ | ||
275 | perf_ats.c | ||
276 | perf_ats_ril_core_bandwidth_LDADD = \ | ||
277 | $(top_builddir)/src/util/libgnunetutil.la \ | ||
278 | $(top_builddir)/src/ats-tests/libgnunetatstesting.la \ | ||
279 | $(top_builddir)/src/testbed/libgnunettestbed.la \ | ||
280 | $(top_builddir)/src/ats/libgnunetats.la \ | ||
281 | $(top_builddir)/src/core/libgnunetcore.la \ | ||
282 | $(top_builddir)/src/transport/libgnunettransport.la | ||
283 | perf_ats_ril_core_bandwidth_DEPENDENCIES = \ | ||
284 | libgnunetatstesting.la \ | ||
285 | $(top_builddir)/src/util/libgnunetutil.la | ||
286 | |||
287 | perf_ats_ril_transport_bandwidth_SOURCES = \ | ||
288 | perf_ats.c | ||
289 | perf_ats_ril_transport_bandwidth_LDADD = \ | ||
290 | $(top_builddir)/src/util/libgnunetutil.la \ | ||
291 | $(top_builddir)/src/ats-tests/libgnunetatstesting.la \ | ||
292 | $(top_builddir)/src/testbed/libgnunettestbed.la \ | ||
293 | $(top_builddir)/src/ats/libgnunetats.la \ | ||
294 | $(top_builddir)/src/core/libgnunetcore.la \ | ||
295 | $(top_builddir)/src/transport/libgnunettransport.la | ||
296 | perf_ats_ril_transport_DEPENDENCIES = \ | ||
297 | libgnunetatstesting.la \ | ||
298 | $(top_builddir)/src/util/libgnunetutil.la | ||
299 | |||
300 | 258 | ||
301 | perf_ats_ril_core_latency_SOURCES = \ | ||
302 | perf_ats.c | ||
303 | perf_ats_ril_core_latency_LDADD = \ | ||
304 | $(top_builddir)/src/util/libgnunetutil.la \ | ||
305 | $(top_builddir)/src/ats-tests/libgnunetatstesting.la \ | ||
306 | $(top_builddir)/src/testbed/libgnunettestbed.la \ | ||
307 | $(top_builddir)/src/ats/libgnunetats.la \ | ||
308 | $(top_builddir)/src/core/libgnunetcore.la \ | ||
309 | $(top_builddir)/src/transport/libgnunettransport.la | ||
310 | perf_ats_ril_core_latency_DEPENDENCIES = \ | ||
311 | libgnunetatstesting.la \ | ||
312 | $(top_builddir)/src/util/libgnunetutil.la | ||
313 | |||
314 | perf_ats_ril_transport_latency_SOURCES = \ | ||
315 | perf_ats.c | ||
316 | perf_ats_ril_transport_latency_LDADD = \ | ||
317 | $(top_builddir)/src/util/libgnunetutil.la \ | ||
318 | $(top_builddir)/src/ats-tests/libgnunetatstesting.la \ | ||
319 | $(top_builddir)/src/testbed/libgnunettestbed.la \ | ||
320 | $(top_builddir)/src/ats/libgnunetats.la \ | ||
321 | $(top_builddir)/src/core/libgnunetcore.la \ | ||
322 | $(top_builddir)/src/transport/libgnunettransport.la | ||
323 | perf_ats_ril_transport_latency_DEPENDENCIES = \ | ||
324 | libgnunetatstesting.la \ | ||
325 | $(top_builddir)/src/util/libgnunetutil.la | ||
326 | 259 | ||
327 | EXTRA_DIST = \ | 260 | EXTRA_DIST = \ |
328 | gnunet_ats_sim_default.conf \ | 261 | gnunet_ats_sim_default.conf \ |