Misc makefile fixes

Move plugins closer to the library
Use plugin LDFLAGS on plugins
Add dependencies and LDADDs

1 files changed, 36 insertions, 18 deletions

diff --git a/src/ats/Makefile.am b/src/ats/Makefile.am
index 1cd5e7f34..6dc9a5bb5 100644
--- a/src/ats/Makefile.am
+++ b/src/ats/Makefile.am
@@ -50,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
@@ -127,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 = \