- verboser log, faster start

[oweals/gnunet.git] / src / testbed / Makefile.am

diff --git a/src/testbed/Makefile.am b/src/testbed/Makefile.am
index d8cc9a207769e9c49c7ae64b9cf6c8a0e502d95f..26b576deb6aa32dd179cdae837156211567fce65 100644 (file)
--- a/src/testbed/Makefile.am
+++ b/src/testbed/Makefile.am
@@ -10,9 +10,12 @@ if USE_COVERAGE
 endif
 
 if WITH_LL
-  ll_binaries = \
+  CC = mpcc
+  ll_noinst_binaries = \
     ll-master \
-    ll-monitor
+    ll-monitor 
+  ll_binaries = \
+    gnunet-mpi-test
 endif
 
 libexecdir= $(pkglibdir)/libexec/
@@ -26,12 +29,18 @@ libexec_PROGRAMS = \
   gnunet-service-testbed \
   gnunet-helper-testbed
 
+bin_PROGRAMS = \
+  $(ll_binaries)
+
 noinst_PROGRAMS = \
   gnunet-testbed-profiler \
-  $(ll_binaries)
+  $(ll_noinst_binaries)
 
 gnunet_service_testbed_SOURCES = \
-  gnunet-service-testbed.c
+  gnunet-service-testbed.c \
+  gnunet-service-testbed.h \
+  gnunet-service-testbed_cache.c \
+  gnunet-service-testbed_oc.c
 gnunet_service_testbed_LDADD = $(XLIB) \
  $(top_builddir)/src/util/libgnunetutil.la \
  $(top_builddir)/src/core/libgnunetcore.la \
@@ -71,6 +80,10 @@ ll_monitor_SOURCES = \
 ll_monitor_LDADD = $(XLIB) \
  $(LTLIBINTL) -lz -lllapi
 
+gnunet_mpi_test_SOURCES = gnunet_mpi_test.c
+gnunet_mpi_test_LDADD = \
+ $(top_builddir)/src/util/libgnunetutil.la
+
 lib_LTLIBRARIES = \
   libgnunettestbed.la
 
@@ -83,7 +96,8 @@ libgnunettestbed_la_SOURCES = \
   testbed_api_statistics.c \
   testbed_api_testbed.c \
   testbed_api_test.c \
-  testbed_api_topology.c testbed_api_topology.h
+  testbed_api_topology.c testbed_api_topology.h \
+  testbed_api_sd.c testbed_api_sd.h
 libgnunettestbed_la_LIBADD = $(XLIB) \
  $(top_builddir)/src/core/libgnunetcore.la \
  $(top_builddir)/src/statistics/libgnunetstatistics.la \
@@ -103,6 +117,7 @@ check_PROGRAMS = \
   test_testbed_api_2peers_1controller \
   test_testbed_api_3peers_3controllers \
   test_testbed_api \
+  test_testbed_api_sd \
   test_testbed_api_operations \
   test_testbed_api_testbed_run \
   test_testbed_api_test \
@@ -122,6 +137,7 @@ check_PROGRAMS = \
 if ENABLE_TEST_RUN
  TESTS = \
   test_testbed_api \
+  test_testbed_api_sd \
   test_testbed_api_hosts \
   test_testbed_api_2peers_1controller \
   test_testbed_api_3peers_3controllers \
@@ -157,6 +173,12 @@ test_testbed_api_LDADD = \
  $(top_builddir)/src/dht/libgnunetdht.la \
  libgnunettestbed.la
 
+test_testbed_api_sd_SOURCES = \
+ test_testbed_api_sd.c
+test_testbed_api_sd_LDADD = \
+ $(top_builddir)/src/util/libgnunetutil.la \
+ libgnunettestbed.la
+
 test_testbed_api_2peers_1controller_SOURCES = \
  test_testbed_api_2peers_1controller.c
 test_testbed_api_2peers_1controller_LDADD = \