ats_ril: - removed some redundantly saved plugin environment attributes

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

diff --git a/src/ats/Makefile.am b/src/ats/Makefile.am
index 464597bfe40945e3cda01fb64b4c3bb5fca62887..6bf13b0e29e149476adb4a7a770c34df239c208e 100644 (file)
--- a/src/ats/Makefile.am
+++ b/src/ats/Makefile.am
@@ -1,5 +1,7 @@
 AM_CPPFLAGS = -I$(top_srcdir)/src/include
 
+plugindir = $(libdir)/gnunet
+
 pkgcfgdir= $(pkgdatadir)/config.d/
 
 libexecdir= $(pkglibdir)/libexec/
@@ -17,21 +19,28 @@ endif
 
 if HAVE_LIBGLPK
   GN_LIBGLPK = -lglpk
-  GN_MLP_SRC = gnunet-service-ats-solver_mlp.c gnunet-service-ats-solver_mlp.h
+  GN_MLP_LIB = libgnunet_plugin_ats_mlp.la
   GN_MLP_TEST = test_ats_mlp
   GN_MLP_TEST_UPDATE = test_ats_mlp_update
   GN_MLP_TEST_AVG = test_ats_mlp_averaging
   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_REQUEST_ADD_ADDRESS = test_ats_solver_request_and_add_address_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_ALTERNATIVE_DELETE_ADDRESS = test_ats_solver_alternative_after_delete_address_mlp
 endif
 
 lib_LTLIBRARIES = libgnunetats.la
 
+plugin_LTLIBRARIES = \
+  libgnunet_plugin_ats_proportional.la \
+  $(GN_MLP_LIB) \
+  libgnunet_plugin_ats_ril.la
+
 libgnunetats_la_SOURCES = \
   ats_api_scheduling.c \
-  ats_api_performance.c 
+  ats_api_performance.c  
 
 libgnunetats_la_LIBADD = \
  $(top_builddir)/src/util/libgnunetutil.la \
@@ -41,6 +50,42 @@ libgnunetats_la_LDFLAGS = \
  $(GN_LIB_LDFLAGS) \
   -version-info 4:0:0
 
+libgnunet_plugin_ats_proportional_la_SOURCES = \
+  libgnunet_plugin_ats_proportional.c
+libgnunet_plugin_ats_proportional_la_LIBADD = \
+  $(top_builddir)/src/statistics/libgnunetstatistics.la \
+  $(top_builddir)/src/ats/libgnunetats.la \
+  $(top_builddir)/src/util/libgnunetutil.la \
+  $(LTLIBINTL)
+libgnunet_plugin_ats_proportional_la_LDFLAGS = \
+  $(GN_PLUGIN_LDFLAGS)
+libgnunet_plugin_ats_proportional_la_DEPENDENCIES = \
+  libgnunetats.la
+
+if HAVE_LIBGLPK
+libgnunet_plugin_ats_mlp_la_SOURCES = \
+  libgnunet_plugin_ats_mlp.c
+libgnunet_plugin_ats_mlp_la_LIBADD = \
+  $(top_builddir)/src/statistics/libgnunetstatistics.la \
+  $(top_builddir)/src/ats/libgnunetats.la \
+  $(top_builddir)/src/util/libgnunetutil.la
+libgnunet_plugin_ats_mlp_la_LDFLAGS = \
+  $(GN_PLUGIN_LDFLAGS) $(GN_LIBGLPK)
+libgnunet_plugin_ats_mlp_la_DEPENDENCIES = \
+  libgnunetats.la
+endif
+
+libgnunet_plugin_ats_ril_la_SOURCES = \
+  libgnunet_plugin_ats_ril.c
+libgnunet_plugin_ats_ril_la_LIBADD = \
+  $(top_builddir)/src/statistics/libgnunetstatistics.la \
+  $(top_builddir)/src/ats/libgnunetats.la \
+  $(top_builddir)/src/util/libgnunetutil.la \
+  $(LTLIBINTL)
+libgnunet_plugin_ats_ril_la_LDFLAGS = \
+  $(GN_PLUGIN_LDFLAGS)
+libgnunet_plugin_ats_ril_la_DEPENDENCIES = \
+  libgnunetats.la
 
 libexec_PROGRAMS = \
  gnunet-service-ats
@@ -49,9 +94,6 @@ 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_normalization.c gnunet-service-ats_normalization.h \
- gnunet-service-ats-solver_proportional.c gnunet-service-ats-solver_proportional.h \
- $(GN_MLP_SRC) \
- gnunet-service-ats-solver_ril.c gnunet-service-ats-solver_ril.h \
  gnunet-service-ats_performance.c gnunet-service-ats_performance.h \
  gnunet-service-ats_scheduling.c gnunet-service-ats_scheduling.h \
  gnunet-service-ats_reservations.c gnunet-service-ats_reservations.h
@@ -59,7 +101,6 @@ gnunet_service_ats_LDADD = \
   $(top_builddir)/src/statistics/libgnunetstatistics.la \
   $(top_builddir)/src/util/libgnunetutil.la \
   libgnunetats.la \
-  $(GN_LIBGLPK) \
   $(GN_LIBINTL)
 gnunet_service_ats_DEPENDENCIES = \
   libgnunetats.la
@@ -80,14 +121,21 @@ TESTING_TESTS = \
  test_ats_api_performance_monitor \
  test_ats_api_performance_monitor_initial_callback \
  test_ats_solver_add_address_proportional \
- $(GN_MLP_ADD_ADDRESS) \
- test_ats_solver_add_address_ril \
  test_ats_solver_add_address_and_request_proportional \
- $(GN_MLP_ADD_REQUEST_ADDRESS) \
- test_ats_solver_add_address_and_request_ril \
  test_ats_solver_request_and_add_address_proportional \
+ test_ats_solver_request_and_delete_address_proportional \
+ test_ats_solver_alternative_after_delete_address_proportional \
+ $(GN_MLP_ADD_REQUEST_ADDRESS) \
+ $(GN_MLP_ADD_REQUEST_ADDRESS) \
  $(GN_MLP_REQUEST_ADD_ADDRESS) \
- test_ats_solver_request_and_add_address_ril
+ $(GN_MLP_REQUEST_DELETE_ADDRESS) \
+ $(GN_MLP_ALTERNATIVE_DELETE_ADDRESS) \
+ test_ats_solver_add_address_ril \
+ test_ats_solver_add_address_and_request_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
+  
 # test_ats_api_scheduling_min_bw
 # test_ats_api_scheduling_check_min_bw_alt
 # test_ats_api_scheduling_update_address
@@ -329,6 +377,72 @@ test_ats_solver_request_and_add_address_ril_LDADD = \
        $(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 \
+  $(top_builddir)/src/ats/libgnunetats.la \
+       $(top_builddir)/src/statistics/libgnunetstatistics.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 = \
+  $(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
+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 \
+  $(top_builddir)/src/ats/libgnunetats.la \
+       $(top_builddir)/src/statistics/libgnunetstatistics.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 = \
+  $(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
+       
+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 \
+  $(top_builddir)/src/ats/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 \
+  $(top_builddir)/src/ats/libgnunetats.la \
+       $(top_builddir)/src/statistics/libgnunetstatistics.la
+
+
 #test_ats_api_scheduling_min_bw_SOURCES = \
 # test_ats_api_scheduling_min_bw.c test_ats_api_common.c
 #test_ats_api_scheduling_min_bw_LDADD = \