[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[GNUnet-SVN] r30018 - gnunet/src/ats
From: |
gnunet |
Subject: |
[GNUnet-SVN] r30018 - gnunet/src/ats |
Date: |
Wed, 9 Oct 2013 01:15:28 +0200 |
Author: LRN
Date: 2013-10-09 01:15:28 +0200 (Wed, 09 Oct 2013)
New Revision: 30018
Modified:
gnunet/src/ats/Makefile.am
Log:
Misc makefile fixes
Move plugins closer to the library
Use plugin LDFLAGS on plugins
Add dependencies and LDADDs
Modified: gnunet/src/ats/Makefile.am
===================================================================
--- gnunet/src/ats/Makefile.am 2013-10-08 23:15:23 UTC (rev 30017)
+++ gnunet/src/ats/Makefile.am 2013-10-08 23:15:28 UTC (rev 30018)
@@ -50,7 +50,43 @@
$(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 @@
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 = \
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- [GNUnet-SVN] r30018 - gnunet/src/ats,
gnunet <=