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 1fbd434ee2b9e2da4d161f87b3f10b8a7a7dab29..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,7 +19,7 @@ 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
@@ -27,14 +29,18 @@ if HAVE_LIBGLPK
   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 \
@@ -44,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
@@ -52,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
@@ -62,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
@@ -91,12 +129,12 @@ TESTING_TESTS = \
  $(GN_MLP_ADD_REQUEST_ADDRESS) \
  $(GN_MLP_REQUEST_ADD_ADDRESS) \
  $(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
+ $(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