From 24ab114f7fb0127e14c358f276bc3ba016998dc1 Mon Sep 17 00:00:00 2001 From: Christian Grothoff Date: Mon, 23 Dec 2013 19:59:19 +0000 Subject: -fix --- src/ats-tests/Makefile.am | 76 +++++++++++++++++++++++------------------------ src/ats/Makefile.am | 2 +- 2 files changed, 39 insertions(+), 39 deletions(-) diff --git a/src/ats-tests/Makefile.am b/src/ats-tests/Makefile.am index f943f0564..1cdeb6b5b 100644 --- a/src/ats-tests/Makefile.am +++ b/src/ats-tests/Makefile.am @@ -5,7 +5,7 @@ pkgcfgdir= $(pkgdatadir)/config.d/ libexecdir= $(pkglibdir)/libexec/ if MINGW - WINFLAGS = -Wl,--no-undefined -Wl,--export-all-symbols + WINFLAGS = -Wl,--no-undefined -Wl,--export-all-symbols endif if USE_COVERAGE @@ -18,7 +18,7 @@ if HAVE_LIBGLPK perf_ats_mlp_transport_bandwidth \ perf_ats_mlp_core_bandwidth \ perf_ats_mlp_transport_latency \ - perf_ats_mlp_core_latency + perf_ats_mlp_core_latency endif if HAVE_TESTING @@ -29,30 +29,30 @@ TESTING_TESTS = \ perf_ats_proportional_core_bandwidth \ perf_ats_proportional_transport_latency \ perf_ats_proportional_core_latency - # $(PERF_MLP) + # $(PERF_MLP) #perf_ats_ril_transport_none \ #perf_ats_ril_core_none \ #perf_ats_ril_transport_bandwidth \ #perf_ats_ril_core_bandwidth \ #perf_ats_ril_transport_latency \ - #perf_ats_ril_core_latency + #perf_ats_ril_core_latency endif check_PROGRAMS = \ $(TESTING_TESTS) - + if ENABLE_TEST_RUN TESTS = $(check_PROGRAMS) endif perf_ats_proportional_core_none_SOURCES = \ - perf_ats.c perf_ats_logging.c + perf_ats.c perf_ats_logging.c perf_ats.h perf_ats_proportional_core_none_LDADD = \ $(top_builddir)/src/util/libgnunetutil.la \ $(top_builddir)/src/testbed/libgnunettestbed.la \ $(top_builddir)/src/ats/libgnunetats.la \ $(top_builddir)/src/core/libgnunetcore.la \ - $(top_builddir)/src/transport/libgnunettransport.la + $(top_builddir)/src/transport/libgnunettransport.la perf_ats_proportional_transport_none_SOURCES = \ perf_ats.c perf_ats_logging.c @@ -61,7 +61,7 @@ perf_ats_proportional_transport_none_LDADD = \ $(top_builddir)/src/testbed/libgnunettestbed.la \ $(top_builddir)/src/ats/libgnunetats.la \ $(top_builddir)/src/core/libgnunetcore.la \ - $(top_builddir)/src/transport/libgnunettransport.la + $(top_builddir)/src/transport/libgnunettransport.la perf_ats_proportional_core_bandwidth_SOURCES = \ perf_ats.c perf_ats_logging.c @@ -70,7 +70,7 @@ perf_ats_proportional_core_bandwidth_LDADD = \ $(top_builddir)/src/testbed/libgnunettestbed.la \ $(top_builddir)/src/ats/libgnunetats.la \ $(top_builddir)/src/core/libgnunetcore.la \ - $(top_builddir)/src/transport/libgnunettransport.la + $(top_builddir)/src/transport/libgnunettransport.la perf_ats_proportional_transport_bandwidth_SOURCES = \ perf_ats.c perf_ats_logging.c @@ -79,7 +79,7 @@ perf_ats_proportional_transport_bandwidth_LDADD = \ $(top_builddir)/src/testbed/libgnunettestbed.la \ $(top_builddir)/src/ats/libgnunetats.la \ $(top_builddir)/src/core/libgnunetcore.la \ - $(top_builddir)/src/transport/libgnunettransport.la + $(top_builddir)/src/transport/libgnunettransport.la perf_ats_proportional_core_latency_SOURCES = \ perf_ats.c perf_ats_logging.c @@ -88,126 +88,126 @@ perf_ats_proportional_core_latency_LDADD = \ $(top_builddir)/src/testbed/libgnunettestbed.la \ $(top_builddir)/src/ats/libgnunetats.la \ $(top_builddir)/src/core/libgnunetcore.la \ - $(top_builddir)/src/transport/libgnunettransport.la + $(top_builddir)/src/transport/libgnunettransport.la perf_ats_proportional_transport_latency_SOURCES = \ - perf_ats.c perf_ats_logging.c + perf_ats.c perf_ats_logging.c perf_ats_proportional_transport_latency_LDADD = \ $(top_builddir)/src/util/libgnunetutil.la \ $(top_builddir)/src/testbed/libgnunettestbed.la \ $(top_builddir)/src/ats/libgnunetats.la \ $(top_builddir)/src/core/libgnunetcore.la \ - $(top_builddir)/src/transport/libgnunettransport.la - + $(top_builddir)/src/transport/libgnunettransport.la + if HAVE_LIBGLPK perf_ats_mlp_core_none_SOURCES = \ - perf_ats.c perf_ats_logging.c + perf_ats.c perf_ats_logging.c perf_ats_mlp_core_none_LDADD = \ $(top_builddir)/src/util/libgnunetutil.la \ $(top_builddir)/src/testbed/libgnunettestbed.la \ $(top_builddir)/src/ats/libgnunetats.la \ $(top_builddir)/src/core/libgnunetcore.la \ - $(top_builddir)/src/transport/libgnunettransport.la + $(top_builddir)/src/transport/libgnunettransport.la perf_ats_mlp_transport_none_SOURCES = \ - perf_ats.c perf_ats_logging.c + perf_ats.c perf_ats_logging.c perf_ats_mlp_transport_none_LDADD = \ $(top_builddir)/src/util/libgnunetutil.la \ $(top_builddir)/src/testbed/libgnunettestbed.la \ $(top_builddir)/src/ats/libgnunetats.la \ $(top_builddir)/src/core/libgnunetcore.la \ - $(top_builddir)/src/transport/libgnunettransport.la + $(top_builddir)/src/transport/libgnunettransport.la perf_ats_mlp_core_bandwidth_SOURCES = \ - perf_ats.c perf_ats_logging.c + perf_ats.c perf_ats_logging.c perf_ats_mlp_core_bandwidth_LDADD = \ $(top_builddir)/src/util/libgnunetutil.la \ $(top_builddir)/src/testbed/libgnunettestbed.la \ $(top_builddir)/src/ats/libgnunetats.la \ $(top_builddir)/src/core/libgnunetcore.la \ - $(top_builddir)/src/transport/libgnunettransport.la + $(top_builddir)/src/transport/libgnunettransport.la perf_ats_mlp_transport_bandwidth_SOURCES = \ - perf_ats.c perf_ats_logging.c + perf_ats.c perf_ats_logging.c perf_ats_mlp_transport_bandwidth_LDADD = \ $(top_builddir)/src/util/libgnunetutil.la \ $(top_builddir)/src/testbed/libgnunettestbed.la \ $(top_builddir)/src/ats/libgnunetats.la \ $(top_builddir)/src/core/libgnunetcore.la \ - $(top_builddir)/src/transport/libgnunettransport.la + $(top_builddir)/src/transport/libgnunettransport.la perf_ats_mlp_core_latency_SOURCES = \ - perf_ats.c perf_ats_logging.c + perf_ats.c perf_ats_logging.c perf_ats_mlp_core_latency_LDADD = \ $(top_builddir)/src/util/libgnunetutil.la \ $(top_builddir)/src/testbed/libgnunettestbed.la \ $(top_builddir)/src/ats/libgnunetats.la \ $(top_builddir)/src/core/libgnunetcore.la \ - $(top_builddir)/src/transport/libgnunettransport.la + $(top_builddir)/src/transport/libgnunettransport.la perf_ats_mlp_transport_latency_SOURCES = \ - perf_ats.c perf_ats_logging.c + perf_ats.c perf_ats_logging.c perf_ats_mlp_transport_latency_LDADD = \ $(top_builddir)/src/util/libgnunetutil.la \ $(top_builddir)/src/testbed/libgnunettestbed.la \ $(top_builddir)/src/ats/libgnunetats.la \ $(top_builddir)/src/core/libgnunetcore.la \ - $(top_builddir)/src/transport/libgnunettransport.la + $(top_builddir)/src/transport/libgnunettransport.la endif perf_ats_ril_core_none_SOURCES = \ - perf_ats.c perf_ats_logging.c + perf_ats.c perf_ats_logging.c perf_ats_ril_core_none_LDADD = \ $(top_builddir)/src/util/libgnunetutil.la \ $(top_builddir)/src/testbed/libgnunettestbed.la \ $(top_builddir)/src/ats/libgnunetats.la \ $(top_builddir)/src/core/libgnunetcore.la \ - $(top_builddir)/src/transport/libgnunettransport.la + $(top_builddir)/src/transport/libgnunettransport.la perf_ats_ril_transport_none_SOURCES = \ - perf_ats.c perf_ats_logging.c + perf_ats.c perf_ats_logging.c perf_ats_ril_transport_none_LDADD = \ $(top_builddir)/src/util/libgnunetutil.la \ $(top_builddir)/src/testbed/libgnunettestbed.la \ $(top_builddir)/src/ats/libgnunetats.la \ $(top_builddir)/src/core/libgnunetcore.la \ - $(top_builddir)/src/transport/libgnunettransport.la + $(top_builddir)/src/transport/libgnunettransport.la perf_ats_ril_core_bandwidth_SOURCES = \ - perf_ats.c perf_ats_logging.c + perf_ats.c perf_ats_logging.c perf_ats_ril_core_bandwidth_LDADD = \ $(top_builddir)/src/util/libgnunetutil.la \ $(top_builddir)/src/testbed/libgnunettestbed.la \ $(top_builddir)/src/ats/libgnunetats.la \ $(top_builddir)/src/core/libgnunetcore.la \ - $(top_builddir)/src/transport/libgnunettransport.la + $(top_builddir)/src/transport/libgnunettransport.la perf_ats_ril_transport_bandwidth_SOURCES = \ - perf_ats.c perf_ats_logging.c + perf_ats.c perf_ats_logging.c perf_ats_ril_transport_bandwidth_LDADD = \ $(top_builddir)/src/util/libgnunetutil.la \ $(top_builddir)/src/testbed/libgnunettestbed.la \ $(top_builddir)/src/ats/libgnunetats.la \ $(top_builddir)/src/core/libgnunetcore.la \ - $(top_builddir)/src/transport/libgnunettransport.la + $(top_builddir)/src/transport/libgnunettransport.la perf_ats_ril_core_latency_SOURCES = \ - perf_ats.c perf_ats_logging.c + perf_ats.c perf_ats_logging.c perf_ats_ril_core_latency_LDADD = \ $(top_builddir)/src/util/libgnunetutil.la \ $(top_builddir)/src/testbed/libgnunettestbed.la \ $(top_builddir)/src/ats/libgnunetats.la \ $(top_builddir)/src/core/libgnunetcore.la \ - $(top_builddir)/src/transport/libgnunettransport.la + $(top_builddir)/src/transport/libgnunettransport.la perf_ats_ril_transport_latency_SOURCES = \ - perf_ats.c perf_ats_logging.c + perf_ats.c perf_ats_logging.c perf_ats_ril_transport_latency_LDADD = \ $(top_builddir)/src/util/libgnunetutil.la \ $(top_builddir)/src/testbed/libgnunettestbed.la \ $(top_builddir)/src/ats/libgnunetats.la \ $(top_builddir)/src/core/libgnunetcore.la \ - $(top_builddir)/src/transport/libgnunettransport.la + $(top_builddir)/src/transport/libgnunettransport.la EXTRA_DIST = \ perf_ats_proportional_none.conf \ diff --git a/src/ats/Makefile.am b/src/ats/Makefile.am index 663759623..ab20b6dac 100644 --- a/src/ats/Makefile.am +++ b/src/ats/Makefile.am @@ -504,7 +504,7 @@ test_ats_solver_convergence_ril_LDADD = \ $(top_builddir)/src/statistics/libgnunetstatistics.la EXTRA_DIST = \ - ats.h perf_ats.h \ + ats.h \ plugin_ats_proportional.h \ plugin_ats_mlp.h \ plugin_ats_ril.h \ -- cgit v1.2.3