-fix config, shutdown issue

[oweals/gnunet.git] / src / ats / Makefile.am

diff --git a/src/ats/Makefile.am b/src/ats/Makefile.am
index 2ed2f4694c0ef7dc2a6003592452fe6d8d43ae0f..4491b08a206eb1b3b964fed62f3f4a2d1651bc47 100644 (file)
--- 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
@@ -43,6 +44,13 @@ plugin_LTLIBRARIES = \
 
 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 \
@@ -51,9 +59,12 @@ gnunet_ats_solver_eval_LDADD = \
  $(LTLIBINTL)
 
 libgnunetats_la_SOURCES = \
+  ats_api_connectivity.c \
+  ats_api_scanner.c \
   ats_api_scheduling.c \
   ats_api_performance.c
 libgnunetats_la_LIBADD = \
+ $(top_builddir)/src/hello/libgnunethello.la \
  $(top_builddir)/src/util/libgnunetutil.la \
  $(LTLIBINTL)
 libgnunetats_la_LDFLAGS = \
@@ -98,8 +109,12 @@ libexec_PROGRAMS = \
 gnunet_service_ats_SOURCES = \
  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 \
+ gnunet-service-ats_preferences.c gnunet-service-ats_preferences.h \
  gnunet-service-ats_scheduling.c gnunet-service-ats_scheduling.h \
  gnunet-service-ats_reservations.c gnunet-service-ats_reservations.h
 gnunet_service_ats_LDADD = \
@@ -115,9 +130,7 @@ TESTING_TESTS = \
  test_ats_api_scheduling_add_address_duplicate \
  test_ats_api_scheduling_add_address_inbound \
  test_ats_api_scheduling_destroy_address \
- test_ats_api_scheduling_destroy_address_twice \
  test_ats_api_scheduling_add_session \
- test_ats_api_scheduling_destroy_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 \
@@ -216,15 +229,6 @@ test_ats_api_scheduling_destroy_address_LDADD = \
   libgnunetats.la \
   $(top_builddir)/src/statistics/libgnunetstatistics.la
 
-test_ats_api_scheduling_destroy_address_twice_SOURCES = \
- test_ats_api_scheduling_destroy_address_twice.c \
- test_ats_api_common.c test_ats_api_common.h
-test_ats_api_scheduling_destroy_address_twice_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 = \
@@ -233,14 +237,6 @@ test_ats_api_scheduling_add_session_LDADD = \
   libgnunetats.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
-test_ats_api_scheduling_destroy_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 = \
@@ -251,7 +247,7 @@ test_ats_api_performance_list_all_addresses_LDADD = \
   $(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 = \
@@ -259,7 +255,7 @@ test_ats_api_delayed_service_performance_list_all_addresses_LDADD = \
   $(top_builddir)/src/testing/libgnunettesting.la \
   $(top_builddir)/src/hello/libgnunethello.la \
   libgnunetats.la \
-       $(top_builddir)/src/statistics/libgnunetstatistics.la   
+       $(top_builddir)/src/statistics/libgnunetstatistics.la
 
 test_ats_api_performance_list_peer_addresses_SOURCES = \
  test_ats_api_performance_list_peer_addresses.c
@@ -360,7 +356,7 @@ test_ats_solver_add_address_and_request_delayed_proportional_LDADD = \
   $(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
@@ -369,7 +365,7 @@ test_ats_solver_add_address_and_request_delayed_ril_LDADD = \
   $(top_builddir)/src/testing/libgnunettesting.la \
   $(top_builddir)/src/hello/libgnunethello.la \
   libgnunetats.la \
-       $(top_builddir)/src/statistics/libgnunetstatistics.la   
+       $(top_builddir)/src/statistics/libgnunetstatistics.la
 
 if HAVE_LIBGLPK
 test_ats_solver_add_address_and_request_mlp_SOURCES = \
@@ -391,7 +387,7 @@ test_ats_solver_add_address_and_request_delayed_mlp_LDADD = \
   $(top_builddir)/src/testing/libgnunettesting.la \
   $(top_builddir)/src/hello/libgnunethello.la \
   libgnunetats.la \
-       $(top_builddir)/src/statistics/libgnunetstatistics.la   
+       $(top_builddir)/src/statistics/libgnunetstatistics.la
 
 test_ats_solver_add_address_and_request_ril_SOURCES = \
  test_ats_solver_add_address_and_request.c \
@@ -531,7 +527,17 @@ test_ats_solver_alternative_after_delete_address_ril_LDADD = \
 #  libgnunetats.la
 
 perf_ats_solver_mlp_SOURCES = \
-  perf_ats_solver.c test_ats_api_common.c gnunet-service-ats_normalization.c
+  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 \
@@ -539,7 +545,17 @@ perf_ats_solver_mlp_LDADD = \
   libgnunetats.la
 
 perf_ats_solver_proportional_SOURCES = \
-  perf_ats_solver.c test_ats_api_common.c gnunet-service-ats_normalization.c
+  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 \
@@ -547,7 +563,17 @@ perf_ats_solver_proportional_LDADD = \
   libgnunetats.la
 
 perf_ats_solver_ril_SOURCES = \
-  perf_ats_solver.c test_ats_api_common.c gnunet-service-ats_normalization.c
+  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 \