X-Git-Url: https://git.librecmc.org/?a=blobdiff_plain;f=src%2Fats%2FMakefile.am;h=533cddec770039a208512bb696bf37ff00d205aa;hb=a35ab677ed4396f271cfd3fea2051044a6a8b5d7;hp=8be6199804a348e4aa0b5518367e47c09df27904;hpb=f57cbab24fb7a22fc982eb8b6c4a2d18402be460;p=oweals%2Fgnunet.git

diff --git a/src/ats/Makefile.am b/src/ats/Makefile.am
index 8be619980..533cddec7 100644
--- a/src/ats/Makefile.am
+++ b/src/ats/Makefile.am
@@ -17,6 +17,9 @@ 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,6 +40,19 @@ 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
@@ -55,7 +71,9 @@ libgnunet_plugin_ats_proportional_la_LIBADD = \
   $(top_builddir)/src/util/libgnunetutil.la \
   $(LTLIBINTL)
 libgnunet_plugin_ats_proportional_la_DEPENDENCIES = \
-  libgnunetats.la
+  libgnunetats.la \
+  $(top_builddir)/src/statistics/libgnunetstatistics.la \
+  $(top_builddir)/src/util/libgnunetutil.la
 libgnunet_plugin_ats_proportional_la_LDFLAGS = \
   $(GN_PLUGIN_LDFLAGS)
 
@@ -70,7 +88,9 @@ libgnunet_plugin_ats_mlp_la_LIBADD = \
 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 = \
@@ -83,7 +103,9 @@ libgnunet_plugin_ats_ril_la_LIBADD = \
 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
@@ -145,7 +167,7 @@ check_PROGRAMS = \
  $(TESTING_TESTS)
 
 if ENABLE_TEST_RUN
-TESTS_ENVIRONMENT=export GNUNET_PREFIX=@libdir@;export PATH=@prefix@/bin:$$PATH;
+AM_TESTS_ENVIRONMENT=export GNUNET_PREFIX=$${GNUNET_PREFIX:-@libdir@};export PATH=$${GNUNET_PREFIX:-@prefix@}/bin:$$PATH;
 TESTS = $(check_PROGRAMS)
 endif
 
@@ -494,21 +516,8 @@ test_ats_solver_preferences_ril_LDADD = \
   $(top_builddir)/src/ats/libgnunetats.la \
 	$(top_builddir)/src/statistics/libgnunetstatistics.la
 
-test_ats_solver_convergence_ril_SOURCES = \
- test_ats_solver_convergence.c \
- test_ats_api_common.c test_ats_api_common.h
-test_ats_solver_convergence_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 \
-  plugin_ats_proportional.h \
-  plugin_ats_mlp.h \
-  plugin_ats_ril.h \
   test_ats_api.conf \
   test_ats_mlp.conf \
   test_ats_solver_default.conf \