X-Git-Url: https://git.librecmc.org/?a=blobdiff_plain;f=src%2Fats%2FMakefile.am;h=4f2a93227327531c107fb75b84e29307331c843b;hb=404c9065789248a5eba44fb4bc320bfeaa988da6;hp=501fec4d76d3bd26890bcde29e4bd0c5337effed;hpb=6e54571bd00f7ea045dabcd5fc9fc3080665f5fc;p=oweals%2Fgnunet.git

diff --git a/src/ats/Makefile.am b/src/ats/Makefile.am
index 501fec4d7..4f2a93227 100644
--- a/src/ats/Makefile.am
+++ b/src/ats/Makefile.am
@@ -1,3 +1,4 @@
+# This Makefile.am is in the public domain
 AM_CPPFLAGS = -I$(top_srcdir)/src/include
 
 plugindir = $(libdir)/gnunet
@@ -17,50 +18,28 @@ 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_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_ADD_REQUEST_ADDRESS_DELAYED = test_ats_solver_add_address_and_request_delayed_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
+lib_LTLIBRARIES = \
+  libgnunetats.la \
+  libgnunetatsapplication.la \
+  libgnunetatstransport.la
 
 plugin_LTLIBRARIES = \
   libgnunet_plugin_ats_proportional.la \
-  $(GN_MLP_LIB) \
-  libgnunet_plugin_ats_ril.la
+  libgnunet_plugin_ats2_simple.la
 
-gnunet_ats_solver_eval_SOURCES = \
- gnunet-ats-solver-eval.c gnunet-ats-solver-eval.h \
- gnunet-service-ats_addresses.c gnunet-service-ats_addresses.h \
- gnunet-service-ats_plugins.c gnunet-service-ats_plugins.h \
- gnunet-service-ats_connectivity.c gnunet-service-ats_connectivity.h \
- gnunet-service-ats_feedback.c gnunet-service-ats_feedback.h \
- gnunet-service-ats_performance.c gnunet-service-ats_performance.h \
- gnunet-service-ats_reservations.c gnunet-service-ats_reservations.h \
- gnunet-service-ats_scheduling.c gnunet-service-ats_scheduling.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)
+if HAVE_EXPERIMENTAL
+plugin_LTLIBRARIES += \
+  libgnunet_plugin_ats_ril.la
+if HAVE_LIBGLPK
+plugin_LTLIBRARIES += \
+  libgnunet_plugin_ats_mlp.la
+endif
+endif
 
 libgnunetats_la_SOURCES = \
   ats_api_connectivity.c \
-  ats_api_scanner.c \
   ats_api_scheduling.c \
+  ats_api_scanner.c \
   ats_api_performance.c
 libgnunetats_la_LIBADD = \
  $(top_builddir)/src/hello/libgnunethello.la \
@@ -70,6 +49,25 @@ libgnunetats_la_LDFLAGS = \
   $(GN_LIB_LDFLAGS)  $(WINFLAGS) \
   -version-info 4:0:0
 
+
+libgnunetatsapplication_la_SOURCES = \
+  ats_api2_application.c
+libgnunetatsapplication_la_LIBADD = \
+ $(top_builddir)/src/util/libgnunetutil.la \
+ $(LTLIBINTL)
+libgnunetatsapplication_la_LDFLAGS = \
+  $(GN_LIB_LDFLAGS)  $(WINFLAGS) \
+  -version-info 0:0:0
+
+libgnunetatstransport_la_SOURCES = \
+  ats_api2_transport.c
+libgnunetatstransport_la_LIBADD = \
+ $(top_builddir)/src/util/libgnunetutil.la \
+ $(LTLIBINTL)
+libgnunetatstransport_la_LDFLAGS = \
+  $(GN_LIB_LDFLAGS)  $(WINFLAGS) \
+  -version-info 0:0:0
+
 libgnunet_plugin_ats_proportional_la_SOURCES = \
   plugin_ats_proportional.c
 libgnunet_plugin_ats_proportional_la_LIBADD = \
@@ -80,8 +78,19 @@ libgnunet_plugin_ats_proportional_la_LIBADD = \
 libgnunet_plugin_ats_proportional_la_LDFLAGS = \
   $(GN_PLUGIN_LDFLAGS)
 
+libgnunet_plugin_ats2_simple_la_SOURCES = \
+  plugin_ats2_simple.c
+libgnunet_plugin_ats2_simple_la_LIBADD = \
+  $(top_builddir)/src/hello/libgnunethello.la \
+  $(top_builddir)/src/peerstore/libgnunetpeerstore.la \
+  $(top_builddir)/src/nt/libgnunetnt.la \
+  $(top_builddir)/src/statistics/libgnunetstatistics.la \
+  $(top_builddir)/src/util/libgnunetutil.la \
+  $(LTLIBINTL)
+libgnunet_plugin_ats2_simple_la_LDFLAGS = \
+  $(GN_PLUGIN_LDFLAGS)
+
 
-if HAVE_LIBGLPK
 libgnunet_plugin_ats_mlp_la_SOURCES = \
   plugin_ats_mlp.c
 libgnunet_plugin_ats_mlp_la_LIBADD = \
@@ -89,8 +98,8 @@ libgnunet_plugin_ats_mlp_la_LIBADD = \
   $(top_builddir)/src/statistics/libgnunetstatistics.la \
   $(top_builddir)/src/util/libgnunetutil.la
 libgnunet_plugin_ats_mlp_la_LDFLAGS = \
-  $(GN_PLUGIN_LDFLAGS) $(GN_LIBGLPK)
-endif
+  $(GN_PLUGIN_LDFLAGS) \
+  -lglpk
 
 libgnunet_plugin_ats_ril_la_SOURCES = \
   plugin_ats_ril.c
@@ -103,13 +112,13 @@ libgnunet_plugin_ats_ril_la_LDFLAGS = \
   $(GN_PLUGIN_LDFLAGS)
 
 libexec_PROGRAMS = \
- gnunet-service-ats
+ gnunet-service-ats \
+ gnunet-service-ats-new
 
 gnunet_service_ats_SOURCES = \
- gnunet-service-ats.c gnunet-service-ats.h\
+ gnunet-service-ats.c gnunet-service-ats.h \
  gnunet-service-ats_addresses.c gnunet-service-ats_addresses.h \
  gnunet-service-ats_connectivity.c gnunet-service-ats_connectivity.h \
- gnunet-service-ats_feedback.c gnunet-service-ats_feedback.h \
  gnunet-service-ats_normalization.c gnunet-service-ats_normalization.h \
  gnunet-service-ats_performance.c gnunet-service-ats_performance.h \
  gnunet-service-ats_plugins.c gnunet-service-ats_plugins.h \
@@ -117,493 +126,93 @@ gnunet_service_ats_SOURCES = \
  gnunet-service-ats_scheduling.c gnunet-service-ats_scheduling.h \
  gnunet-service-ats_reservations.c gnunet-service-ats_reservations.h
 gnunet_service_ats_LDADD = \
+  $(top_builddir)/src/nt/libgnunetnt.la \
   $(top_builddir)/src/statistics/libgnunetstatistics.la \
   $(top_builddir)/src/util/libgnunetutil.la \
   libgnunetats.la \
   $(GN_LIBINTL)
 
+gnunet_service_ats_new_SOURCES = \
+ gnunet-service-ats-new.c
+gnunet_service_ats_new_LDADD = \
+  $(top_builddir)/src/statistics/libgnunetstatistics.la \
+  $(top_builddir)/src/util/libgnunetutil.la \
+  $(GN_LIBINTL)
+
+
 if HAVE_TESTING
 TESTING_TESTS = \
- test_ats_api_scheduling_init \
- test_ats_api_scheduling_add_address \
- test_ats_api_scheduling_add_address_duplicate \
- test_ats_api_scheduling_add_address_inbound \
- test_ats_api_scheduling_destroy_address \
- test_ats_api_scheduling_add_session \
- test_ats_api_delayed_service_scheduling_add_address \
- test_ats_api_performance_list_all_addresses \
- test_ats_api_delayed_service_performance_list_all_addresses \
- test_ats_api_performance_list_peer_addresses \
- test_ats_api_performance_list_all_addresses_active \
- test_ats_api_performance_monitor \
- test_ats_api_delayed_service_performance_monitor \
- test_ats_api_performance_monitor_initial_callback \
- test_ats_solver_add_address_proportional \
- test_ats_solver_add_address_and_request_proportional \
- test_ats_solver_add_address_and_request_delayed_proportional\
- 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_ADD_REQUEST_ADDRESS_DELAYED) \
- $(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_add_address_and_request_delayed_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
+ test_ats_api_proportional \
+ test_ats_reservation_api_proportional \
+ test_ats2_lib
+if HAVE_EXPERIMENTAL
+TESTING_TESTS += \
+ test_ats_api_ril
+if HAVE_LIBGLPK
+TESTING_TESTS += \
+ test_ats_api_mlp
+endif
+endif
 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;
+AM_TESTS_ENVIRONMENT=export GNUNET_PREFIX=$${GNUNET_PREFIX:-@libdir@};export PATH=$${GNUNET_PREFIX:-@prefix@}/bin:$$PATH;unset XDG_DATA_HOME;unset XDG_CONFIG_HOME;
 TESTS = $(check_PROGRAMS)
 endif
 
-# scheduling API tests
-
-test_ats_api_scheduling_init_SOURCES = \
- test_ats_api_scheduling_init.c \
- test_ats_api_common.c test_ats_api_common.h
-test_ats_api_scheduling_init_LDADD = \
-  $(top_builddir)/src/util/libgnunetutil.la \
-  $(top_builddir)/src/testing/libgnunettesting.la \
-  libgnunetats.la \
-  $(top_builddir)/src/statistics/libgnunetstatistics.la
-
-test_ats_api_scheduling_add_address_SOURCES = \
- test_ats_api_scheduling_add_address.c \
- test_ats_api_common.c test_ats_api_common.h
-test_ats_api_scheduling_add_address_LDADD = \
-  $(top_builddir)/src/util/libgnunetutil.la \
-  $(top_builddir)/src/testing/libgnunettesting.la \
-  libgnunetats.la \
-  $(top_builddir)/src/statistics/libgnunetstatistics.la
-
-test_ats_api_delayed_service_scheduling_add_address_SOURCES = \
- test_ats_api_delayed_service_scheduling_add_address.c \
- test_ats_api_common.c test_ats_api_common.h
-test_ats_api_delayed_service_scheduling_add_address_LDADD = \
-  $(top_builddir)/src/util/libgnunetutil.la \
-  $(top_builddir)/src/testing/libgnunettesting.la \
-  libgnunetats.la \
-  $(top_builddir)/src/statistics/libgnunetstatistics.la
-
-test_ats_api_scheduling_add_address_inbound_SOURCES = \
- test_ats_api_scheduling_add_address_inbound.c \
- test_ats_api_common.c test_ats_api_common.h
-test_ats_api_scheduling_add_address_inbound_LDADD = \
-  $(top_builddir)/src/util/libgnunetutil.la \
-  $(top_builddir)/src/testing/libgnunettesting.la \
-  libgnunetats.la \
-  $(top_builddir)/src/statistics/libgnunetstatistics.la
-
-test_ats_api_scheduling_add_address_duplicate_SOURCES = \
- test_ats_api_scheduling_add_address_duplicate.c \
- test_ats_api_common.c test_ats_api_common.h
-test_ats_api_scheduling_add_address_duplicate_LDADD = \
-  $(top_builddir)/src/util/libgnunetutil.la \
-  $(top_builddir)/src/testing/libgnunettesting.la \
-  libgnunetats.la \
-  $(top_builddir)/src/statistics/libgnunetstatistics.la
-
-test_ats_api_scheduling_destroy_address_SOURCES = \
- test_ats_api_scheduling_destroy_address.c \
- test_ats_api_common.c test_ats_api_common.h
-test_ats_api_scheduling_destroy_address_LDADD = \
-  $(top_builddir)/src/util/libgnunetutil.la \
-  $(top_builddir)/src/testing/libgnunettesting.la \
-  libgnunetats.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
-test_ats_api_scheduling_add_session_LDADD = \
-  $(top_builddir)/src/util/libgnunetutil.la \
-  $(top_builddir)/src/testing/libgnunettesting.la \
-  libgnunetats.la \
-  $(top_builddir)/src/statistics/libgnunetstatistics.la
-
-# performance API tests
-
-test_ats_api_performance_list_all_addresses_SOURCES = \
- test_ats_api_performance_list_all_addresses.c
-test_ats_api_performance_list_all_addresses_LDADD = \
-  $(top_builddir)/src/util/libgnunetutil.la \
-  $(top_builddir)/src/testing/libgnunettesting.la \
-  $(top_builddir)/src/hello/libgnunethello.la \
-  libgnunetats.la \
-	$(top_builddir)/src/statistics/libgnunetstatistics.la
-
-test_ats_api_delayed_service_performance_list_all_addresses_SOURCES = \
- test_ats_api_delayed_service_performance_list_all_addresses.c
-test_ats_api_delayed_service_performance_list_all_addresses_LDADD = \
-  $(top_builddir)/src/util/libgnunetutil.la \
-  $(top_builddir)/src/testing/libgnunettesting.la \
-  $(top_builddir)/src/hello/libgnunethello.la \
-  libgnunetats.la \
-	$(top_builddir)/src/statistics/libgnunetstatistics.la
-
-test_ats_api_performance_list_peer_addresses_SOURCES = \
- test_ats_api_performance_list_peer_addresses.c
-test_ats_api_performance_list_peer_addresses_LDADD = \
+test_ats_api_proportional_SOURCES = \
+ test_ats_api.c \
+ test_ats_lib.c test_ats_lib.h
+test_ats_api_proportional_LDADD = \
   $(top_builddir)/src/util/libgnunetutil.la \
-  $(top_builddir)/src/testing/libgnunettesting.la \
-  $(top_builddir)/src/hello/libgnunethello.la \
-  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 = \
-  $(top_builddir)/src/util/libgnunetutil.la \
-  $(top_builddir)/src/testing/libgnunettesting.la \
-  $(top_builddir)/src/hello/libgnunethello.la \
-  libgnunetats.la \
-	$(top_builddir)/src/statistics/libgnunetstatistics.la
-
-test_ats_api_performance_monitor_SOURCES = \
- test_ats_api_performance_monitor.c
-test_ats_api_performance_monitor_LDADD = \
-  $(top_builddir)/src/util/libgnunetutil.la \
-  $(top_builddir)/src/testing/libgnunettesting.la \
-  $(top_builddir)/src/hello/libgnunethello.la \
-  libgnunetats.la \
-	$(top_builddir)/src/statistics/libgnunetstatistics.la
-
-test_ats_api_delayed_service_performance_monitor_SOURCES = \
- test_ats_api_delayed_service_performance_monitor.c
-test_ats_api_delayed_service_performance_monitor_LDADD = \
-  $(top_builddir)/src/util/libgnunetutil.la \
-  $(top_builddir)/src/testing/libgnunettesting.la \
-  $(top_builddir)/src/hello/libgnunethello.la \
-  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_LDADD = \
-  $(top_builddir)/src/util/libgnunetutil.la \
-  $(top_builddir)/src/testing/libgnunettesting.la \
   $(top_builddir)/src/hello/libgnunethello.la \
-  libgnunetats.la \
-	$(top_builddir)/src/statistics/libgnunetstatistics.la
-
-# solver tests
-test_ats_solver_add_address_proportional_SOURCES = \
- test_ats_solver_add_address.c \
- test_ats_api_common.c test_ats_api_common.h
-test_ats_solver_add_address_proportional_LDADD = \
-  $(top_builddir)/src/util/libgnunetutil.la \
   $(top_builddir)/src/testing/libgnunettesting.la \
-  $(top_builddir)/src/hello/libgnunethello.la \
-  libgnunetats.la \
-	$(top_builddir)/src/statistics/libgnunetstatistics.la
-
-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
-test_ats_solver_add_address_mlp_LDADD = \
-  $(top_builddir)/src/util/libgnunetutil.la \
-  $(top_builddir)/src/testing/libgnunettesting.la \
-  $(top_builddir)/src/hello/libgnunethello.la \
-  libgnunetats.la \
-	$(top_builddir)/src/statistics/libgnunetstatistics.la
-endif
-
-test_ats_solver_add_address_ril_SOURCES = \
- test_ats_solver_add_address.c \
- test_ats_api_common.c test_ats_api_common.h
-test_ats_solver_add_address_ril_LDADD = \
-  $(top_builddir)/src/util/libgnunetutil.la \
-  $(top_builddir)/src/testing/libgnunettesting.la \
-  $(top_builddir)/src/hello/libgnunethello.la \
-  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
-test_ats_solver_add_address_and_request_proportional_LDADD = \
-  $(top_builddir)/src/util/libgnunetutil.la \
-  $(top_builddir)/src/testing/libgnunettesting.la \
-  $(top_builddir)/src/hello/libgnunethello.la \
-  libgnunetats.la \
-	$(top_builddir)/src/statistics/libgnunetstatistics.la
-
-test_ats_solver_add_address_and_request_delayed_proportional_SOURCES = \
- test_ats_solver_add_address_and_request.c \
- test_ats_api_common.c test_ats_api_common.h
-test_ats_solver_add_address_and_request_delayed_proportional_LDADD = \
-  $(top_builddir)/src/util/libgnunetutil.la \
-  $(top_builddir)/src/testing/libgnunettesting.la \
-  $(top_builddir)/src/hello/libgnunethello.la \
-  libgnunetats.la \
-	$(top_builddir)/src/statistics/libgnunetstatistics.la
-
-test_ats_solver_add_address_and_request_delayed_ril_SOURCES = \
- test_ats_solver_add_address_and_request.c \
- test_ats_api_common.c test_ats_api_common.h
-test_ats_solver_add_address_and_request_delayed_ril_LDADD = \
-  $(top_builddir)/src/util/libgnunetutil.la \
-  $(top_builddir)/src/testing/libgnunettesting.la \
-  $(top_builddir)/src/hello/libgnunethello.la \
-  libgnunetats.la \
-	$(top_builddir)/src/statistics/libgnunetstatistics.la
-
-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
-test_ats_solver_add_address_and_request_mlp_LDADD = \
-  $(top_builddir)/src/util/libgnunetutil.la \
-  $(top_builddir)/src/testing/libgnunettesting.la \
-  $(top_builddir)/src/hello/libgnunethello.la \
-  libgnunetats.la \
-	$(top_builddir)/src/statistics/libgnunetstatistics.la
-endif
-
-test_ats_solver_add_address_and_request_delayed_mlp_SOURCES = \
- test_ats_solver_add_address_and_request.c \
- test_ats_api_common.c test_ats_api_common.h
-test_ats_solver_add_address_and_request_delayed_mlp_LDADD = \
-  $(top_builddir)/src/util/libgnunetutil.la \
-  $(top_builddir)/src/testing/libgnunettesting.la \
-  $(top_builddir)/src/hello/libgnunethello.la \
-  libgnunetats.la \
-	$(top_builddir)/src/statistics/libgnunetstatistics.la
-
-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
-test_ats_solver_add_address_and_request_ril_LDADD = \
-  $(top_builddir)/src/util/libgnunetutil.la \
-  $(top_builddir)/src/testing/libgnunettesting.la \
-  $(top_builddir)/src/hello/libgnunethello.la \
-  libgnunetats.la \
-	$(top_builddir)/src/statistics/libgnunetstatistics.la
-
-
-test_ats_solver_request_and_add_address_proportional_SOURCES = \
- test_ats_solver_request_and_add_address.c \
- test_ats_api_common.c test_ats_api_common.h
-test_ats_solver_request_and_add_address_proportional_LDADD = \
-  $(top_builddir)/src/util/libgnunetutil.la \
-  $(top_builddir)/src/testing/libgnunettesting.la \
-  $(top_builddir)/src/hello/libgnunethello.la \
-  libgnunetats.la \
-	$(top_builddir)/src/statistics/libgnunetstatistics.la
-
-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
-test_ats_solver_request_and_add_address_mlp_LDADD = \
-  $(top_builddir)/src/util/libgnunetutil.la \
-  $(top_builddir)/src/testing/libgnunettesting.la \
-  $(top_builddir)/src/hello/libgnunethello.la \
-  libgnunetats.la \
-	$(top_builddir)/src/statistics/libgnunetstatistics.la
-endif
+  libgnunetats.la
 
-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
-test_ats_solver_request_and_add_address_ril_LDADD = \
+test_ats_reservation_api_proportional_SOURCES = \
+ test_ats_reservation_api.c \
+ test_ats_lib.c test_ats_lib.h
+test_ats_reservation_api_proportional_LDADD = \
   $(top_builddir)/src/util/libgnunetutil.la \
-  $(top_builddir)/src/testing/libgnunettesting.la \
   $(top_builddir)/src/hello/libgnunethello.la \
-  libgnunetats.la \
-  $(top_builddir)/src/statistics/libgnunetstatistics.la
-
-
-test_ats_solver_request_and_delete_address_proportional_SOURCES = \
- test_ats_solver_request_and_delete_address.c \
- test_ats_api_common.c test_ats_api_common.h
-test_ats_solver_request_and_delete_address_proportional_LDADD = \
-  $(top_builddir)/src/util/libgnunetutil.la \
   $(top_builddir)/src/testing/libgnunettesting.la \
-  $(top_builddir)/src/hello/libgnunethello.la \
-  libgnunetats.la \
-  $(top_builddir)/src/statistics/libgnunetstatistics.la
+  libgnunetats.la
 
-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
-test_ats_solver_request_and_delete_address_mlp_LDADD = \
+test_ats_api_ril_SOURCES = \
+ test_ats_api.c \
+ test_ats_lib.c test_ats_lib.h
+test_ats_api_ril_LDADD = \
   $(top_builddir)/src/util/libgnunetutil.la \
-  $(top_builddir)/src/testing/libgnunettesting.la \
   $(top_builddir)/src/hello/libgnunethello.la \
-  libgnunetats.la \
-  $(top_builddir)/src/statistics/libgnunetstatistics.la
-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
-test_ats_solver_request_and_delete_address_ril_LDADD = \
-  $(top_builddir)/src/util/libgnunetutil.la \
   $(top_builddir)/src/testing/libgnunettesting.la \
-  $(top_builddir)/src/hello/libgnunethello.la \
-  libgnunetats.la \
-  $(top_builddir)/src/statistics/libgnunetstatistics.la
-
+  libgnunetats.la
 
-test_ats_solver_alternative_after_delete_address_proportional_SOURCES = \
- test_ats_solver_alternative_after_delete_address.c \
- test_ats_api_common.c test_ats_api_common.h
-test_ats_solver_alternative_after_delete_address_proportional_LDADD = \
+test_ats_api_mlp_SOURCES = \
+ test_ats_api.c \
+ test_ats_lib.c test_ats_lib.h
+test_ats_api_mlp_LDADD = \
   $(top_builddir)/src/util/libgnunetutil.la \
-  $(top_builddir)/src/testing/libgnunettesting.la \
   $(top_builddir)/src/hello/libgnunethello.la \
-  libgnunetats.la \
-  $(top_builddir)/src/statistics/libgnunetstatistics.la
-
-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 \
-  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
-test_ats_solver_alternative_after_delete_address_mlp_LDADD = \
-  $(top_builddir)/src/util/libgnunetutil.la \
-  $(top_builddir)/src/testing/libgnunettesting.la \
-  $(top_builddir)/src/hello/libgnunethello.la \
-  libgnunetats.la \
-	$(top_builddir)/src/statistics/libgnunetstatistics.la
+  libgnunetats.la
 
-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 = \
+test_ats2_lib_SOURCES = \
+ test_ats2_lib.c test_ats2_lib.h
+test_ats2_lib_LDADD = \
   $(top_builddir)/src/util/libgnunetutil.la \
-  $(top_builddir)/src/testing/libgnunettesting.la \
   $(top_builddir)/src/hello/libgnunethello.la \
-  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
-test_ats_solver_alternative_after_delete_address_ril_LDADD = \
-  $(top_builddir)/src/util/libgnunetutil.la \
   $(top_builddir)/src/testing/libgnunettesting.la \
-  $(top_builddir)/src/hello/libgnunethello.la \
-  libgnunetats.la \
-	$(top_builddir)/src/statistics/libgnunetstatistics.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 \
-#  libgnunetats.la
-
-perf_ats_solver_mlp_SOURCES = \
-  perf_ats_solver.c \
-  test_ats_api_common.c \
-  gnunet-service-ats_normalization.c \
-  gnunet-service-ats_addresses.c gnunet-service-ats_addresses.h \
-  gnunet-service-ats_connectivity.c gnunet-service-ats_connectivity.h \
-  gnunet-service-ats_performance.c gnunet-service-ats_performance.h \
-  gnunet-service-ats_preferences.c gnunet-service-ats_preferences.h \
-  gnunet-service-ats_scheduling.c gnunet-service-ats_scheduling.h \
-  gnunet-service-ats_plugins.c gnunet-service-ats_plugins.h \
-  gnunet-service-ats_reservations.c gnunet-service-ats_reservations.h
-
-perf_ats_solver_mlp_LDADD = \
-  $(GN_LIBGLPK) \
-  $(top_builddir)/src/util/libgnunetutil.la \
-  $(top_builddir)/src/statistics/libgnunetstatistics.la \
-  libgnunetats.la
+  libgnunetatsapplication.la \
+  libgnunetatstransport.la
 
-perf_ats_solver_proportional_SOURCES = \
-  perf_ats_solver.c \
-  test_ats_api_common.c \
-  gnunet-service-ats_normalization.c \
-  gnunet-service-ats_addresses.c gnunet-service-ats_addresses.h \
-  gnunet-service-ats_connectivity.c gnunet-service-ats_connectivity.h \
-  gnunet-service-ats_preferences.c gnunet-service-ats_preferences.h \
-  gnunet-service-ats_performance.c gnunet-service-ats_performance.h \
-  gnunet-service-ats_scheduling.c gnunet-service-ats_scheduling.h \
-  gnunet-service-ats_plugins.c gnunet-service-ats_plugins.h \
-  gnunet-service-ats_reservations.c gnunet-service-ats_reservations.h
-
-perf_ats_solver_proportional_LDADD = \
-  $(GN_LIBGLPK) \
-  $(top_builddir)/src/util/libgnunetutil.la \
-  $(top_builddir)/src/statistics/libgnunetstatistics.la \
-  libgnunetats.la
-
-perf_ats_solver_ril_SOURCES = \
-  perf_ats_solver.c \
-  test_ats_api_common.c \
-  gnunet-service-ats_normalization.c \
-  gnunet-service-ats_addresses.c gnunet-service-ats_addresses.h \
-  gnunet-service-ats_connectivity.c gnunet-service-ats_connectivity.h \
-  gnunet-service-ats_preferences.c gnunet-service-ats_preferences.h \
-  gnunet-service-ats_performance.c gnunet-service-ats_performance.h \
-  gnunet-service-ats_scheduling.c gnunet-service-ats_scheduling.h \
-  gnunet-service-ats_plugins.c gnunet-service-ats_plugins.h \
-  gnunet-service-ats_reservations.c gnunet-service-ats_reservations.h
-
-perf_ats_solver_ril_LDADD = \
-  $(GN_LIBGLPK) \
-  $(top_builddir)/src/util/libgnunetutil.la \
-  $(top_builddir)/src/statistics/libgnunetstatistics.la \
-  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 \
-  libgnunetats.la \
-	$(top_builddir)/src/statistics/libgnunetstatistics.la
 
 EXTRA_DIST = \
-  ats.h \
+  ats.h ats2.h \
+  plugin_ats2_common.c \
   test_delay \
-  test_ats_api.conf \
-  test_ats_api_delayed.conf \
-  test_ats_mlp.conf \
-  test_ats_solver_default.conf \
-  test_ats_solver_proportional.conf \
-  test_ats_solver_proportional.conf \
-  test_ats_solver_mlp.conf \
-  test_ats_solver_delayed_mlp.conf \
-  test_ats_solver_ril.conf \
-  test_ats_solver_delayed_ril.conf \
-  perf_ats_solver_mlp.conf \
-  test_ats_solver_delayed_mlp.conf \
-  perf_ats_solver_proportional.conf \
-  perf_ats_solver_ril.conf \
-  perf_ats_solver.conf
+  test_ats_api_mlp.conf \
+  test_ats_api_ril.conf \
+  test_ats_api_proportional.conf