diff options
author | Christian Grothoff <christian@grothoff.org> | 2012-09-09 13:28:48 +0000 |
---|---|---|
committer | Christian Grothoff <christian@grothoff.org> | 2012-09-09 13:28:48 +0000 |
commit | 9d732bb204de9177aad6ae70c910cbf2615d81a3 (patch) | |
tree | 44ddd6e9e1dad749db51003acfa46d7835593dc6 /src/fs/Makefile.am | |
parent | a1d7926951beb7466a1462e43b9933530e5825f7 (diff) | |
download | gnunet-9d732bb204de9177aad6ae70c910cbf2615d81a3.tar.gz gnunet-9d732bb204de9177aad6ae70c910cbf2615d81a3.zip |
make fs tests build against new testbed library -- they do not pass yet
Diffstat (limited to 'src/fs/Makefile.am')
-rw-r--r-- | src/fs/Makefile.am | 17 |
1 files changed, 9 insertions, 8 deletions
diff --git a/src/fs/Makefile.am b/src/fs/Makefile.am index de5bb8ac4..b4e493d2b 100644 --- a/src/fs/Makefile.am +++ b/src/fs/Makefile.am | |||
@@ -57,7 +57,8 @@ libgnunetfstest_a_SOURCES = \ | |||
57 | fs_test_lib.c fs_test_lib.h | 57 | fs_test_lib.c fs_test_lib.h |
58 | 58 | ||
59 | libgnunetfstest_a_LIBADD = \ | 59 | libgnunetfstest_a_LIBADD = \ |
60 | $(top_builddir)/src/testing_old/libgnunettesting_old.la | 60 | $(top_builddir)/src/testing/libgnunettesting.la \ |
61 | $(top_builddir)/src/testbed/libgnunettestbed.la | ||
61 | 62 | ||
62 | bin_PROGRAMS = \ | 63 | bin_PROGRAMS = \ |
63 | gnunet-auto-share \ | 64 | gnunet-auto-share \ |
@@ -406,7 +407,7 @@ test_fs_test_lib_SOURCES = \ | |||
406 | test_fs_test_lib.c | 407 | test_fs_test_lib.c |
407 | test_fs_test_lib_LDADD = \ | 408 | test_fs_test_lib_LDADD = \ |
408 | $(top_builddir)/src/fs/libgnunetfstest.a \ | 409 | $(top_builddir)/src/fs/libgnunetfstest.a \ |
409 | $(top_builddir)/src/testing_old/libgnunettesting_old.la \ | 410 | $(top_builddir)/src/testbed/libgnunettestbed.la \ |
410 | $(top_builddir)/src/fs/libgnunetfs.la \ | 411 | $(top_builddir)/src/fs/libgnunetfs.la \ |
411 | $(top_builddir)/src/util/libgnunetutil.la | 412 | $(top_builddir)/src/util/libgnunetutil.la |
412 | 413 | ||
@@ -414,7 +415,7 @@ test_gnunet_service_fs_p2p_SOURCES = \ | |||
414 | test_gnunet_service_fs_p2p.c | 415 | test_gnunet_service_fs_p2p.c |
415 | test_gnunet_service_fs_p2p_LDADD = \ | 416 | test_gnunet_service_fs_p2p_LDADD = \ |
416 | $(top_builddir)/src/fs/libgnunetfstest.a \ | 417 | $(top_builddir)/src/fs/libgnunetfstest.a \ |
417 | $(top_builddir)/src/testing_old/libgnunettesting_old.la \ | 418 | $(top_builddir)/src/testbed/libgnunettestbed.la \ |
418 | $(top_builddir)/src/fs/libgnunetfs.la \ | 419 | $(top_builddir)/src/fs/libgnunetfs.la \ |
419 | $(top_builddir)/src/util/libgnunetutil.la | 420 | $(top_builddir)/src/util/libgnunetutil.la |
420 | 421 | ||
@@ -422,7 +423,7 @@ test_gnunet_service_fs_migration_SOURCES = \ | |||
422 | test_gnunet_service_fs_migration.c | 423 | test_gnunet_service_fs_migration.c |
423 | test_gnunet_service_fs_migration_LDADD = \ | 424 | test_gnunet_service_fs_migration_LDADD = \ |
424 | $(top_builddir)/src/fs/libgnunetfstest.a \ | 425 | $(top_builddir)/src/fs/libgnunetfstest.a \ |
425 | $(top_builddir)/src/testing_old/libgnunettesting_old.la \ | 426 | $(top_builddir)/src/testbed/libgnunettestbed.la \ |
426 | $(top_builddir)/src/fs/libgnunetfs.la \ | 427 | $(top_builddir)/src/fs/libgnunetfs.la \ |
427 | $(top_builddir)/src/util/libgnunetutil.la | 428 | $(top_builddir)/src/util/libgnunetutil.la |
428 | 429 | ||
@@ -431,7 +432,7 @@ perf_gnunet_service_fs_p2p_SOURCES = \ | |||
431 | perf_gnunet_service_fs_p2p_LDADD = \ | 432 | perf_gnunet_service_fs_p2p_LDADD = \ |
432 | $(top_builddir)/src/fs/libgnunetfstest.a \ | 433 | $(top_builddir)/src/fs/libgnunetfstest.a \ |
433 | $(top_builddir)/src/statistics/libgnunetstatistics.la \ | 434 | $(top_builddir)/src/statistics/libgnunetstatistics.la \ |
434 | $(top_builddir)/src/testing_old/libgnunettesting_old.la \ | 435 | $(top_builddir)/src/testbed/libgnunettestbed.la \ |
435 | $(top_builddir)/src/fs/libgnunetfs.la \ | 436 | $(top_builddir)/src/fs/libgnunetfs.la \ |
436 | $(top_builddir)/src/util/libgnunetutil.la | 437 | $(top_builddir)/src/util/libgnunetutil.la |
437 | 438 | ||
@@ -440,7 +441,7 @@ perf_gnunet_service_fs_p2p_index_SOURCES = \ | |||
440 | perf_gnunet_service_fs_p2p_index_LDADD = \ | 441 | perf_gnunet_service_fs_p2p_index_LDADD = \ |
441 | $(top_builddir)/src/fs/libgnunetfstest.a \ | 442 | $(top_builddir)/src/fs/libgnunetfstest.a \ |
442 | $(top_builddir)/src/statistics/libgnunetstatistics.la \ | 443 | $(top_builddir)/src/statistics/libgnunetstatistics.la \ |
443 | $(top_builddir)/src/testing_old/libgnunettesting_old.la \ | 444 | $(top_builddir)/src/testbed/libgnunettestbed.la \ |
444 | $(top_builddir)/src/fs/libgnunetfs.la \ | 445 | $(top_builddir)/src/fs/libgnunetfs.la \ |
445 | $(top_builddir)/src/util/libgnunetutil.la | 446 | $(top_builddir)/src/util/libgnunetutil.la |
446 | 447 | ||
@@ -449,7 +450,7 @@ perf_gnunet_service_fs_p2p_dht_SOURCES = \ | |||
449 | perf_gnunet_service_fs_p2p_dht_LDADD = \ | 450 | perf_gnunet_service_fs_p2p_dht_LDADD = \ |
450 | $(top_builddir)/src/fs/libgnunetfstest.a \ | 451 | $(top_builddir)/src/fs/libgnunetfstest.a \ |
451 | $(top_builddir)/src/statistics/libgnunetstatistics.la \ | 452 | $(top_builddir)/src/statistics/libgnunetstatistics.la \ |
452 | $(top_builddir)/src/testing_old/libgnunettesting_old.la \ | 453 | $(top_builddir)/src/testbed/libgnunettestbed.la \ |
453 | $(top_builddir)/src/fs/libgnunetfs.la \ | 454 | $(top_builddir)/src/fs/libgnunetfs.la \ |
454 | $(top_builddir)/src/util/libgnunetutil.la | 455 | $(top_builddir)/src/util/libgnunetutil.la |
455 | 456 | ||
@@ -458,7 +459,7 @@ perf_gnunet_service_fs_p2p_respect_SOURCES = \ | |||
458 | perf_gnunet_service_fs_p2p_respect_LDADD = \ | 459 | perf_gnunet_service_fs_p2p_respect_LDADD = \ |
459 | $(top_builddir)/src/fs/libgnunetfstest.a \ | 460 | $(top_builddir)/src/fs/libgnunetfstest.a \ |
460 | $(top_builddir)/src/statistics/libgnunetstatistics.la \ | 461 | $(top_builddir)/src/statistics/libgnunetstatistics.la \ |
461 | $(top_builddir)/src/testing_old/libgnunettesting_old.la \ | 462 | $(top_builddir)/src/testbed/libgnunettestbed.la \ |
462 | $(top_builddir)/src/fs/libgnunetfs.la \ | 463 | $(top_builddir)/src/fs/libgnunetfs.la \ |
463 | $(top_builddir)/src/util/libgnunetutil.la | 464 | $(top_builddir)/src/util/libgnunetutil.la |
464 | 465 | ||