projects
/
oweals
/
gnunet.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
add $(GN_LIBINTL) to Makefile.am (fixes 0005902)
[oweals/gnunet.git]
/
src
/
testbed
/
Makefile.am
diff --git
a/src/testbed/Makefile.am
b/src/testbed/Makefile.am
index edb4ae6722eb8c8a9edf8d485ea3aa8ce4799b70..62b49af78649cc3498d971273eac170ae4e22911 100644
(file)
--- a/
src/testbed/Makefile.am
+++ b/
src/testbed/Makefile.am
@@
-1,10
+1,6
@@
# This Makefile.am is in the public domain
AM_CPPFLAGS = -I$(top_srcdir)/src/include
# This Makefile.am is in the public domain
AM_CPPFLAGS = -I$(top_srcdir)/src/include
-if MINGW
- WINFLAGS = -Wl,--no-undefined -Wl,--export-all-symbols
-endif
-
if USE_COVERAGE
AM_CFLAGS = --coverage -O0
XLIB = -lgcov
if USE_COVERAGE
AM_CFLAGS = --coverage -O0
XLIB = -lgcov
@@
-27,7
+23,6
@@
endif
libexec_PROGRAMS = \
gnunet-service-testbed \
gnunet-helper-testbed \
libexec_PROGRAMS = \
gnunet-service-testbed \
gnunet-helper-testbed \
- gnunet-service-testbed-logger \
gnunet-daemon-testbed-blacklist \
$(underlay_daemon) \
$(latency_logger)
gnunet-daemon-testbed-blacklist \
$(underlay_daemon) \
$(latency_logger)
@@
-53,21
+48,19
@@
gnunet_service_testbed_LDADD = $(XLIB) \
$(top_builddir)/src/core/libgnunetcore.la \
$(top_builddir)/src/hello/libgnunethello.la \
$(top_builddir)/src/transport/libgnunettransport.la \
$(top_builddir)/src/core/libgnunetcore.la \
$(top_builddir)/src/hello/libgnunethello.la \
$(top_builddir)/src/transport/libgnunettransport.la \
+ $(top_builddir)/src/ats/libgnunetats.la \
$(top_builddir)/src/testing/libgnunettesting.la \
libgnunettestbed.la \
$(top_builddir)/src/arm/libgnunetarm.la \
$(LTLIBINTL) $(Z_LIBS)
$(top_builddir)/src/testing/libgnunettesting.la \
libgnunettestbed.la \
$(top_builddir)/src/arm/libgnunetarm.la \
$(LTLIBINTL) $(Z_LIBS)
-gnunet_service_testbed_logger_SOURCES = \
- gnunet-service-testbed-logger.c
-gnunet_service_testbed_logger_LDADD = \
- $(top_builddir)/src/util/libgnunetutil.la
-
gnunet_testbed_profiler_SOURCES = \
gnunet-testbed-profiler.c
gnunet_testbed_profiler_LDADD = $(XLIB) \
$(top_builddir)/src/util/libgnunetutil.la \
libgnunettestbed.la
gnunet_testbed_profiler_SOURCES = \
gnunet-testbed-profiler.c
gnunet_testbed_profiler_LDADD = $(XLIB) \
$(top_builddir)/src/util/libgnunetutil.la \
libgnunettestbed.la
+gnunet_testbed_profiler_LDFLAGS = \
+ $(GN_LIBINTL)
gnunet_helper_testbed_SOURCES = \
gnunet-helper-testbed.c
gnunet_helper_testbed_SOURCES = \
gnunet-helper-testbed.c
@@
-96,8
+89,7
@@
gnunet_daemon_latency_logger_LDADD = $(XLIB) \
$(LTLIBINTL) -lsqlite3
lib_LTLIBRARIES = \
$(LTLIBINTL) -lsqlite3
lib_LTLIBRARIES = \
- libgnunettestbed.la \
- libgnunettestbedlogger.la
+ libgnunettestbed.la
libgnunettestbed_la_SOURCES = \
testbed_api.c testbed_api.h testbed.h \
libgnunettestbed_la_SOURCES = \
testbed_api.c testbed_api.h testbed.h \
@@
-110,13
+102,12
@@
libgnunettestbed_la_SOURCES = \
testbed_api_test.c \
testbed_api_topology.c testbed_api_topology.h \
testbed_api_sd.c testbed_api_sd.h \
testbed_api_test.c \
testbed_api_topology.c testbed_api_topology.h \
testbed_api_sd.c testbed_api_sd.h \
- testbed_api_barriers.c
testbed_api_barriers.h
+ testbed_api_barriers.c
libgnunettestbed_la_LIBADD = $(XLIB) \
libgnunettestbed_la_LIBADD = $(XLIB) \
- $(top_builddir)/src/core/libgnunetcore.la \
$(top_builddir)/src/statistics/libgnunetstatistics.la \
$(top_builddir)/src/transport/libgnunettransport.la \
$(top_builddir)/src/hello/libgnunethello.la \
$(top_builddir)/src/statistics/libgnunetstatistics.la \
$(top_builddir)/src/transport/libgnunettransport.la \
$(top_builddir)/src/hello/libgnunethello.la \
- -lm \
+ -lm
$(Z_LIBS)
\
$(top_builddir)/src/util/libgnunetutil.la \
$(top_builddir)/src/testing/libgnunettesting.la \
$(LTLIBINTL)
$(top_builddir)/src/util/libgnunetutil.la \
$(top_builddir)/src/testing/libgnunettesting.la \
$(LTLIBINTL)
@@
-124,15
+115,6
@@
libgnunettestbed_la_LDFLAGS = \
$(GN_LIB_LDFLAGS) \
-version-info 0:0:0
$(GN_LIB_LDFLAGS) \
-version-info 0:0:0
-libgnunettestbedlogger_la_SOURCES = \
- testbed_logger_api.c
-libgnunettestbedlogger_la_LIBADD = $(XLIB) \
- $(top_builddir)/src/util/libgnunetutil.la \
- $(LTLIBINTL)
-libgnunettestbedlogger_la_LDFLAGS = \
- $(GN_LIB_LDFLAGS) \
- -version-info 0:0:0
-
generate_underlay_topology_SOURCES = generate-underlay-topology.c
generate_underlay_topology_LDADD = $(XLIB) \
$(top_builddir)/src/util/libgnunetutil.la \
generate_underlay_topology_SOURCES = generate-underlay-topology.c
generate_underlay_topology_LDADD = $(XLIB) \
$(top_builddir)/src/util/libgnunetutil.la \
@@
-141,7
+123,6
@@
generate_underlay_topology_LDADD = $(XLIB) \
check_PROGRAMS = \
test_testbed_api_hosts \
check_PROGRAMS = \
test_testbed_api_hosts \
- test_testbed_logger_api \
test_gnunet_helper_testbed \
test_testbed_api_controllerlink \
test_testbed_api_2peers_1controller \
test_gnunet_helper_testbed \
test_testbed_api_controllerlink \
test_testbed_api_2peers_1controller \
@@
-158,6
+139,7
@@
check_PROGRAMS = \
test_testbed_api_topology_clique \
test_testbed_api_testbed_run_topologyrandom \
test_testbed_api_testbed_run_topologyline \
test_testbed_api_topology_clique \
test_testbed_api_testbed_run_topologyrandom \
test_testbed_api_testbed_run_topologyline \
+ test_testbed_api_testbed_run_topologystar \
test_testbed_api_testbed_run_topologyclique \
test_testbed_api_testbed_run_topologyring \
test_testbed_api_testbed_run_topologysmallworldring \
test_testbed_api_testbed_run_topologyclique \
test_testbed_api_testbed_run_topologyring \
test_testbed_api_testbed_run_topologysmallworldring \
@@
-172,10
+154,9
@@
check_PROGRAMS = \
$(underlay_testcases)
if ENABLE_TEST_RUN
$(underlay_testcases)
if ENABLE_TEST_RUN
- AM_TESTS_ENVIRONMENT=export GNUNET_PREFIX=$${GNUNET_PREFIX:-@libdir@};export PATH=$${GNUNET_PREFIX:-@prefix@}/bin:$$PATH;
+ AM_TESTS_ENVIRONMENT=export GNUNET_PREFIX=$${GNUNET_PREFIX:-@libdir@};export PATH=$${GNUNET_PREFIX:-@prefix@}/bin:$$PATH;
unset XDG_DATA_HOME;unset XDG_CONFIG_HOME;
TESTS = \
test_testbed_api \
TESTS = \
test_testbed_api \
- test_testbed_logger_api \
test_testbed_api_sd \
test_testbed_api_operations \
test_testbed_api_hosts \
test_testbed_api_sd \
test_testbed_api_operations \
test_testbed_api_hosts \
@@
-193,6
+174,7
@@
if ENABLE_TEST_RUN
test_testbed_api_topology_clique \
test_testbed_api_testbed_run_topologyrandom \
test_testbed_api_testbed_run_topologyline \
test_testbed_api_topology_clique \
test_testbed_api_testbed_run_topologyrandom \
test_testbed_api_testbed_run_topologyline \
+ test_testbed_api_testbed_run_topologystar \
test_testbed_api_testbed_run_topologyclique \
test_testbed_api_testbed_run_topologyring \
test_testbed_api_testbed_run_topology2dtorus \
test_testbed_api_testbed_run_topologyclique \
test_testbed_api_testbed_run_topologyring \
test_testbed_api_testbed_run_topology2dtorus \
@@
-218,13
+200,6
@@
test_testbed_api_LDADD = \
$(top_builddir)/src/arm/libgnunetarm.la \
libgnunettestbed.la
$(top_builddir)/src/arm/libgnunetarm.la \
libgnunettestbed.la
-test_testbed_logger_api_SOURCES = \
- test_testbed_logger_api.c
-test_testbed_logger_api_LDADD = \
- $(top_builddir)/src/util/libgnunetutil.la \
- $(top_builddir)/src/testing/libgnunettesting.la \
- libgnunettestbedlogger.la
-
test_testbed_api_sd_SOURCES = \
test_testbed_api_sd.c
test_testbed_api_sd_LDADD = \
test_testbed_api_sd_SOURCES = \
test_testbed_api_sd.c
test_testbed_api_sd_LDADD = \
@@
-306,6
+281,12
@@
test_testbed_api_testbed_run_topologyline_LDADD = \
$(top_builddir)/src/util/libgnunetutil.la \
libgnunettestbed.la
$(top_builddir)/src/util/libgnunetutil.la \
libgnunettestbed.la
+test_testbed_api_testbed_run_topologystar_SOURCES = \
+ test_testbed_api_testbed_run.c
+test_testbed_api_testbed_run_topologystar_LDADD = \
+ $(top_builddir)/src/util/libgnunetutil.la \
+ libgnunettestbed.la
+
test_testbed_api_testbed_run_topologyclique_SOURCES = \
test_testbed_api_testbed_run.c
test_testbed_api_testbed_run_topologyclique_LDADD = \
test_testbed_api_testbed_run_topologyclique_SOURCES = \
test_testbed_api_testbed_run.c
test_testbed_api_testbed_run_topologyclique_LDADD = \
@@
-397,8
+378,8
@@
EXTRA_DIST = \
test_testbed_api_statistics.conf \
test_testbed_api_test_timeout.conf \
test_testbed_api_template.conf \
test_testbed_api_statistics.conf \
test_testbed_api_test_timeout.conf \
test_testbed_api_template.conf \
- test_testbed_logger_api.conf \
test_testbed_api_testbed_run_topologyring.conf \
test_testbed_api_testbed_run_topologyring.conf \
+ test_testbed_api_testbed_run_topologystar.conf \
test_testbed_api_testbed_run_topologyclique.conf \
test_testbed_api_testbed_run_topologyline.conf \
test_testbed_api_testbed_run_topologyrandom.conf \
test_testbed_api_testbed_run_topologyclique.conf \
test_testbed_api_testbed_run_topologyline.conf \
test_testbed_api_testbed_run_topologyrandom.conf \