X-Git-Url: https://git.librecmc.org/?a=blobdiff_plain;f=src%2Fats%2FMakefile.am;h=533cddec770039a208512bb696bf37ff00d205aa;hb=a35ab677ed4396f271cfd3fea2051044a6a8b5d7;hp=fe1854394db7662c1402c57e5be1db4b77d3156f;hpb=9b7b8af742d70dd464792005b79f1cc920be3f98;p=oweals%2Fgnunet.git diff --git a/src/ats/Makefile.am b/src/ats/Makefile.am index fe1854394..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 @@ -25,6 +28,7 @@ if HAVE_LIBGLPK GN_MLP_ADD_REQUEST_ADDRESS = test_ats_solver_add_address_and_request_mlp GN_MLP_REQUEST_ADD_ADDRESS = test_ats_solver_request_and_add_address_mlp GN_MLP_REQUEST_DELETE_ADDRESS = test_ats_solver_request_and_delete_address_mlp + GN_MLP_PREFERENCES_ADDRESS = test_ats_solver_preferences_mlp GN_MLP_ALTERNATIVE_DELETE_ADDRESS = test_ats_solver_alternative_after_delete_address_mlp GN_MLP_SOLVER_PERF = perf_ats_solver_mlp endif @@ -36,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 @@ -123,11 +145,14 @@ TESTING_TESTS = \ test_ats_solver_request_and_add_address_proportional \ test_ats_solver_request_and_delete_address_proportional \ test_ats_solver_alternative_after_delete_address_proportional \ + test_ats_solver_preferences_proportional \ + test_ats_solver_preferences_ril \ $(GN_MLP_ADD_ADDRESS) \ $(GN_MLP_ADD_REQUEST_ADDRESS) \ $(GN_MLP_REQUEST_ADD_ADDRESS) \ $(GN_MLP_REQUEST_DELETE_ADDRESS) \ $(GN_MLP_ALTERNATIVE_DELETE_ADDRESS) \ + $(GN_MLP_PREFERENCES_ADDRESS) \ test_ats_solver_add_address_ril \ test_ats_solver_add_address_and_request_ril \ test_ats_solver_request_and_add_address_ril \ @@ -135,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 @@ -154,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 \ @@ -163,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 \ @@ -172,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 \ @@ -181,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 \ @@ -190,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 \ @@ -199,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 @@ -207,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 @@ -215,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 @@ -236,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 = \ @@ -254,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 \ @@ -274,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 @@ -285,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 @@ -296,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 @@ -306,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 @@ -317,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 @@ -339,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 @@ -350,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 @@ -372,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 @@ -383,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 @@ -405,8 +431,18 @@ test_ats_solver_alternative_after_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 + +test_ats_solver_preferences_proportional_SOURCES = \ + test_ats_solver_preferences.c \ + test_ats_api_common.c test_ats_api_common.h +test_ats_solver_preferences_proportional_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 + +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 @@ -416,8 +452,18 @@ 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 -endif - + +test_ats_solver_preferences_mlp_SOURCES = \ + test_ats_solver_preferences.c \ + test_ats_api_common.c test_ats_api_common.h +test_ats_solver_preferences_mlp_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 +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 @@ -434,32 +480,41 @@ 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 + perf_ats_solver.c test_ats_api_common.c gnunet-service-ats_normalization.c 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 + perf_ats_solver.c test_ats_api_common.c gnunet-service-ats_normalization.c 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 + perf_ats_solver.c test_ats_api_common.c gnunet-service-ats_normalization.c 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 \ + test_ats_api_common.c test_ats_api_common.h +test_ats_solver_preferences_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 \ @@ -468,4 +523,8 @@ EXTRA_DIST = \ test_ats_solver_default.conf \ test_ats_solver_proportional.conf \ test_ats_solver_mlp.conf \ - test_ats_solver_ril.conf + test_ats_solver_ril.conf \ + perf_ats_solver_mlp.conf \ + perf_ats_solver_proportional.conf \ + perf_ats_solver_ril.conf \ + perf_ats_solver.conf