[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[GNUnet-SVN] r32961 - in gnunet/src: ats ats-tests
From: |
gnunet |
Subject: |
[GNUnet-SVN] r32961 - in gnunet/src: ats ats-tests |
Date: |
Tue, 8 Apr 2014 10:29:59 +0200 |
Author: wachs
Date: 2014-04-08 10:29:59 +0200 (Tue, 08 Apr 2014)
New Revision: 32961
Modified:
gnunet/src/ats-tests/Makefile.am
gnunet/src/ats/Makefile.am
Log:
fix bootstrap
Modified: gnunet/src/ats/Makefile.am
===================================================================
--- gnunet/src/ats/Makefile.am 2014-04-08 08:07:39 UTC (rev 32960)
+++ gnunet/src/ats/Makefile.am 2014-04-08 08:29:59 UTC (rev 32961)
@@ -516,16 +516,6 @@
$(top_builddir)/src/ats/libgnunetats.la \
$(top_builddir)/src/statistics/libgnunetstatistics.la
-test_ats_solver_convergence_ril_SOURCES = \
- test_ats_solver_convergence.c \
- test_ats_api_common.c test_ats_api_common.h
-test_ats_solver_convergence_ril_LDADD = \
- $(top_builddir)/src/util/libgnunetutil.la \
- $(top_builddir)/src/testing/libgnunettesting.la \
- $(top_builddir)/src/hello/libgnunethello.la \
- $(top_builddir)/src/ats/libgnunetats.la \
- $(top_builddir)/src/statistics/libgnunetstatistics.la
-
EXTRA_DIST = \
ats.h \
plugin_ats_proportional.h \
Modified: gnunet/src/ats-tests/Makefile.am
===================================================================
--- gnunet/src/ats-tests/Makefile.am 2014-04-08 08:07:39 UTC (rev 32960)
+++ gnunet/src/ats-tests/Makefile.am 2014-04-08 08:29:59 UTC (rev 32961)
@@ -31,7 +31,6 @@
perf_ats_proportional_core_latency \
$(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
-
endif
lib_LTLIBRARIES = \
@@ -86,7 +85,6 @@
gnunet_solver_eval_DEPENDENCIES = \
$(top_builddir)/src/util/libgnunetutil.la
-
perf_ats_proportional_core_none_SOURCES = \
perf_ats.c
perf_ats_proportional_core_none_LDADD = \
@@ -96,7 +94,7 @@
$(top_builddir)/src/ats/libgnunetats.la \
$(top_builddir)/src/core/libgnunetcore.la \
$(top_builddir)/src/transport/libgnunettransport.la
-perf_ats_proportional_core_DEPENDENCIES = \
+perf_ats_proportional_core_none_DEPENDENCIES = \
libgnunetatstesting.la \
$(top_builddir)/src/util/libgnunetutil.la
@@ -165,7 +163,7 @@
libgnunetatstesting.la \
$(top_builddir)/src/util/libgnunetutil.la
-if HAVE_LIBGLPK
+if FALSE
perf_ats_mlp_core_none_SOURCES = \
perf_ats.c
perf_ats_mlp_core_none_LDADD = \
@@ -245,85 +243,20 @@
$(top_builddir)/src/util/libgnunetutil.la
endif
-perf_ats_ril_core_none_SOURCES = \
- perf_ats.c
-perf_ats_ril_core_none_LDADD = \
- $(top_builddir)/src/util/libgnunetutil.la \
- $(top_builddir)/src/ats-tests/libgnunetatstesting.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
-perf_ats_ril_core_none_DEPENDENCIES = \
- libgnunetatstesting.la \
- $(top_builddir)/src/util/libgnunetutil.la
+#perf_ats_ril_core_none_SOURCES = \
+# perf_ats.c
+#perf_ats_ril_core_none_LDADD = \
+# $(top_builddir)/src/util/libgnunetutil.la \
+# $(top_builddir)/src/ats-tests/libgnunetatstesting.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
+#perf_ats_ril_core_none_DEPENDENCIES = \
+# libgnunetatstesting.la \
+# $(top_builddir)/src/util/libgnunetutil.la
-perf_ats_ril_transport_none_SOURCES = \
- perf_ats.c
-perf_ats_ril_transport_none_LDADD = \
- $(top_builddir)/src/util/libgnunetutil.la \
- $(top_builddir)/src/ats-tests/libgnunetatstesting.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
-perf_ats_ril_transport_none_DEPENDENCIES = \
- libgnunetatstesting.la \
- $(top_builddir)/src/util/libgnunetutil.la
-perf_ats_ril_core_bandwidth_SOURCES = \
- perf_ats.c
-perf_ats_ril_core_bandwidth_LDADD = \
- $(top_builddir)/src/util/libgnunetutil.la \
- $(top_builddir)/src/ats-tests/libgnunetatstesting.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
-perf_ats_ril_core_bandwidth_DEPENDENCIES = \
- libgnunetatstesting.la \
- $(top_builddir)/src/util/libgnunetutil.la
-
-perf_ats_ril_transport_bandwidth_SOURCES = \
- perf_ats.c
-perf_ats_ril_transport_bandwidth_LDADD = \
- $(top_builddir)/src/util/libgnunetutil.la \
- $(top_builddir)/src/ats-tests/libgnunetatstesting.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
-perf_ats_ril_transport_DEPENDENCIES = \
- libgnunetatstesting.la \
- $(top_builddir)/src/util/libgnunetutil.la
-
-
-perf_ats_ril_core_latency_SOURCES = \
- perf_ats.c
-perf_ats_ril_core_latency_LDADD = \
- $(top_builddir)/src/util/libgnunetutil.la \
- $(top_builddir)/src/ats-tests/libgnunetatstesting.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
-perf_ats_ril_core_latency_DEPENDENCIES = \
- libgnunetatstesting.la \
- $(top_builddir)/src/util/libgnunetutil.la
-
-perf_ats_ril_transport_latency_SOURCES = \
- perf_ats.c
-perf_ats_ril_transport_latency_LDADD = \
- $(top_builddir)/src/util/libgnunetutil.la \
- $(top_builddir)/src/ats-tests/libgnunetatstesting.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
-perf_ats_ril_transport_latency_DEPENDENCIES = \
- libgnunetatstesting.la \
- $(top_builddir)/src/util/libgnunetutil.la
-
EXTRA_DIST = \
gnunet_ats_sim_default.conf \
perf_ats_proportional_none.conf \
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- [GNUnet-SVN] r32961 - in gnunet/src: ats ats-tests,
gnunet <=