diff options
Diffstat (limited to 'src/util/Makefile.am')
-rw-r--r-- | src/util/Makefile.am | 92 |
1 files changed, 2 insertions, 90 deletions
diff --git a/src/util/Makefile.am b/src/util/Makefile.am index df319fe77..2ca977065 100644 --- a/src/util/Makefile.am +++ b/src/util/Makefile.am | |||
@@ -30,7 +30,6 @@ W32CONSOLEHELPER = gnunet-helper-w32-console | |||
30 | endif | 30 | endif |
31 | 31 | ||
32 | if !MINGW | 32 | if !MINGW |
33 | SERVER_CLIENT_UNIX = test_server_with_client_unix | ||
34 | TEST_CLIENT_UNIC_NC = test_client_unix.nc | 33 | TEST_CLIENT_UNIC_NC = test_client_unix.nc |
35 | else | 34 | else |
36 | TEST_CLIENT_UNIC_NC = | 35 | TEST_CLIENT_UNIC_NC = |
@@ -68,7 +67,6 @@ libgnunetutil_la_SOURCES = \ | |||
68 | common_logging.c \ | 67 | common_logging.c \ |
69 | configuration.c \ | 68 | configuration.c \ |
70 | configuration_loader.c \ | 69 | configuration_loader.c \ |
71 | connection.c \ | ||
72 | container_bloomfilter.c \ | 70 | container_bloomfilter.c \ |
73 | container_heap.c \ | 71 | container_heap.c \ |
74 | container_meta_data.c \ | 72 | container_meta_data.c \ |
@@ -108,16 +106,10 @@ libgnunetutil_la_SOURCES = \ | |||
108 | program.c \ | 106 | program.c \ |
109 | resolver_api.c resolver.h \ | 107 | resolver_api.c resolver.h \ |
110 | scheduler.c \ | 108 | scheduler.c \ |
111 | server.c \ | ||
112 | server_mst.c \ | ||
113 | server_nc.c \ | ||
114 | server_tc.c \ | ||
115 | service.c \ | ||
116 | service_new.c \ | 109 | service_new.c \ |
117 | signal.c \ | 110 | signal.c \ |
118 | strings.c \ | 111 | strings.c \ |
119 | time.c \ | 112 | time.c \ |
120 | socks.c \ | ||
121 | speedup.c speedup.h | 113 | speedup.c speedup.h |
122 | 114 | ||
123 | libgnunetutil_la_LIBADD = \ | 115 | libgnunetutil_la_LIBADD = \ |
@@ -263,14 +255,13 @@ if HAVE_BENCHMARKS | |||
263 | endif | 255 | endif |
264 | 256 | ||
265 | if HAVE_SSH_KEY | 257 | if HAVE_SSH_KEY |
266 | SSH_USING_TESTS = test_socks.nc | 258 | # SSH_USING_TESTS = test_socks.nc |
267 | endif | 259 | endif |
268 | 260 | ||
269 | check_PROGRAMS = \ | 261 | check_PROGRAMS = \ |
270 | test_bio \ | 262 | test_bio \ |
271 | test_client.nc \ | 263 | test_client.nc \ |
272 | $(TEST_CLIENT_UNIX_NC) \ | 264 | $(TEST_CLIENT_UNIX_NC) \ |
273 | $(SSH_USING_TESTS) \ | ||
274 | test_common_allocation \ | 265 | test_common_allocation \ |
275 | test_common_endian \ | 266 | test_common_endian \ |
276 | test_common_logging \ | 267 | test_common_logging \ |
@@ -298,12 +289,6 @@ check_PROGRAMS = \ | |||
298 | test_crypto_rsa \ | 289 | test_crypto_rsa \ |
299 | test_disk \ | 290 | test_disk \ |
300 | test_getopt \ | 291 | test_getopt \ |
301 | test_connection.nc \ | ||
302 | test_connection_addressing.nc \ | ||
303 | test_connection_receive_cancel.nc \ | ||
304 | test_connection_timeout.nc \ | ||
305 | test_connection_timeout_no_connect.nc \ | ||
306 | test_connection_transmit_cancel.nc \ | ||
307 | test_mq \ | 292 | test_mq \ |
308 | test_os_network \ | 293 | test_os_network \ |
309 | test_peer \ | 294 | test_peer \ |
@@ -312,11 +297,6 @@ check_PROGRAMS = \ | |||
312 | test_resolver_api.nc \ | 297 | test_resolver_api.nc \ |
313 | test_scheduler \ | 298 | test_scheduler \ |
314 | test_scheduler_delay \ | 299 | test_scheduler_delay \ |
315 | test_server.nc \ | ||
316 | test_server_disconnect.nc \ | ||
317 | test_server_with_client.nc \ | ||
318 | test_server_mst_interrupt.nc \ | ||
319 | $(SERVER_CLIENT_UNIX) \ | ||
320 | test_service \ | 300 | test_service \ |
321 | test_strings \ | 301 | test_strings \ |
322 | test_strings_to_data \ | 302 | test_strings_to_data \ |
@@ -330,18 +310,7 @@ check_PROGRAMS = \ | |||
330 | # Declare .nc (NO-CONCURRENCY) as a test extension so that we can impart | 310 | # Declare .nc (NO-CONCURRENCY) as a test extension so that we can impart |
331 | # sequential execution order for them | 311 | # sequential execution order for them |
332 | TEST_EXTENSIONS = .nc | 312 | TEST_EXTENSIONS = .nc |
333 | test_connection.log: test_client.log | 313 | test_test_client_unix.log: test_client.log |
334 | test_connection_addressing.log: test_connection.log | ||
335 | test_connection_timeout_no_connect.log: test_connection_addressing.log | ||
336 | test_connection_transmit_cancel.log: test_connection_timeout_no_connect.log | ||
337 | test_connection_receive_cancel.log: test_connection_transmit_cancel.log | ||
338 | test_connection_timeout.log: test_connection_receive_cancel.log | ||
339 | test_resolver_api.log: test_connection_timeout.log | ||
340 | test_server.log: test_resolver_api.log | ||
341 | test_server_disconnect.log: test_server.log | ||
342 | test_server_with_client.log: test_server_disconnect.log | ||
343 | test_server_mst_interrupt.log: test_server_with_client.log | ||
344 | test_client_unix.log: test_server_mst_interrupt.log | ||
345 | 314 | ||
346 | test_bio_SOURCES = \ | 315 | test_bio_SOURCES = \ |
347 | test_bio.c | 316 | test_bio.c |
@@ -518,36 +487,6 @@ test_getopt_SOURCES = \ | |||
518 | test_getopt_LDADD = \ | 487 | test_getopt_LDADD = \ |
519 | libgnunetutil.la | 488 | libgnunetutil.la |
520 | 489 | ||
521 | test_connection_nc_SOURCES = \ | ||
522 | test_connection.c | ||
523 | test_connection_nc_LDADD = \ | ||
524 | libgnunetutil.la | ||
525 | |||
526 | test_connection_addressing_nc_SOURCES = \ | ||
527 | test_connection_addressing.c | ||
528 | test_connection_addressing_nc_LDADD = \ | ||
529 | libgnunetutil.la | ||
530 | |||
531 | test_connection_receive_cancel_nc_SOURCES = \ | ||
532 | test_connection_receive_cancel.c | ||
533 | test_connection_receive_cancel_nc_LDADD = \ | ||
534 | libgnunetutil.la | ||
535 | |||
536 | test_connection_timeout_nc_SOURCES = \ | ||
537 | test_connection_timeout.c | ||
538 | test_connection_timeout_nc_LDADD = \ | ||
539 | libgnunetutil.la | ||
540 | |||
541 | test_connection_timeout_no_connect_nc_SOURCES = \ | ||
542 | test_connection_timeout_no_connect.c | ||
543 | test_connection_timeout_no_connect_nc_LDADD = \ | ||
544 | libgnunetutil.la | ||
545 | |||
546 | test_connection_transmit_cancel_nc_SOURCES = \ | ||
547 | test_connection_transmit_cancel.c | ||
548 | test_connection_transmit_cancel_nc_LDADD = \ | ||
549 | libgnunetutil.la | ||
550 | |||
551 | test_mq_SOURCES = \ | 490 | test_mq_SOURCES = \ |
552 | test_mq.c | 491 | test_mq.c |
553 | test_mq_LDADD = \ | 492 | test_mq_LDADD = \ |
@@ -588,32 +527,6 @@ test_scheduler_delay_SOURCES = \ | |||
588 | test_scheduler_delay_LDADD = \ | 527 | test_scheduler_delay_LDADD = \ |
589 | libgnunetutil.la | 528 | libgnunetutil.la |
590 | 529 | ||
591 | test_server_mst_interrupt_nc_SOURCES = \ | ||
592 | test_server_mst_interrupt.c | ||
593 | test_server_mst_interrupt_nc_LDADD = \ | ||
594 | libgnunetutil.la | ||
595 | |||
596 | test_server_nc_SOURCES = \ | ||
597 | test_server.c | ||
598 | test_server_nc_LDADD = \ | ||
599 | libgnunetutil.la | ||
600 | |||
601 | test_server_disconnect_nc_SOURCES = \ | ||
602 | test_server_disconnect.c | ||
603 | test_server_disconnect_nc_LDADD = \ | ||
604 | libgnunetutil.la | ||
605 | |||
606 | test_server_with_client_nc_SOURCES = \ | ||
607 | test_server_with_client.c | ||
608 | test_server_with_client_nc_LDADD = \ | ||
609 | libgnunetutil.la | ||
610 | |||
611 | test_server_with_client_unix_SOURCES = \ | ||
612 | test_server_with_client_unix.c | ||
613 | test_server_with_client_unix_LDADD = \ | ||
614 | libgnunetutil.la | ||
615 | |||
616 | |||
617 | test_service_SOURCES = \ | 530 | test_service_SOURCES = \ |
618 | test_service.c | 531 | test_service.c |
619 | test_service_LDADD = \ | 532 | test_service_LDADD = \ |
@@ -624,7 +537,6 @@ test_strings_SOURCES = \ | |||
624 | test_strings_LDADD = \ | 537 | test_strings_LDADD = \ |
625 | libgnunetutil.la | 538 | libgnunetutil.la |
626 | 539 | ||
627 | |||
628 | test_strings_to_data_SOURCES = \ | 540 | test_strings_to_data_SOURCES = \ |
629 | test_strings_to_data.c | 541 | test_strings_to_data.c |
630 | test_strings_to_data_LDADD = \ | 542 | test_strings_to_data_LDADD = \ |