X-Git-Url: https://git.librecmc.org/?a=blobdiff_plain;f=src%2Fats%2FMakefile.am;h=533cddec770039a208512bb696bf37ff00d205aa;hb=a35ab677ed4396f271cfd3fea2051044a6a8b5d7;hp=fd215621320af1e4d4ac69e89ef5cee048b15a8b;hpb=045bc5be4f794b863b334a41c126c222c5af6c3c;p=oweals%2Fgnunet.git diff --git a/src/ats/Makefile.am b/src/ats/Makefile.am index fd2156213..533cddec7 100644 --- a/src/ats/Makefile.am +++ b/src/ats/Makefile.am @@ -10,53 +10,106 @@ 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 - GN_MLP_TEST = test_ats_mlp - GN_MLP_TEST_UPDATE = test_ats_mlp_update - GN_MLP_TEST_AVG = test_ats_mlp_averaging GN_MLP_PERF = perf_ats_mlp GN_MLP_ADD_ADDRESS = test_ats_solver_add_address_mlp 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 lib_LTLIBRARIES = libgnunetats.la plugin_LTLIBRARIES = \ libgnunet_plugin_ats_proportional.la \ - $(GN_MLP_LIB) + $(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 = \ + plugin_ats_proportional.c +libgnunet_plugin_ats_proportional_la_LIBADD = \ + libgnunetats.la \ + $(top_builddir)/src/statistics/libgnunetstatistics.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) + + +if HAVE_LIBGLPK +libgnunet_plugin_ats_mlp_la_SOURCES = \ + plugin_ats_mlp.c +libgnunet_plugin_ats_mlp_la_LIBADD = \ + 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 \ + $(top_builddir)/src/statistics/libgnunetstatistics.la \ + $(top_builddir)/src/util/libgnunetutil.la +endif + +libgnunet_plugin_ats_ril_la_SOURCES = \ + plugin_ats_ril.c +libgnunet_plugin_ats_ril_la_LIBADD = \ + libgnunetats.la \ + $(top_builddir)/src/statistics/libgnunetstatistics.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 \ + $(top_builddir)/src/statistics/libgnunetstatistics.la \ + $(top_builddir)/src/util/libgnunetutil.la libexec_PROGRAMS = \ gnunet-service-ats -# gnunet-service-ats-solver_proportional.c gnunet-service-ats-solver_proportional.h -# $(GN_MLP_SRC) -# gnunet-service-ats-solver_ril.c gnunet-service-ats-solver_ril.h - gnunet_service_ats_SOURCES = \ gnunet-service-ats.c gnunet-service-ats.h\ gnunet-service-ats_addresses.c gnunet-service-ats_addresses.h \ @@ -92,58 +145,32 @@ 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 \ - $(GN_MLP_ADD_REQUEST_ADDRESS) \ + 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) -# test_ats_solver_add_address_ril -# test_ats_solver_add_address_and_request_ril -# test_ats_solver_request_and_add_address_ril -# test_ats_solver_request_and_delete_address_ril -# test_ats_solver_alternative_after_delete_address_ril - -# test_ats_api_scheduling_min_bw -# test_ats_api_scheduling_check_min_bw_alt -# test_ats_api_scheduling_update_address -# test_ats_api_scheduling_destroy_inbound_connection -# test_ats_api_scheduling_block_and_reset -# test_ats_normalization_update_quality -# test_ats_change_preference -# test_ats_simplistic -# test_ats_simplistic_switch_networks -# test_ats_simplistic_change_preference -# test_ats_api_performance_address_info -# test_ats_api_performance_feedback + $(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 \ + test_ats_solver_request_and_delete_address_ril \ + test_ats_solver_alternative_after_delete_address_ril \ + perf_ats_solver_proportional \ + $(GN_MLP_SOLVER_PERF) \ + perf_ats_solver_ril endif check_PROGRAMS = \ $(TESTING_TESTS) -# $(GN_MLP_TEST) $(GN_MLP_PERF) $(GN_MLP_TEST_UPDATE) -# $(GN_MLP_TEST_AVG) if ENABLE_TEST_RUN +AM_TESTS_ENVIRONMENT=export GNUNET_PREFIX=$${GNUNET_PREFIX:-@libdir@};export PATH=$${GNUNET_PREFIX:-@prefix@}/bin:$$PATH; TESTS = $(check_PROGRAMS) endif -libgnunet_plugin_ats_proportional_la_SOURCES = \ - libgnunet_plugin_ats_proportional.c -libgnunet_plugin_ats_proportional_la_LIBADD = \ - $(top_builddir)/src/statistics/libgnunetstatistics.la \ - $(top_builddir)/src/util/libgnunetutil.la \ - $(LTLIBINTL) - -if HAVE_LIBGLPK -libgnunet_plugin_ats_mlp_la_SOURCES = \ - libgnunet_plugin_ats_mlp.c -libgnunet_plugin_ats_mlp_la_LIBADD = \ - $(top_builddir)/src/statistics/libgnunetstatistics.la \ - $(top_builddir)/src/util/libgnunetutil.la \ - $(GN_LIBGLPK) -libgnunet_plugin_ats_mlp_la_LDFLAGS = \ - $(GN_LIBGLPK) -endif - # scheduling API tests test_ats_api_scheduling_init_SOURCES = \ @@ -153,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 \ @@ -162,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 \ @@ -171,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 \ @@ -180,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 \ @@ -189,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 \ @@ -198,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 @@ -206,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 @@ -214,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 @@ -235,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 = \ @@ -253,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 \ @@ -273,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 @@ -284,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 @@ -295,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 @@ -305,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 @@ -316,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 @@ -338,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 @@ -349,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 @@ -371,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 @@ -382,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 @@ -404,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 @@ -415,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 @@ -427,125 +474,48 @@ test_ats_solver_alternative_after_delete_address_ril_LDADD = \ $(top_builddir)/src/ats/libgnunetats.la \ $(top_builddir)/src/statistics/libgnunetstatistics.la - -#test_ats_api_scheduling_min_bw_SOURCES = \ -# test_ats_api_scheduling_min_bw.c test_ats_api_common.c -#test_ats_api_scheduling_min_bw_LDADD = \ -# $(top_builddir)/src/util/libgnunetutil.la \ -# $(top_builddir)/src/testing/libgnunettesting.la \ -# $(top_builddir)/src/ats/libgnunetats.la -# -#test_ats_api_scheduling_check_min_bw_alt_SOURCES = \ -# test_ats_api_scheduling_check_min_bw_alt.c test_ats_api_common.c -#test_ats_api_scheduling_check_min_bw_alt_LDADD = \ -# $(top_builddir)/src/util/libgnunetutil.la \ -# $(top_builddir)/src/testing/libgnunettesting.la \ -# $(top_builddir)/src/ats/libgnunetats.la - - -#test_ats_api_scheduling_update_address_SOURCES = \ -# test_ats_api_scheduling_update_address.c test_ats_api_common.c -#test_ats_api_scheduling_update_address_LDADD = \ -# $(top_builddir)/src/util/libgnunetutil.la \ -# $(top_builddir)/src/testing/libgnunettesting.la \ -# $(top_builddir)/src/ats/libgnunetats.la - -#test_ats_api_scheduling_destroy_inbound_connection_SOURCES = \ -# test_ats_api_scheduling_destroy_inbound_connection.c test_ats_api_common.c -#test_ats_api_scheduling_destroy_inbound_connection_LDADD = \ -# $(top_builddir)/src/util/libgnunetutil.la \ -# $(top_builddir)/src/testing/libgnunettesting.la \ -# $(top_builddir)/src/ats/libgnunetats.la - -#test_ats_api_scheduling_block_and_reset_SOURCES = \ -# test_ats_api_scheduling_block_and_reset.c test_ats_api_common.c -#test_ats_api_scheduling_block_and_reset_LDADD = \ -# $(top_builddir)/src/util/libgnunetutil.la \ -# $(top_builddir)/src/testing/libgnunettesting.la \ -# $(top_builddir)/src/ats/libgnunetats.la - -#test_ats_api_performance_feedback_SOURCES = \ -# test_ats_api_performance_feedback.c -#test_ats_api_performance_feedback_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 - - - -#test_ats_api_performance_address_info_SOURCES = \ -# test_ats_api_performance_address_info.c -#test_ats_api_performance_address_info_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 - - -#test_ats_simplistic_SOURCES = \ -# test_ats_simplistic.c test_ats_api_common.c -#test_ats_simplistic_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 - -#test_ats_simplistic_switch_networks_SOURCES = \ -# test_ats_simplistic_switch_networks.c test_ats_api_common.c -#test_ats_simplistic_switch_networks_LDADD = \ -# $(top_builddir)/src/util/libgnunetutil.la \ -# $(top_builddir)/src/testing/libgnunettesting.la \ -# $(top_builddir)/src/ats/libgnunetats.la - -#test_ats_simplistic_change_preference_SOURCES = \ -# test_ats_simplistic_change_preference.c test_ats_api_common.c -#test_ats_simplistic_change_preference_LDADD = \ -# $(top_builddir)/src/util/libgnunetutil.la \ -# $(top_builddir)/src/testing/libgnunettesting.la \ -# $(top_builddir)/src/ats/libgnunetats.la - -#test_ats_change_preference_SOURCES = \ -# test_ats_change_preference.c test_ats_api_common.c -#test_ats_change_preference_LDADD = \ -# $(top_builddir)/src/util/libgnunetutil.la \ -# $(top_builddir)/src/testing/libgnunettesting.la \ -# $(top_builddir)/src/ats/libgnunetats.la - - -#test_ats_mlp_SOURCES = \ -# $(GN_MLP_SRC) test_ats_mlp.c test_ats_api_common.c gnunet-service-ats_normalization.c -#test_ats_mlp_LDADD = \ -# $(GN_LIBGLPK) \ -# $(top_builddir)/src/util/libgnunetutil.la \ -# $(top_builddir)/src/statistics/libgnunetstatistics.la \ -# $(top_builddir)/src/ats/libgnunetats.la - -#test_ats_mlp_update_SOURCES = \ -# $(GN_MLP_SRC) test_ats_mlp_update.c test_ats_api_common.c gnunet-service-ats_normalization.c -#test_ats_mlp_update_LDADD = \ -# $(GN_LIBGLPK) \ -# $(top_builddir)/src/util/libgnunetutil.la \ -# $(top_builddir)/src/statistics/libgnunetstatistics.la \ -# $(top_builddir)/src/ats/libgnunetats.la - #perf_ats_mlp_SOURCES = \ # $(GN_MLP_SRC) perf_ats_mlp.c test_ats_api_common.c gnunet-service-ats_normalization.c #perf_ats_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_mlp_SOURCES = \ + 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 + +perf_ats_solver_proportional_SOURCES = \ + 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 + +perf_ats_solver_ril_SOURCES = \ + 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 + +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 -#test_ats_normalization_update_quality_SOURCES = \ -# test_ats_normalization_update_quality.c test_ats_api_common.c -#test_ats_normalization_update_quality_LDADD = \ -# $(GN_LIBGLPK) \ -# $(top_builddir)/src/util/libgnunetutil.la \ -# $(top_builddir)/src/statistics/libgnunetstatistics.la \ -# $(top_builddir)/src/testing/libgnunettesting.la \ -# $(top_builddir)/src/ats/libgnunetats.la -#endif EXTRA_DIST = \ ats.h \ test_ats_api.conf \ @@ -553,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