Misc makefile fixes

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

diff --git a/src/ats/Makefile.am b/src/ats/Makefile.am
index fd215621320af1e4d4ac69e89ef5cee048b15a8b..6dc9a5bb5017714f011f43848133530eda1e39bd 100644 (file)
--- a/src/ats/Makefile.am
+++ b/src/ats/Makefile.am
@@ -35,7 +35,8 @@ lib_LTLIBRARIES = libgnunetats.la
 
 plugin_LTLIBRARIES = \
   libgnunet_plugin_ats_proportional.la \
-  $(GN_MLP_LIB)
+  $(GN_MLP_LIB) \
+  libgnunet_plugin_ats_ril.la
 
 libgnunetats_la_SOURCES = \
   ats_api_scheduling.c \
@@ -49,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
@@ -96,12 +133,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
@@ -126,24 +163,6 @@ if ENABLE_TEST_RUN
 TESTS = $(check_PROGRAMS)
 endif
 
-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/util/libgnunetutil.la \
-  $(LTLIBINTL)
-
-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/util/libgnunetutil.la \
-  $(GN_LIBGLPK)
-libgnunet_plugin_ats_mlp_la_LDFLAGS = \
-       $(GN_LIBGLPK) 
-endif 
-
 # scheduling API tests
 
 test_ats_api_scheduling_init_SOURCES = \