removing remenants of abstract unix domain socket handling, this finishes addressing...

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

diff --git a/src/testbed/Makefile.am b/src/testbed/Makefile.am
index 9fb3eb3c02660eb7b5a367b2829895ce9d34169b..f5d3647aebbfde50aabe3d1f018246406cac183c 100644 (file)
--- a/src/testbed/Makefile.am
+++ b/src/testbed/Makefile.am
@@ -1,4 +1,4 @@
-INCLUDES = -I$(top_srcdir)/src/include
+AM_CPPFLAGS = -I$(top_srcdir)/src/include
 
 if MINGW
   WINFLAGS = -Wl,--no-undefined -Wl,--export-all-symbols
@@ -24,21 +24,13 @@ pkgcfg_DATA = \
 libexec_PROGRAMS = \
   gnunet-service-testbed \
   gnunet-helper-testbed \
-  gnunet-service-testbed-logger
+  gnunet-service-testbed-logger \
+  gnunet-daemon-testbed-blacklist
 
 bin_PROGRAMS = \
   $(ll_binaries) \
   gnunet-testbed-profiler
 
-check_SCRIPTS = \
-  buildvars.py
-
-CLEANFILES = $(check_SCRIPTS) \
-  buildvars.pyc
-
-noinst_PROGRAMS = \
-  gnunet-service-test-barriers
-
 gnunet_service_testbed_SOURCES = \
   gnunet-service-testbed.h \
   gnunet-service-testbed.c \
@@ -50,7 +42,9 @@ gnunet_service_testbed_SOURCES = \
   gnunet-service-testbed_meminfo.c \
   gnunet-service-testbed_meminfo.h \
   gnunet-service-testbed_barriers.c \
-  gnunet-service-testbed_barriers.h
+  gnunet-service-testbed_barriers.h \
+  gnunet-service-testbed_connectionpool.c \
+  gnunet-service-testbed_connectionpool.h
 gnunet_service_testbed_LDADD = $(XLIB) \
  $(top_builddir)/src/util/libgnunetutil.la \
  $(top_builddir)/src/core/libgnunetcore.la \
@@ -67,6 +61,8 @@ gnunet_service_testbed_logger_SOURCES = \
   gnunet-service-testbed-logger.c
 gnunet_service_testbed_logger_LDADD = \
  $(top_builddir)/src/util/libgnunetutil.la
+gnunet_service_testbed_logger_DEPENDENCIES = \
+ $(top_builddir)/src/util/libgnunetutil.la
 
 gnunet_testbed_profiler_SOURCES = \
   gnunet-testbed-profiler.c
@@ -74,6 +70,7 @@ gnunet_testbed_profiler_LDADD = $(XLIB) \
  $(top_builddir)/src/util/libgnunetutil.la \
  $(top_builddir)/src/testbed/libgnunettestbed.la
 gnunet_testbed_profiler_DEPENDENCIES = \
+ $(top_builddir)/src/util/libgnunetutil.la \
  libgnunettestbed.la
 
 gnunet_helper_testbed_SOURCES = \
@@ -87,6 +84,15 @@ gnunet_helper_testbed_DEPENDENCIES = \
   gnunet-service-testbed.$(OBJEXT) \
   libgnunettestbed.la
 
+gnunet_daemon_testbed_blacklist_SOURCES = gnunet-daemon-testbed-blacklist.c
+gnunet_daemon_testbed_blacklist_LDADD = $(XLIB) \
+ $(top_builddir)/src/transport/libgnunettransport.la \
+ $(top_builddir)/src/util/libgnunetutil.la \
+ $(LTLIBINTL)
+gnunet_daemon_testbed_blacklist_DEPENDENCIES = \
+ $(top_builddir)/src/transport/libgnunettransport.la \
+ $(top_builddir)/src/util/libgnunetutil.la
+
 gnunet_testbed_mpi_spawn_SOURCES = gnunet_testbed_mpi_spawn.c
 gnunet_testbed_mpi_spawn_LDADD = $(XLIB) \
  $(top_builddir)/src/util/libgnunetutil.la \
@@ -161,6 +167,7 @@ check_PROGRAMS = \
   test_testbed_api_testbed_run_topologyscalefree \
   test_testbed_api_testbed_run_waitforever \
   test_testbed_api_statistics \
+  gnunet-service-test-barriers \
   test_testbed_api_barriers
 
 if ENABLE_TEST_RUN
@@ -191,7 +198,7 @@ if ENABLE_TEST_RUN
   test_testbed_api_testbed_run_topologysmallworldring \
   test_testbed_api_testbed_run_topologyfromfile \
   test_testbed_api_testbed_run_topologyscalefree \
-  test_testbed_api_barriers.py
+  test_testbed_api_barriers
 endif
 
 test_testbed_api_hosts_SOURCES = \
@@ -282,7 +289,7 @@ test_gnunet_helper_testbed_SOURCES = \
 test_gnunet_helper_testbed_LDADD = \
  $(top_builddir)/src/util/libgnunetutil.la \
  libgnunettestbed.la \
- $(Z_LIBZ)
+ $(Z_LIBS)
 
 test_testbed_api_testbed_run_topologyrandom_SOURCES = \
  test_testbed_api_testbed_run.c
@@ -368,11 +375,8 @@ test_testbed_api_barriers_SOURCES = \
 test_testbed_api_barriers_LDADD = \
  $(top_builddir)/src/util/libgnunetutil.la \
  libgnunettestbed.la
-
-do_subst = sed -e 's,[@]libexecdir[@],$(libexecdir),g' -e 's,[@]exec_prefix[@],$(exec_prefix),g'
-
-buildvars.py: buildvars.py.in Makefile
-       $(do_subst) < $(srcdir)/buildvars.py.in > $@
+test_testbed_api_barriers_DEPENDENCIES = \
+ gnunet-service-test-barriers
 
 gnunet_service_test_barriers_SOURCES = \
   gnunet-service-test-barriers.c \
@@ -393,8 +397,7 @@ EXTRA_DIST = \
   test_testbed_api_testbed_run_topologysmallworld.conf \
   test_testbed_api_testbed_run_topologyfromfile.conf \
   test_testbed_api_testbed_run_topologyscalefree.conf \
+  test_testbed_api_barriers.conf.in \
   overlay_topology.txt \
   sample_hosts.txt \
-  sample.job \
-  buildvars.py.in \
-  test_testbed_api_barriers.py
+  sample.job