AM_CFLAGS = -fprofile-arcs -ftest-coverage
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
+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 \
$(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 = \
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 = \
libgnunet_plugin_ats_mlp_la_LDFLAGS = \
$(GN_PLUGIN_LDFLAGS) \
-lglpk
-endif
libgnunet_plugin_ats_ril_la_SOURCES = \
plugin_ats_ril.c
$(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_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_proportional \
- test_ats_reservation_api_proportional
-if HAVE_WACHS
+ test_ats_reservation_api_proportional \
+ test_ats2_lib
+if HAVE_EXPERIMENTAL
TESTING_TESTS += \
test_ats_api_ril
if HAVE_LIBGLPK
$(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
$(top_builddir)/src/testing/libgnunettesting.la \
libgnunetats.la
+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/hello/libgnunethello.la \
+ $(top_builddir)/src/testing/libgnunettesting.la \
+ libgnunetatsapplication.la \
+ libgnunetatstransport.la
+
+
EXTRA_DIST = \
- ats.h \
+ ats.h ats2.h \
+ plugin_ats2_common.c \
test_delay \
test_ats_api_mlp.conf \
test_ats_api_ril.conf \