X-Git-Url: https://git.librecmc.org/?a=blobdiff_plain;f=src%2Fats%2FMakefile.am;h=533cddec770039a208512bb696bf37ff00d205aa;hb=a35ab677ed4396f271cfd3fea2051044a6a8b5d7;hp=964fd0c26d47205990a547219d7638fd8495ba16;hpb=efc7f31d917eca457bf2e22ebd70d06e4e21421c;p=oweals%2Fgnunet.git diff --git a/src/ats/Makefile.am b/src/ats/Makefile.am index 964fd0c26..533cddec7 100644 --- a/src/ats/Makefile.am +++ b/src/ats/Makefile.am @@ -10,13 +10,16 @@ pkgcfg_DATA = \ ats.conf if MINGW - WINFLAGS = -Wl,--no-undefined -Wl,--export-all-symbols + WINFLAGS = -Wl,--no-undefined -Wl,--export-all-symbols endif if USE_COVERAGE AM_CFLAGS = -fprofile-arcs -ftest-coverage endif +noinst_PROGRAMS = \ + gnunet-ats-solver-eval + if HAVE_LIBGLPK GN_LIBGLPK = -lglpk GN_MLP_LIB = libgnunet_plugin_ats_mlp.la @@ -37,9 +40,22 @@ plugin_LTLIBRARIES = \ $(GN_MLP_LIB) \ libgnunet_plugin_ats_ril.la +gnunet_ats_solver_eval_SOURCES = \ + gnunet-ats-solver-eval.c gnunet-ats-solver-eval.h \ + gnunet-service-ats_normalization.c +gnunet_ats_solver_eval_LDADD = \ + $(top_builddir)/src/util/libgnunetutil.la \ + libgnunetats.la \ + $(top_builddir)/src/statistics/libgnunetstatistics.la \ + $(LTLIBINTL) +gnunet_ats_solver_eval_DEPENDENCIES = \ + $(top_builddir)/src/util/libgnunetutil.la \ + libgnunetats.la \ + $(top_builddir)/src/statistics/libgnunetstatistics.la + libgnunetats_la_SOURCES = \ ats_api_scheduling.c \ - ats_api_performance.c + ats_api_performance.c libgnunetats_la_LIBADD = \ $(top_builddir)/src/util/libgnunetutil.la \ $(LTLIBINTL) @@ -50,12 +66,14 @@ libgnunetats_la_LDFLAGS = \ libgnunet_plugin_ats_proportional_la_SOURCES = \ plugin_ats_proportional.c libgnunet_plugin_ats_proportional_la_LIBADD = \ - libgnunetats.la \ + libgnunetats.la \ $(top_builddir)/src/statistics/libgnunetstatistics.la \ $(top_builddir)/src/util/libgnunetutil.la \ $(LTLIBINTL) libgnunet_plugin_ats_proportional_la_DEPENDENCIES = \ - libgnunetats.la + libgnunetats.la \ + $(top_builddir)/src/statistics/libgnunetstatistics.la \ + $(top_builddir)/src/util/libgnunetutil.la libgnunet_plugin_ats_proportional_la_LDFLAGS = \ $(GN_PLUGIN_LDFLAGS) @@ -64,13 +82,15 @@ if HAVE_LIBGLPK libgnunet_plugin_ats_mlp_la_SOURCES = \ plugin_ats_mlp.c libgnunet_plugin_ats_mlp_la_LIBADD = \ - libgnunetats.la \ + libgnunetats.la \ $(top_builddir)/src/statistics/libgnunetstatistics.la \ $(top_builddir)/src/util/libgnunetutil.la libgnunet_plugin_ats_mlp_la_LDFLAGS = \ $(GN_PLUGIN_LDFLAGS) $(GN_LIBGLPK) libgnunet_plugin_ats_mlp_la_DEPENDENCIES = \ - libgnunetats.la + libgnunetats.la \ + $(top_builddir)/src/statistics/libgnunetstatistics.la \ + $(top_builddir)/src/util/libgnunetutil.la endif libgnunet_plugin_ats_ril_la_SOURCES = \ @@ -83,7 +103,9 @@ libgnunet_plugin_ats_ril_la_LIBADD = \ libgnunet_plugin_ats_ril_la_LDFLAGS = \ $(GN_PLUGIN_LDFLAGS) libgnunet_plugin_ats_ril_la_DEPENDENCIES = \ - libgnunetats.la + libgnunetats.la \ + $(top_builddir)/src/statistics/libgnunetstatistics.la \ + $(top_builddir)/src/util/libgnunetutil.la libexec_PROGRAMS = \ gnunet-service-ats @@ -138,13 +160,14 @@ TESTING_TESTS = \ test_ats_solver_alternative_after_delete_address_ril \ perf_ats_solver_proportional \ $(GN_MLP_SOLVER_PERF) \ - perf_ats_solver_ril + perf_ats_solver_ril endif check_PROGRAMS = \ $(TESTING_TESTS) if ENABLE_TEST_RUN +AM_TESTS_ENVIRONMENT=export GNUNET_PREFIX=$${GNUNET_PREFIX:-@libdir@};export PATH=$${GNUNET_PREFIX:-@prefix@}/bin:$$PATH; TESTS = $(check_PROGRAMS) endif @@ -157,7 +180,7 @@ test_ats_api_scheduling_init_LDADD = \ $(top_builddir)/src/util/libgnunetutil.la \ $(top_builddir)/src/testing/libgnunettesting.la \ $(top_builddir)/src/ats/libgnunetats.la \ - $(top_builddir)/src/statistics/libgnunetstatistics.la + $(top_builddir)/src/statistics/libgnunetstatistics.la test_ats_api_scheduling_add_address_SOURCES = \ test_ats_api_scheduling_add_address.c \ @@ -166,7 +189,7 @@ test_ats_api_scheduling_add_address_LDADD = \ $(top_builddir)/src/util/libgnunetutil.la \ $(top_builddir)/src/testing/libgnunettesting.la \ $(top_builddir)/src/ats/libgnunetats.la \ - $(top_builddir)/src/statistics/libgnunetstatistics.la + $(top_builddir)/src/statistics/libgnunetstatistics.la test_ats_api_scheduling_add_address_inbound_SOURCES = \ test_ats_api_scheduling_add_address_inbound.c \ @@ -175,7 +198,7 @@ test_ats_api_scheduling_add_address_inbound_LDADD = \ $(top_builddir)/src/util/libgnunetutil.la \ $(top_builddir)/src/testing/libgnunettesting.la \ $(top_builddir)/src/ats/libgnunetats.la \ - $(top_builddir)/src/statistics/libgnunetstatistics.la + $(top_builddir)/src/statistics/libgnunetstatistics.la test_ats_api_scheduling_add_address_duplicate_SOURCES = \ test_ats_api_scheduling_add_address_duplicate.c \ @@ -184,7 +207,7 @@ test_ats_api_scheduling_add_address_duplicate_LDADD = \ $(top_builddir)/src/util/libgnunetutil.la \ $(top_builddir)/src/testing/libgnunettesting.la \ $(top_builddir)/src/ats/libgnunetats.la \ - $(top_builddir)/src/statistics/libgnunetstatistics.la + $(top_builddir)/src/statistics/libgnunetstatistics.la test_ats_api_scheduling_destroy_address_SOURCES = \ test_ats_api_scheduling_destroy_address.c \ @@ -193,7 +216,7 @@ test_ats_api_scheduling_destroy_address_LDADD = \ $(top_builddir)/src/util/libgnunetutil.la \ $(top_builddir)/src/testing/libgnunettesting.la \ $(top_builddir)/src/ats/libgnunetats.la \ - $(top_builddir)/src/statistics/libgnunetstatistics.la + $(top_builddir)/src/statistics/libgnunetstatistics.la test_ats_api_scheduling_destroy_address_twice_SOURCES = \ test_ats_api_scheduling_destroy_address_twice.c \ @@ -202,7 +225,7 @@ test_ats_api_scheduling_destroy_address_twice_LDADD = \ $(top_builddir)/src/util/libgnunetutil.la \ $(top_builddir)/src/testing/libgnunettesting.la \ $(top_builddir)/src/ats/libgnunetats.la \ - $(top_builddir)/src/statistics/libgnunetstatistics.la + $(top_builddir)/src/statistics/libgnunetstatistics.la test_ats_api_scheduling_add_session_SOURCES = \ test_ats_api_scheduling_add_session.c test_ats_api_common.c @@ -210,7 +233,7 @@ test_ats_api_scheduling_add_session_LDADD = \ $(top_builddir)/src/util/libgnunetutil.la \ $(top_builddir)/src/testing/libgnunettesting.la \ $(top_builddir)/src/ats/libgnunetats.la \ - $(top_builddir)/src/statistics/libgnunetstatistics.la + $(top_builddir)/src/statistics/libgnunetstatistics.la test_ats_api_scheduling_destroy_session_SOURCES = \ test_ats_api_scheduling_destroy_session.c test_ats_api_common.c @@ -218,7 +241,7 @@ test_ats_api_scheduling_destroy_session_LDADD = \ $(top_builddir)/src/util/libgnunetutil.la \ $(top_builddir)/src/testing/libgnunettesting.la \ $(top_builddir)/src/ats/libgnunetats.la \ - $(top_builddir)/src/statistics/libgnunetstatistics.la + $(top_builddir)/src/statistics/libgnunetstatistics.la # performance API tests @@ -239,7 +262,7 @@ test_ats_api_performance_list_peer_addresses_LDADD = \ $(top_builddir)/src/hello/libgnunethello.la \ $(top_builddir)/src/ats/libgnunetats.la \ $(top_builddir)/src/statistics/libgnunetstatistics.la - + test_ats_api_performance_list_all_addresses_active_SOURCES = \ test_ats_api_performance_list_all_addresses_active.c test_ats_api_performance_list_all_addresses_active_LDADD = \ @@ -257,16 +280,16 @@ test_ats_api_performance_monitor_LDADD = \ $(top_builddir)/src/hello/libgnunethello.la \ $(top_builddir)/src/ats/libgnunetats.la \ $(top_builddir)/src/statistics/libgnunetstatistics.la - + test_ats_api_performance_monitor_initial_callback_SOURCES = \ - test_ats_api_performance_monitor_initial_callback.c + test_ats_api_performance_monitor_initial_callback.c test_ats_api_performance_monitor_initial_callback_LDADD = \ $(top_builddir)/src/util/libgnunetutil.la \ $(top_builddir)/src/testing/libgnunettesting.la \ $(top_builddir)/src/hello/libgnunethello.la \ $(top_builddir)/src/ats/libgnunetats.la \ $(top_builddir)/src/statistics/libgnunetstatistics.la - + # solver tests test_ats_solver_add_address_proportional_SOURCES = \ test_ats_solver_add_address.c \ @@ -277,8 +300,8 @@ test_ats_solver_add_address_proportional_LDADD = \ $(top_builddir)/src/hello/libgnunethello.la \ $(top_builddir)/src/ats/libgnunetats.la \ $(top_builddir)/src/statistics/libgnunetstatistics.la - -if HAVE_LIBGLPK + +if HAVE_LIBGLPK test_ats_solver_add_address_mlp_SOURCES = \ test_ats_solver_add_address.c \ test_ats_api_common.c test_ats_api_common.h @@ -288,8 +311,8 @@ test_ats_solver_add_address_mlp_LDADD = \ $(top_builddir)/src/hello/libgnunethello.la \ $(top_builddir)/src/ats/libgnunetats.la \ $(top_builddir)/src/statistics/libgnunetstatistics.la -endif - +endif + test_ats_solver_add_address_ril_SOURCES = \ test_ats_solver_add_address.c \ test_ats_api_common.c test_ats_api_common.h @@ -299,7 +322,7 @@ test_ats_solver_add_address_ril_LDADD = \ $(top_builddir)/src/hello/libgnunethello.la \ $(top_builddir)/src/ats/libgnunetats.la \ $(top_builddir)/src/statistics/libgnunetstatistics.la - + test_ats_solver_add_address_and_request_proportional_SOURCES = \ test_ats_solver_add_address_and_request.c \ test_ats_api_common.c test_ats_api_common.h @@ -309,8 +332,8 @@ test_ats_solver_add_address_and_request_proportional_LDADD = \ $(top_builddir)/src/hello/libgnunethello.la \ $(top_builddir)/src/ats/libgnunetats.la \ $(top_builddir)/src/statistics/libgnunetstatistics.la - -if HAVE_LIBGLPK + +if HAVE_LIBGLPK test_ats_solver_add_address_and_request_mlp_SOURCES = \ test_ats_solver_add_address_and_request.c \ test_ats_api_common.c test_ats_api_common.h @@ -320,8 +343,8 @@ test_ats_solver_add_address_and_request_mlp_LDADD = \ $(top_builddir)/src/hello/libgnunethello.la \ $(top_builddir)/src/ats/libgnunetats.la \ $(top_builddir)/src/statistics/libgnunetstatistics.la -endif - +endif + test_ats_solver_add_address_and_request_ril_SOURCES = \ test_ats_solver_add_address_and_request.c \ test_ats_api_common.c test_ats_api_common.h @@ -342,8 +365,8 @@ test_ats_solver_request_and_add_address_proportional_LDADD = \ $(top_builddir)/src/hello/libgnunethello.la \ $(top_builddir)/src/ats/libgnunetats.la \ $(top_builddir)/src/statistics/libgnunetstatistics.la - -if HAVE_LIBGLPK + +if HAVE_LIBGLPK test_ats_solver_request_and_add_address_mlp_SOURCES = \ test_ats_solver_request_and_add_address.c \ test_ats_api_common.c test_ats_api_common.h @@ -353,8 +376,8 @@ test_ats_solver_request_and_add_address_mlp_LDADD = \ $(top_builddir)/src/hello/libgnunethello.la \ $(top_builddir)/src/ats/libgnunetats.la \ $(top_builddir)/src/statistics/libgnunetstatistics.la -endif - +endif + test_ats_solver_request_and_add_address_ril_SOURCES = \ test_ats_solver_request_and_add_address.c \ test_ats_api_common.c test_ats_api_common.h @@ -375,8 +398,8 @@ test_ats_solver_request_and_delete_address_proportional_LDADD = \ $(top_builddir)/src/hello/libgnunethello.la \ $(top_builddir)/src/ats/libgnunetats.la \ $(top_builddir)/src/statistics/libgnunetstatistics.la - -if HAVE_LIBGLPK + +if HAVE_LIBGLPK test_ats_solver_request_and_delete_address_mlp_SOURCES = \ test_ats_solver_request_and_delete_address.c \ test_ats_api_common.c test_ats_api_common.h @@ -386,8 +409,8 @@ test_ats_solver_request_and_delete_address_mlp_LDADD = \ $(top_builddir)/src/hello/libgnunethello.la \ $(top_builddir)/src/ats/libgnunetats.la \ $(top_builddir)/src/statistics/libgnunetstatistics.la -endif - +endif + test_ats_solver_request_and_delete_address_ril_SOURCES = \ test_ats_solver_request_and_delete_address.c \ test_ats_api_common.c test_ats_api_common.h @@ -418,8 +441,8 @@ test_ats_solver_preferences_proportional_LDADD = \ $(top_builddir)/src/hello/libgnunethello.la \ $(top_builddir)/src/ats/libgnunetats.la \ $(top_builddir)/src/statistics/libgnunetstatistics.la - -if HAVE_LIBGLPK + +if HAVE_LIBGLPK test_ats_solver_alternative_after_delete_address_mlp_SOURCES = \ test_ats_solver_alternative_after_delete_address.c \ test_ats_api_common.c test_ats_api_common.h @@ -429,7 +452,7 @@ test_ats_solver_alternative_after_delete_address_mlp_LDADD = \ $(top_builddir)/src/hello/libgnunethello.la \ $(top_builddir)/src/ats/libgnunetats.la \ $(top_builddir)/src/statistics/libgnunetstatistics.la - + test_ats_solver_preferences_mlp_SOURCES = \ test_ats_solver_preferences.c \ test_ats_api_common.c test_ats_api_common.h @@ -439,8 +462,8 @@ test_ats_solver_preferences_mlp_LDADD = \ $(top_builddir)/src/hello/libgnunethello.la \ $(top_builddir)/src/ats/libgnunetats.la \ $(top_builddir)/src/statistics/libgnunetstatistics.la -endif - +endif + test_ats_solver_alternative_after_delete_address_ril_SOURCES = \ test_ats_solver_alternative_after_delete_address.c \ test_ats_api_common.c test_ats_api_common.h @@ -457,7 +480,7 @@ test_ats_solver_alternative_after_delete_address_ril_LDADD = \ # $(GN_LIBGLPK) \ # $(top_builddir)/src/util/libgnunetutil.la \ # $(top_builddir)/src/statistics/libgnunetstatistics.la \ -# $(top_builddir)/src/ats/libgnunetats.la +# $(top_builddir)/src/ats/libgnunetats.la perf_ats_solver_mlp_SOURCES = \ perf_ats_solver.c test_ats_api_common.c gnunet-service-ats_normalization.c @@ -465,7 +488,7 @@ perf_ats_solver_mlp_LDADD = \ $(GN_LIBGLPK) \ $(top_builddir)/src/util/libgnunetutil.la \ $(top_builddir)/src/statistics/libgnunetstatistics.la \ - $(top_builddir)/src/ats/libgnunetats.la + $(top_builddir)/src/ats/libgnunetats.la perf_ats_solver_proportional_SOURCES = \ perf_ats_solver.c test_ats_api_common.c gnunet-service-ats_normalization.c @@ -473,7 +496,7 @@ perf_ats_solver_proportional_LDADD = \ $(GN_LIBGLPK) \ $(top_builddir)/src/util/libgnunetutil.la \ $(top_builddir)/src/statistics/libgnunetstatistics.la \ - $(top_builddir)/src/ats/libgnunetats.la + $(top_builddir)/src/ats/libgnunetats.la perf_ats_solver_ril_SOURCES = \ perf_ats_solver.c test_ats_api_common.c gnunet-service-ats_normalization.c @@ -481,7 +504,7 @@ perf_ats_solver_ril_LDADD = \ $(GN_LIBGLPK) \ $(top_builddir)/src/util/libgnunetutil.la \ $(top_builddir)/src/statistics/libgnunetstatistics.la \ - $(top_builddir)/src/ats/libgnunetats.la + $(top_builddir)/src/ats/libgnunetats.la test_ats_solver_preferences_ril_SOURCES = \ test_ats_solver_preferences.c \ @@ -492,16 +515,6 @@ test_ats_solver_preferences_ril_LDADD = \ $(top_builddir)/src/hello/libgnunethello.la \ $(top_builddir)/src/ats/libgnunetats.la \ $(top_builddir)/src/statistics/libgnunetstatistics.la - -test_ats_solver_convergence_ril_SOURCES = \ - test_ats_solver_convergence.c \ - test_ats_api_common.c test_ats_api_common.h -test_ats_solver_convergence_ril_LDADD = \ - $(top_builddir)/src/util/libgnunetutil.la \ - $(top_builddir)/src/testing/libgnunettesting.la \ - $(top_builddir)/src/hello/libgnunethello.la \ - $(top_builddir)/src/ats/libgnunetats.la \ - $(top_builddir)/src/statistics/libgnunetstatistics.la EXTRA_DIST = \ ats.h \