aboutsummaryrefslogtreecommitdiff
path: root/src/testbed/Makefile.am
diff options
context:
space:
mode:
Diffstat (limited to 'src/testbed/Makefile.am')
-rw-r--r--src/testbed/Makefile.am28
1 files changed, 1 insertions, 27 deletions
diff --git a/src/testbed/Makefile.am b/src/testbed/Makefile.am
index 8b5d7457a..b5a7758f0 100644
--- a/src/testbed/Makefile.am
+++ b/src/testbed/Makefile.am
@@ -27,7 +27,6 @@ endif
27libexec_PROGRAMS = \ 27libexec_PROGRAMS = \
28 gnunet-service-testbed \ 28 gnunet-service-testbed \
29 gnunet-helper-testbed \ 29 gnunet-helper-testbed \
30 gnunet-service-testbed-logger \
31 gnunet-daemon-testbed-blacklist \ 30 gnunet-daemon-testbed-blacklist \
32 $(underlay_daemon) \ 31 $(underlay_daemon) \
33 $(latency_logger) 32 $(latency_logger)
@@ -59,11 +58,6 @@ gnunet_service_testbed_LDADD = $(XLIB) \
59 $(top_builddir)/src/arm/libgnunetarm.la \ 58 $(top_builddir)/src/arm/libgnunetarm.la \
60 $(LTLIBINTL) $(Z_LIBS) 59 $(LTLIBINTL) $(Z_LIBS)
61 60
62gnunet_service_testbed_logger_SOURCES = \
63 gnunet-service-testbed-logger.c
64gnunet_service_testbed_logger_LDADD = \
65 $(top_builddir)/src/util/libgnunetutil.la
66
67gnunet_testbed_profiler_SOURCES = \ 61gnunet_testbed_profiler_SOURCES = \
68 gnunet-testbed-profiler.c 62 gnunet-testbed-profiler.c
69gnunet_testbed_profiler_LDADD = $(XLIB) \ 63gnunet_testbed_profiler_LDADD = $(XLIB) \
@@ -97,8 +91,7 @@ gnunet_daemon_latency_logger_LDADD = $(XLIB) \
97 $(LTLIBINTL) -lsqlite3 91 $(LTLIBINTL) -lsqlite3
98 92
99lib_LTLIBRARIES = \ 93lib_LTLIBRARIES = \
100 libgnunettestbed.la \ 94 libgnunettestbed.la
101 libgnunettestbedlogger.la
102 95
103libgnunettestbed_la_SOURCES = \ 96libgnunettestbed_la_SOURCES = \
104 testbed_api.c testbed_api.h testbed.h \ 97 testbed_api.c testbed_api.h testbed.h \
@@ -125,15 +118,6 @@ libgnunettestbed_la_LDFLAGS = \
125 $(GN_LIB_LDFLAGS) \ 118 $(GN_LIB_LDFLAGS) \
126 -version-info 0:0:0 119 -version-info 0:0:0
127 120
128libgnunettestbedlogger_la_SOURCES = \
129 testbed_logger_api.c
130libgnunettestbedlogger_la_LIBADD = $(XLIB) \
131 $(top_builddir)/src/util/libgnunetutil.la \
132 $(LTLIBINTL)
133libgnunettestbedlogger_la_LDFLAGS = \
134 $(GN_LIB_LDFLAGS) \
135 -version-info 0:0:0
136
137generate_underlay_topology_SOURCES = generate-underlay-topology.c 121generate_underlay_topology_SOURCES = generate-underlay-topology.c
138generate_underlay_topology_LDADD = $(XLIB) \ 122generate_underlay_topology_LDADD = $(XLIB) \
139 $(top_builddir)/src/util/libgnunetutil.la \ 123 $(top_builddir)/src/util/libgnunetutil.la \
@@ -142,7 +126,6 @@ generate_underlay_topology_LDADD = $(XLIB) \
142 126
143check_PROGRAMS = \ 127check_PROGRAMS = \
144 test_testbed_api_hosts \ 128 test_testbed_api_hosts \
145 test_testbed_logger_api \
146 test_gnunet_helper_testbed \ 129 test_gnunet_helper_testbed \
147 test_testbed_api_controllerlink \ 130 test_testbed_api_controllerlink \
148 test_testbed_api_2peers_1controller \ 131 test_testbed_api_2peers_1controller \
@@ -176,7 +159,6 @@ if ENABLE_TEST_RUN
176 AM_TESTS_ENVIRONMENT=export GNUNET_PREFIX=$${GNUNET_PREFIX:-@libdir@};export PATH=$${GNUNET_PREFIX:-@prefix@}/bin:$$PATH; 159 AM_TESTS_ENVIRONMENT=export GNUNET_PREFIX=$${GNUNET_PREFIX:-@libdir@};export PATH=$${GNUNET_PREFIX:-@prefix@}/bin:$$PATH;
177 TESTS = \ 160 TESTS = \
178 test_testbed_api \ 161 test_testbed_api \
179 test_testbed_logger_api \
180 test_testbed_api_sd \ 162 test_testbed_api_sd \
181 test_testbed_api_operations \ 163 test_testbed_api_operations \
182 test_testbed_api_hosts \ 164 test_testbed_api_hosts \
@@ -219,13 +201,6 @@ test_testbed_api_LDADD = \
219 $(top_builddir)/src/arm/libgnunetarm.la \ 201 $(top_builddir)/src/arm/libgnunetarm.la \
220 libgnunettestbed.la 202 libgnunettestbed.la
221 203
222test_testbed_logger_api_SOURCES = \
223 test_testbed_logger_api.c
224test_testbed_logger_api_LDADD = \
225 $(top_builddir)/src/util/libgnunetutil.la \
226 $(top_builddir)/src/testing/libgnunettesting.la \
227 libgnunettestbedlogger.la
228
229test_testbed_api_sd_SOURCES = \ 204test_testbed_api_sd_SOURCES = \
230 test_testbed_api_sd.c 205 test_testbed_api_sd.c
231test_testbed_api_sd_LDADD = \ 206test_testbed_api_sd_LDADD = \
@@ -398,7 +373,6 @@ EXTRA_DIST = \
398 test_testbed_api_statistics.conf \ 373 test_testbed_api_statistics.conf \
399 test_testbed_api_test_timeout.conf \ 374 test_testbed_api_test_timeout.conf \
400 test_testbed_api_template.conf \ 375 test_testbed_api_template.conf \
401 test_testbed_logger_api.conf \
402 test_testbed_api_testbed_run_topologyring.conf \ 376 test_testbed_api_testbed_run_topologyring.conf \
403 test_testbed_api_testbed_run_topologyclique.conf \ 377 test_testbed_api_testbed_run_topologyclique.conf \
404 test_testbed_api_testbed_run_topologyline.conf \ 378 test_testbed_api_testbed_run_topologyline.conf \