remove dead, obsolete or never-to-become ATS logic (DCE)

1 files changed, 6 insertions, 121 deletions

diff --git a/src/ats/Makefile.am b/src/ats/Makefile.am
index d7e5b68c7..bd8962158 100644
--- a/src/ats/Makefile.am
+++ b/src/ats/Makefile.am
@@ -15,22 +15,10 @@ if USE_COVERAGE
 endif
 
 lib_LTLIBRARIES = \
-  libgnunetats.la \
-  libgnunetatsapplication.la \
-  libgnunetatstransport.la
+  libgnunetats.la
 
 plugin_LTLIBRARIES = \
-  libgnunet_plugin_ats_proportional.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
+  libgnunet_plugin_ats_proportional.la
 
 libgnunetats_la_SOURCES = \
   ats_api_connectivity.c \
@@ -45,74 +33,20 @@ 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 = \
   libgnunetats.la \
   $(top_builddir)/src/statistics/libgnunetstatistics.la \
   $(top_builddir)/src/util/libgnunetutil.la \
-        $(top_builddir)/src/nt/libgnunetnt.la \
-  $(LTLIBINTL)
-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 = \
+libgnunet_plugin_ats_proportional_la_LDFLAGS = \
   $(GN_PLUGIN_LDFLAGS)
 
 
-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/nt/libgnunetnt.la \
-  $(top_builddir)/src/util/libgnunetutil.la
-libgnunet_plugin_ats_mlp_la_LDFLAGS = \
-  $(GN_PLUGIN_LDFLAGS) \
-  -lglpk
-
-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/nt/libgnunetnt.la \
-  $(top_builddir)/src/util/libgnunetutil.la \
-  $(LTLIBINTL)
-libgnunet_plugin_ats_ril_la_LDFLAGS = \
-  $(GN_PLUGIN_LDFLAGS)
-
 libexec_PROGRAMS = \
- gnunet-service-ats \
- gnunet-service-ats-new
+ gnunet-service-ats
 
 gnunet_service_ats_SOURCES = \
  gnunet-service-ats.c gnunet-service-ats.h \
@@ -131,27 +65,10 @@ gnunet_service_ats_LDADD = \
   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 \
- test_ats2_lib
-if HAVE_EXPERIMENTAL
-TESTING_TESTS += \
- test_ats_api_ril
-if HAVE_LIBGLPK
-TESTING_TESTS += \
- test_ats_api_mlp
-endif
-endif
+ test_ats_reservation_api_proportional
 endif
 
 check_PROGRAMS = \
@@ -180,40 +97,8 @@ test_ats_reservation_api_proportional_LDADD = \
   $(top_builddir)/src/testing/libgnunettesting.la \
   libgnunetats.la
 
-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/hello/libgnunethello.la \
-  $(top_builddir)/src/testing/libgnunettesting.la \
-  libgnunetats.la
-
-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/hello/libgnunethello.la \
-  $(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 ats2.h \
-  plugin_ats2_common.c \
+  ats.h \
   test_delay \
-  test_ats2_lib.conf \
   test_ats_api.conf \
-  test_ats_api_mlp.conf \
-  test_ats_api_ril.conf \
   test_ats_api_proportional.conf