X-Git-Url: https://git.librecmc.org/?a=blobdiff_plain;f=src%2Fats%2FMakefile.am;h=533cddec770039a208512bb696bf37ff00d205aa;hb=a35ab677ed4396f271cfd3fea2051044a6a8b5d7;hp=4851ff8a56dcda2169094c39b6e4d2bca713df8d;hpb=5aeb7f512e5946aec63567e81c72d64523b17530;p=oweals%2Fgnunet.git diff --git a/src/ats/Makefile.am b/src/ats/Makefile.am index 4851ff8a5..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,54 +40,72 @@ 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) - libgnunetats_la_LDFLAGS = \ - $(GN_LIB_LDFLAGS) \ + $(GN_LIB_LDFLAGS) $(WINFLAGS) \ -version-info 4:0:0 libgnunet_plugin_ats_proportional_la_SOURCES = \ - libgnunet_plugin_ats_proportional.c + plugin_ats_proportional.c libgnunet_plugin_ats_proportional_la_LIBADD = \ + libgnunetats.la \ $(top_builddir)/src/statistics/libgnunetstatistics.la \ - $(top_builddir)/src/ats/libgnunetats.la \ $(top_builddir)/src/util/libgnunetutil.la \ $(LTLIBINTL) +libgnunet_plugin_ats_proportional_la_DEPENDENCIES = \ + libgnunetats.la \ + $(top_builddir)/src/statistics/libgnunetstatistics.la \ + $(top_builddir)/src/util/libgnunetutil.la libgnunet_plugin_ats_proportional_la_LDFLAGS = \ $(GN_PLUGIN_LDFLAGS) -libgnunet_plugin_ats_proportional_la_DEPENDENCIES = \ - libgnunetats.la + if HAVE_LIBGLPK libgnunet_plugin_ats_mlp_la_SOURCES = \ - libgnunet_plugin_ats_mlp.c + plugin_ats_mlp.c libgnunet_plugin_ats_mlp_la_LIBADD = \ + libgnunetats.la \ $(top_builddir)/src/statistics/libgnunetstatistics.la \ - $(top_builddir)/src/ats/libgnunetats.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 = \ - libgnunet_plugin_ats_ril.c + plugin_ats_ril.c libgnunet_plugin_ats_ril_la_LIBADD = \ + libgnunetats.la \ $(top_builddir)/src/statistics/libgnunetstatistics.la \ - $(top_builddir)/src/ats/libgnunetats.la \ $(top_builddir)/src/util/libgnunetutil.la \ $(LTLIBINTL) 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 @@ -139,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 @@ -158,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 \ @@ -167,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 \ @@ -176,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 \ @@ -185,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 \ @@ -194,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 \ @@ -203,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 @@ -211,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 @@ -219,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 @@ -240,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 = \ @@ -258,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 \ @@ -278,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 @@ -289,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 @@ -300,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 @@ -310,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 @@ -321,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 @@ -343,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 @@ -354,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 @@ -376,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 @@ -387,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 @@ -419,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 @@ -430,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 @@ -440,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 @@ -458,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 @@ -466,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 @@ -474,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 @@ -482,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 \