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 b5a7758f016dd5370138509618f48d2223a0b373..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
@@
-63,6
+59,8
@@
gnunet_testbed_profiler_SOURCES = \
gnunet_testbed_profiler_LDADD = $(XLIB) \
$(top_builddir)/src/util/libgnunetutil.la \
libgnunettestbed.la
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
@@
-104,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)
@@
-142,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 \
@@
-156,7
+154,7
@@
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 \
test_testbed_api_sd \
TESTS = \
test_testbed_api \
test_testbed_api_sd \
@@
-176,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 \
@@
-282,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 = \
@@
-374,6
+379,7
@@
EXTRA_DIST = \
test_testbed_api_test_timeout.conf \
test_testbed_api_template.conf \
test_testbed_api_testbed_run_topologyring.conf \
test_testbed_api_test_timeout.conf \
test_testbed_api_template.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 \