aboutsummaryrefslogtreecommitdiff
path: root/src/testing/Makefile.in
diff options
context:
space:
mode:
Diffstat (limited to 'src/testing/Makefile.in')
-rw-r--r--src/testing/Makefile.in850
1 files changed, 180 insertions, 670 deletions
diff --git a/src/testing/Makefile.in b/src/testing/Makefile.in
index 459066f..66ee17c 100644
--- a/src/testing/Makefile.in
+++ b/src/testing/Makefile.in
@@ -1,9 +1,9 @@
-# Makefile.in generated by automake 1.11.1 from Makefile.am.
+# Makefile.in generated by automake 1.11.6 from Makefile.am.
# @configure_input@
# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-# 2003, 2004, 2005, 2006, 2007, 2008, 2009 Free Software Foundation,
-# Inc.
+# 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 Free Software
+# Foundation, Inc.
# This Makefile.in is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
# with or without modifications, as long as this notice is preserved.
@@ -18,6 +18,23 @@
VPATH = @srcdir@
+am__make_dryrun = \
+ { \
+ am__dry=no; \
+ case $$MAKEFLAGS in \
+ *\\[\ \ ]*) \
+ echo 'am--echo: ; @echo "AM" OK' | $(MAKE) -f - 2>/dev/null \
+ | grep '^AM OK$$' >/dev/null || am__dry=yes;; \
+ *) \
+ for am__flg in $$MAKEFLAGS; do \
+ case $$am__flg in \
+ *=*|--*) ;; \
+ *n*) am__dry=yes; break;; \
+ esac; \
+ done;; \
+ esac; \
+ test $$am__dry = yes; \
+ }
pkgdatadir = $(datadir)/@PACKAGE@
pkgincludedir = $(includedir)/@PACKAGE@
pkglibdir = $(libdir)/@PACKAGE@
@@ -37,53 +54,29 @@ POST_UNINSTALL = :
build_triplet = @build@
host_triplet = @host@
target_triplet = @target@
-bin_PROGRAMS = gnunet-testing$(EXEEXT)
-check_PROGRAMS = test_testing$(EXEEXT) test_testing_connect$(EXEEXT) \
- test_testing_reconnect$(EXEEXT) test_testing_group$(EXEEXT) \
- test_testing_peergroup$(EXEEXT) \
- test_testing_topology_stability$(EXEEXT) \
- test_testing_topology_clique$(EXEEXT) \
- test_testing_topology_clique_random$(EXEEXT) \
- test_testing_topology_clique_minimum$(EXEEXT) \
- test_testing_topology_clique_dfs$(EXEEXT) \
- test_testing_topology_churn$(EXEEXT) \
- test_testing_topology_line$(EXEEXT) \
- test_testing_topology_blacklist$(EXEEXT) \
- test_testing_group_remote$(EXEEXT) \
- test_testing_2dtorus$(EXEEXT) \
- test_testing_topology_ring$(EXEEXT) \
- test_testing_topology_2d_torus$(EXEEXT) \
- test_testing_topology_small_world_ring$(EXEEXT) \
- test_testing_topology_small_world_torus$(EXEEXT) \
- test_testing_topology_erdos_renyi$(EXEEXT) \
- test_testing_topology_internat$(EXEEXT) \
- test_testing_topology_none$(EXEEXT) \
- test_testing_topology_scale_free$(EXEEXT) \
- test_testing_new_portreservation$(EXEEXT) \
- test_testing_new_peerstartup$(EXEEXT) \
- test_testing_new_servicestartup$(EXEEXT)
-@ENABLE_TEST_RUN_TRUE@TESTS = test_testing$(EXEEXT) \
-@ENABLE_TEST_RUN_TRUE@ test_testing_connect$(EXEEXT) \
-@ENABLE_TEST_RUN_TRUE@ test_testing_reconnect$(EXEEXT) \
-@ENABLE_TEST_RUN_TRUE@ test_testing_group$(EXEEXT) \
-@ENABLE_TEST_RUN_TRUE@ test_testing_peergroup$(EXEEXT) \
-@ENABLE_TEST_RUN_TRUE@ test_testing_new_portreservation$(EXEEXT) \
-@ENABLE_TEST_RUN_TRUE@ test_testing_new_peerstartup$(EXEEXT) \
-@ENABLE_TEST_RUN_TRUE@ test_testing_new_servicestartup$(EXEEXT)
+bin_PROGRAMS = gnunet-testing-run-service$(EXEEXT) \
+ gnunet-testing$(EXEEXT)
+check_PROGRAMS = test_testing_portreservation$(EXEEXT) \
+ test_testing_peerstartup$(EXEEXT) \
+ test_testing_servicestartup$(EXEEXT)
+@ENABLE_TEST_RUN_TRUE@TESTS = test_testing_portreservation$(EXEEXT) \
+@ENABLE_TEST_RUN_TRUE@ test_testing_peerstartup$(EXEEXT) \
+@ENABLE_TEST_RUN_TRUE@ test_testing_servicestartup$(EXEEXT)
subdir = src/testing
DIST_COMMON = $(dist_pkgcfg_DATA) $(srcdir)/Makefile.am \
$(srcdir)/Makefile.in
ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
am__aclocal_m4_deps = $(top_srcdir)/m4/absolute-header.m4 \
$(top_srcdir)/m4/align.m4 $(top_srcdir)/m4/argz.m4 \
- $(top_srcdir)/m4/gettext.m4 $(top_srcdir)/m4/iconv.m4 \
- $(top_srcdir)/m4/lib-ld.m4 $(top_srcdir)/m4/lib-link.m4 \
- $(top_srcdir)/m4/lib-prefix.m4 $(top_srcdir)/m4/libcurl.m4 \
- $(top_srcdir)/m4/libgcrypt.m4 $(top_srcdir)/m4/libtool.m4 \
- $(top_srcdir)/m4/libunistring.m4 $(top_srcdir)/m4/ltdl.m4 \
- $(top_srcdir)/m4/ltoptions.m4 $(top_srcdir)/m4/ltsugar.m4 \
- $(top_srcdir)/m4/ltversion.m4 $(top_srcdir)/m4/lt~obsolete.m4 \
- $(top_srcdir)/m4/nls.m4 $(top_srcdir)/m4/po.m4 \
+ $(top_srcdir)/m4/gettext.m4 $(top_srcdir)/m4/glib-2.0.m4 \
+ $(top_srcdir)/m4/iconv.m4 $(top_srcdir)/m4/lib-ld.m4 \
+ $(top_srcdir)/m4/lib-link.m4 $(top_srcdir)/m4/lib-prefix.m4 \
+ $(top_srcdir)/m4/libcurl.m4 $(top_srcdir)/m4/libgcrypt.m4 \
+ $(top_srcdir)/m4/libtool.m4 $(top_srcdir)/m4/libunistring.m4 \
+ $(top_srcdir)/m4/ltdl.m4 $(top_srcdir)/m4/ltoptions.m4 \
+ $(top_srcdir)/m4/ltsugar.m4 $(top_srcdir)/m4/ltversion.m4 \
+ $(top_srcdir)/m4/lt~obsolete.m4 $(top_srcdir)/m4/nls.m4 \
+ $(top_srcdir)/m4/pkg.m4 $(top_srcdir)/m4/po.m4 \
$(top_srcdir)/m4/progtest.m4 $(top_srcdir)/acinclude.m4 \
$(top_srcdir)/configure.ac
am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
@@ -113,221 +106,55 @@ am__nobase_list = $(am__nobase_strip_setup); \
am__base_list = \
sed '$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;s/\n/ /g' | \
sed '$$!N;$$!N;$$!N;$$!N;s/\n/ /g'
+am__uninstall_files_from_dir = { \
+ test -z "$$files" \
+ || { test ! -d "$$dir" && test ! -f "$$dir" && test ! -r "$$dir"; } \
+ || { echo " ( cd '$$dir' && rm -f" $$files ")"; \
+ $(am__cd) "$$dir" && rm -f $$files; }; \
+ }
am__installdirs = "$(DESTDIR)$(libdir)" "$(DESTDIR)$(bindir)" \
"$(DESTDIR)$(pkgcfgdir)"
LTLIBRARIES = $(lib_LTLIBRARIES)
am__DEPENDENCIES_1 =
-libgnunettesting_la_DEPENDENCIES = $(am__DEPENDENCIES_1) \
- $(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/util/libgnunetutil.la
-am_libgnunettesting_la_OBJECTS = helper.lo testing.lo testing_group.lo \
- testing_peergroup.lo
+libgnunettesting_la_DEPENDENCIES = \
+ $(top_builddir)/src/util/libgnunetutil.la \
+ $(am__DEPENDENCIES_1)
+am_libgnunettesting_la_OBJECTS = testing.lo
libgnunettesting_la_OBJECTS = $(am_libgnunettesting_la_OBJECTS)
-AM_V_lt = $(am__v_lt_$(V))
-am__v_lt_ = $(am__v_lt_$(AM_DEFAULT_VERBOSITY))
+AM_V_lt = $(am__v_lt_@AM_V@)
+am__v_lt_ = $(am__v_lt_@AM_DEFAULT_V@)
am__v_lt_0 = --silent
libgnunettesting_la_LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC \
$(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=link $(CCLD) \
$(AM_CFLAGS) $(CFLAGS) $(libgnunettesting_la_LDFLAGS) \
$(LDFLAGS) -o $@
-libgnunettesting_new_la_DEPENDENCIES = \
- $(top_builddir)/src/util/libgnunetutil.la
-am_libgnunettesting_new_la_OBJECTS = testing_new.lo
-libgnunettesting_new_la_OBJECTS = \
- $(am_libgnunettesting_new_la_OBJECTS)
-libgnunettesting_new_la_LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC \
- $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=link $(CCLD) \
- $(AM_CFLAGS) $(CFLAGS) $(libgnunettesting_new_la_LDFLAGS) \
- $(LDFLAGS) -o $@
PROGRAMS = $(bin_PROGRAMS)
am_gnunet_testing_OBJECTS = gnunet-testing.$(OBJEXT)
gnunet_testing_OBJECTS = $(am_gnunet_testing_OBJECTS)
-am_test_testing_OBJECTS = test_testing.$(OBJEXT)
-test_testing_OBJECTS = $(am_test_testing_OBJECTS)
-test_testing_DEPENDENCIES = \
- $(top_builddir)/src/testing/libgnunettesting.la \
- $(top_builddir)/src/util/libgnunetutil.la
-am_test_testing_2dtorus_OBJECTS = test_testing_2dtorus.$(OBJEXT)
-test_testing_2dtorus_OBJECTS = $(am_test_testing_2dtorus_OBJECTS)
-test_testing_2dtorus_DEPENDENCIES = \
- $(top_builddir)/src/testing/libgnunettesting.la \
- $(top_builddir)/src/util/libgnunetutil.la
-am_test_testing_connect_OBJECTS = test_testing_connect.$(OBJEXT)
-test_testing_connect_OBJECTS = $(am_test_testing_connect_OBJECTS)
-test_testing_connect_DEPENDENCIES = \
- $(top_builddir)/src/testing/libgnunettesting.la \
- $(top_builddir)/src/util/libgnunetutil.la
-am_test_testing_group_OBJECTS = test_testing_group.$(OBJEXT)
-test_testing_group_OBJECTS = $(am_test_testing_group_OBJECTS)
-test_testing_group_DEPENDENCIES = \
- $(top_builddir)/src/testing/libgnunettesting.la \
- $(top_builddir)/src/util/libgnunetutil.la
-am_test_testing_group_remote_OBJECTS = \
- test_testing_group_remote.$(OBJEXT)
-test_testing_group_remote_OBJECTS = \
- $(am_test_testing_group_remote_OBJECTS)
-test_testing_group_remote_DEPENDENCIES = \
- $(top_builddir)/src/testing/libgnunettesting.la \
- $(top_builddir)/src/util/libgnunetutil.la
-am_test_testing_new_peerstartup_OBJECTS = \
- test_testing_new_peerstartup.$(OBJEXT)
-test_testing_new_peerstartup_OBJECTS = \
- $(am_test_testing_new_peerstartup_OBJECTS)
-test_testing_new_peerstartup_DEPENDENCIES = \
- $(top_builddir)/src/testing/libgnunettesting_new.la \
- $(top_builddir)/src/util/libgnunetutil.la
-am_test_testing_new_portreservation_OBJECTS = \
- test_testing_new_portreservation.$(OBJEXT)
-test_testing_new_portreservation_OBJECTS = \
- $(am_test_testing_new_portreservation_OBJECTS)
-test_testing_new_portreservation_DEPENDENCIES = \
- $(top_builddir)/src/testing/libgnunettesting_new.la \
- $(top_builddir)/src/util/libgnunetutil.la
-am_test_testing_new_servicestartup_OBJECTS = \
- test_testing_new_servicestartup.$(OBJEXT)
-test_testing_new_servicestartup_OBJECTS = \
- $(am_test_testing_new_servicestartup_OBJECTS)
-test_testing_new_servicestartup_DEPENDENCIES = \
- $(top_builddir)/src/testing/libgnunettesting_new.la \
- $(top_builddir)/src/util/libgnunetutil.la
-am_test_testing_peergroup_OBJECTS = test_testing_peergroup.$(OBJEXT)
-test_testing_peergroup_OBJECTS = $(am_test_testing_peergroup_OBJECTS)
-test_testing_peergroup_DEPENDENCIES = \
- $(top_builddir)/src/testing/libgnunettesting.la \
- $(top_builddir)/src/util/libgnunetutil.la
-am_test_testing_reconnect_OBJECTS = test_testing_reconnect.$(OBJEXT)
-test_testing_reconnect_OBJECTS = $(am_test_testing_reconnect_OBJECTS)
-test_testing_reconnect_DEPENDENCIES = \
- $(top_builddir)/src/testing/libgnunettesting.la \
- $(top_builddir)/src/util/libgnunetutil.la
-am_test_testing_topology_2d_torus_OBJECTS = \
- test_testing_topology.$(OBJEXT)
-test_testing_topology_2d_torus_OBJECTS = \
- $(am_test_testing_topology_2d_torus_OBJECTS)
-test_testing_topology_2d_torus_DEPENDENCIES = \
- $(top_builddir)/src/testing/libgnunettesting.la \
- $(top_builddir)/src/core/libgnunetcore.la \
- $(top_builddir)/src/util/libgnunetutil.la
-am_test_testing_topology_blacklist_OBJECTS = \
- test_testing_topology_blacklist.$(OBJEXT)
-test_testing_topology_blacklist_OBJECTS = \
- $(am_test_testing_topology_blacklist_OBJECTS)
-test_testing_topology_blacklist_DEPENDENCIES = \
- $(top_builddir)/src/testing/libgnunettesting.la \
- $(top_builddir)/src/util/libgnunetutil.la
-am_test_testing_topology_churn_OBJECTS = \
- test_testing_topology_churn.$(OBJEXT)
-test_testing_topology_churn_OBJECTS = \
- $(am_test_testing_topology_churn_OBJECTS)
-test_testing_topology_churn_DEPENDENCIES = \
- $(top_builddir)/src/testing/libgnunettesting.la \
- $(top_builddir)/src/util/libgnunetutil.la
-am_test_testing_topology_clique_OBJECTS = \
- test_testing_topology.$(OBJEXT)
-test_testing_topology_clique_OBJECTS = \
- $(am_test_testing_topology_clique_OBJECTS)
-test_testing_topology_clique_DEPENDENCIES = \
- $(top_builddir)/src/testing/libgnunettesting.la \
- $(top_builddir)/src/core/libgnunetcore.la \
- $(top_builddir)/src/util/libgnunetutil.la
-am_test_testing_topology_clique_dfs_OBJECTS = \
- test_testing_topology.$(OBJEXT)
-test_testing_topology_clique_dfs_OBJECTS = \
- $(am_test_testing_topology_clique_dfs_OBJECTS)
-test_testing_topology_clique_dfs_DEPENDENCIES = \
- $(top_builddir)/src/testing/libgnunettesting.la \
- $(top_builddir)/src/core/libgnunetcore.la \
- $(top_builddir)/src/util/libgnunetutil.la
-am_test_testing_topology_clique_minimum_OBJECTS = \
- test_testing_topology.$(OBJEXT)
-test_testing_topology_clique_minimum_OBJECTS = \
- $(am_test_testing_topology_clique_minimum_OBJECTS)
-test_testing_topology_clique_minimum_DEPENDENCIES = \
- $(top_builddir)/src/testing/libgnunettesting.la \
- $(top_builddir)/src/core/libgnunetcore.la \
- $(top_builddir)/src/util/libgnunetutil.la
-am_test_testing_topology_clique_random_OBJECTS = \
- test_testing_topology.$(OBJEXT)
-test_testing_topology_clique_random_OBJECTS = \
- $(am_test_testing_topology_clique_random_OBJECTS)
-test_testing_topology_clique_random_DEPENDENCIES = \
+am_gnunet_testing_run_service_OBJECTS = \
+ gnunet-testing-run-service.$(OBJEXT)
+gnunet_testing_run_service_OBJECTS = \
+ $(am_gnunet_testing_run_service_OBJECTS)
+am_test_testing_peerstartup_OBJECTS = \
+ test_testing_peerstartup.$(OBJEXT)
+test_testing_peerstartup_OBJECTS = \
+ $(am_test_testing_peerstartup_OBJECTS)
+test_testing_peerstartup_DEPENDENCIES = \
$(top_builddir)/src/testing/libgnunettesting.la \
- $(top_builddir)/src/core/libgnunetcore.la \
$(top_builddir)/src/util/libgnunetutil.la
-am_test_testing_topology_erdos_renyi_OBJECTS = \
- test_testing_topology.$(OBJEXT)
-test_testing_topology_erdos_renyi_OBJECTS = \
- $(am_test_testing_topology_erdos_renyi_OBJECTS)
-test_testing_topology_erdos_renyi_DEPENDENCIES = \
+am_test_testing_portreservation_OBJECTS = \
+ test_testing_portreservation.$(OBJEXT)
+test_testing_portreservation_OBJECTS = \
+ $(am_test_testing_portreservation_OBJECTS)
+test_testing_portreservation_DEPENDENCIES = \
$(top_builddir)/src/testing/libgnunettesting.la \
- $(top_builddir)/src/core/libgnunetcore.la \
$(top_builddir)/src/util/libgnunetutil.la
-am_test_testing_topology_internat_OBJECTS = \
- test_testing_topology.$(OBJEXT)
-test_testing_topology_internat_OBJECTS = \
- $(am_test_testing_topology_internat_OBJECTS)
-test_testing_topology_internat_DEPENDENCIES = \
+am_test_testing_servicestartup_OBJECTS = \
+ test_testing_servicestartup.$(OBJEXT)
+test_testing_servicestartup_OBJECTS = \
+ $(am_test_testing_servicestartup_OBJECTS)
+test_testing_servicestartup_DEPENDENCIES = \
$(top_builddir)/src/testing/libgnunettesting.la \
- $(top_builddir)/src/core/libgnunetcore.la \
- $(top_builddir)/src/util/libgnunetutil.la
-am_test_testing_topology_line_OBJECTS = \
- test_testing_topology.$(OBJEXT)
-test_testing_topology_line_OBJECTS = \
- $(am_test_testing_topology_line_OBJECTS)
-test_testing_topology_line_DEPENDENCIES = \
- $(top_builddir)/src/testing/libgnunettesting.la \
- $(top_builddir)/src/core/libgnunetcore.la \
- $(top_builddir)/src/util/libgnunetutil.la
-am_test_testing_topology_none_OBJECTS = \
- test_testing_topology.$(OBJEXT)
-test_testing_topology_none_OBJECTS = \
- $(am_test_testing_topology_none_OBJECTS)
-test_testing_topology_none_DEPENDENCIES = \
- $(top_builddir)/src/testing/libgnunettesting.la \
- $(top_builddir)/src/core/libgnunetcore.la \
- $(top_builddir)/src/util/libgnunetutil.la
-am_test_testing_topology_ring_OBJECTS = \
- test_testing_topology.$(OBJEXT)
-test_testing_topology_ring_OBJECTS = \
- $(am_test_testing_topology_ring_OBJECTS)
-test_testing_topology_ring_DEPENDENCIES = \
- $(top_builddir)/src/testing/libgnunettesting.la \
- $(top_builddir)/src/core/libgnunetcore.la \
- $(top_builddir)/src/util/libgnunetutil.la
-am_test_testing_topology_scale_free_OBJECTS = \
- test_testing_topology.$(OBJEXT)
-test_testing_topology_scale_free_OBJECTS = \
- $(am_test_testing_topology_scale_free_OBJECTS)
-test_testing_topology_scale_free_DEPENDENCIES = \
- $(top_builddir)/src/testing/libgnunettesting.la \
- $(top_builddir)/src/core/libgnunetcore.la \
- $(top_builddir)/src/util/libgnunetutil.la
-am_test_testing_topology_small_world_ring_OBJECTS = \
- test_testing_topology.$(OBJEXT)
-test_testing_topology_small_world_ring_OBJECTS = \
- $(am_test_testing_topology_small_world_ring_OBJECTS)
-test_testing_topology_small_world_ring_DEPENDENCIES = \
- $(top_builddir)/src/testing/libgnunettesting.la \
- $(top_builddir)/src/core/libgnunetcore.la \
- $(top_builddir)/src/util/libgnunetutil.la
-am_test_testing_topology_small_world_torus_OBJECTS = \
- test_testing_topology.$(OBJEXT)
-test_testing_topology_small_world_torus_OBJECTS = \
- $(am_test_testing_topology_small_world_torus_OBJECTS)
-test_testing_topology_small_world_torus_DEPENDENCIES = \
- $(top_builddir)/src/testing/libgnunettesting.la \
- $(top_builddir)/src/core/libgnunetcore.la \
- $(top_builddir)/src/util/libgnunetutil.la
-am_test_testing_topology_stability_OBJECTS = \
- test_testing_topology.$(OBJEXT)
-test_testing_topology_stability_OBJECTS = \
- $(am_test_testing_topology_stability_OBJECTS)
-test_testing_topology_stability_DEPENDENCIES = \
- $(top_builddir)/src/testing/libgnunettesting.la \
- $(top_builddir)/src/core/libgnunetcore.la \
$(top_builddir)/src/util/libgnunetutil.la
DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir)
depcomp = $(SHELL) $(top_srcdir)/depcomp
@@ -339,74 +166,38 @@ LTCOMPILE = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \
$(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) \
$(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
$(AM_CFLAGS) $(CFLAGS)
-AM_V_CC = $(am__v_CC_$(V))
-am__v_CC_ = $(am__v_CC_$(AM_DEFAULT_VERBOSITY))
+AM_V_CC = $(am__v_CC_@AM_V@)
+am__v_CC_ = $(am__v_CC_@AM_DEFAULT_V@)
am__v_CC_0 = @echo " CC " $@;
-AM_V_at = $(am__v_at_$(V))
-am__v_at_ = $(am__v_at_$(AM_DEFAULT_VERBOSITY))
+AM_V_at = $(am__v_at_@AM_V@)
+am__v_at_ = $(am__v_at_@AM_DEFAULT_V@)
am__v_at_0 = @
CCLD = $(CC)
LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \
$(LIBTOOLFLAGS) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \
$(AM_LDFLAGS) $(LDFLAGS) -o $@
-AM_V_CCLD = $(am__v_CCLD_$(V))
-am__v_CCLD_ = $(am__v_CCLD_$(AM_DEFAULT_VERBOSITY))
+AM_V_CCLD = $(am__v_CCLD_@AM_V@)
+am__v_CCLD_ = $(am__v_CCLD_@AM_DEFAULT_V@)
am__v_CCLD_0 = @echo " CCLD " $@;
-AM_V_GEN = $(am__v_GEN_$(V))
-am__v_GEN_ = $(am__v_GEN_$(AM_DEFAULT_VERBOSITY))
+AM_V_GEN = $(am__v_GEN_@AM_V@)
+am__v_GEN_ = $(am__v_GEN_@AM_DEFAULT_V@)
am__v_GEN_0 = @echo " GEN " $@;
-SOURCES = $(libgnunettesting_la_SOURCES) \
- $(libgnunettesting_new_la_SOURCES) $(gnunet_testing_SOURCES) \
- $(test_testing_SOURCES) $(test_testing_2dtorus_SOURCES) \
- $(test_testing_connect_SOURCES) $(test_testing_group_SOURCES) \
- $(test_testing_group_remote_SOURCES) \
- $(test_testing_new_peerstartup_SOURCES) \
- $(test_testing_new_portreservation_SOURCES) \
- $(test_testing_new_servicestartup_SOURCES) \
- $(test_testing_peergroup_SOURCES) \
- $(test_testing_reconnect_SOURCES) \
- $(test_testing_topology_2d_torus_SOURCES) \
- $(test_testing_topology_blacklist_SOURCES) \
- $(test_testing_topology_churn_SOURCES) \
- $(test_testing_topology_clique_SOURCES) \
- $(test_testing_topology_clique_dfs_SOURCES) \
- $(test_testing_topology_clique_minimum_SOURCES) \
- $(test_testing_topology_clique_random_SOURCES) \
- $(test_testing_topology_erdos_renyi_SOURCES) \
- $(test_testing_topology_internat_SOURCES) \
- $(test_testing_topology_line_SOURCES) \
- $(test_testing_topology_none_SOURCES) \
- $(test_testing_topology_ring_SOURCES) \
- $(test_testing_topology_scale_free_SOURCES) \
- $(test_testing_topology_small_world_ring_SOURCES) \
- $(test_testing_topology_small_world_torus_SOURCES) \
- $(test_testing_topology_stability_SOURCES)
+SOURCES = $(libgnunettesting_la_SOURCES) $(gnunet_testing_SOURCES) \
+ $(gnunet_testing_run_service_SOURCES) \
+ $(test_testing_peerstartup_SOURCES) \
+ $(test_testing_portreservation_SOURCES) \
+ $(test_testing_servicestartup_SOURCES)
DIST_SOURCES = $(libgnunettesting_la_SOURCES) \
- $(libgnunettesting_new_la_SOURCES) $(gnunet_testing_SOURCES) \
- $(test_testing_SOURCES) $(test_testing_2dtorus_SOURCES) \
- $(test_testing_connect_SOURCES) $(test_testing_group_SOURCES) \
- $(test_testing_group_remote_SOURCES) \
- $(test_testing_new_peerstartup_SOURCES) \
- $(test_testing_new_portreservation_SOURCES) \
- $(test_testing_new_servicestartup_SOURCES) \
- $(test_testing_peergroup_SOURCES) \
- $(test_testing_reconnect_SOURCES) \
- $(test_testing_topology_2d_torus_SOURCES) \
- $(test_testing_topology_blacklist_SOURCES) \
- $(test_testing_topology_churn_SOURCES) \
- $(test_testing_topology_clique_SOURCES) \
- $(test_testing_topology_clique_dfs_SOURCES) \
- $(test_testing_topology_clique_minimum_SOURCES) \
- $(test_testing_topology_clique_random_SOURCES) \
- $(test_testing_topology_erdos_renyi_SOURCES) \
- $(test_testing_topology_internat_SOURCES) \
- $(test_testing_topology_line_SOURCES) \
- $(test_testing_topology_none_SOURCES) \
- $(test_testing_topology_ring_SOURCES) \
- $(test_testing_topology_scale_free_SOURCES) \
- $(test_testing_topology_small_world_ring_SOURCES) \
- $(test_testing_topology_small_world_torus_SOURCES) \
- $(test_testing_topology_stability_SOURCES)
+ $(gnunet_testing_SOURCES) \
+ $(gnunet_testing_run_service_SOURCES) \
+ $(test_testing_peerstartup_SOURCES) \
+ $(test_testing_portreservation_SOURCES) \
+ $(test_testing_servicestartup_SOURCES)
+am__can_run_installinfo = \
+ case $$AM_UPDATE_INFO_DIR in \
+ n|no|NO) false;; \
+ *) (install-info --version) >/dev/null 2>&1;; \
+ esac
DATA = $(dist_pkgcfg_DATA)
ETAGS = etags
CTAGS = ctags
@@ -448,6 +239,10 @@ EXEEXT = @EXEEXT@
EXT_LIBS = @EXT_LIBS@
EXT_LIB_PATH = @EXT_LIB_PATH@
FGREP = @FGREP@
+GLIB_CFLAGS = @GLIB_CFLAGS@
+GLIB_GENMARSHAL = @GLIB_GENMARSHAL@
+GLIB_LIBS = @GLIB_LIBS@
+GLIB_MKENUMS = @GLIB_MKENUMS@
GMSGFMT = @GMSGFMT@
GMSGFMT_015 = @GMSGFMT_015@
GNUNETDNS_GROUP = @GNUNETDNS_GROUP@
@@ -458,6 +253,7 @@ GN_LIBINTL = @GN_LIBINTL@
GN_LIB_LDFLAGS = @GN_LIB_LDFLAGS@
GN_PLUGIN_LDFLAGS = @GN_PLUGIN_LDFLAGS@
GN_USER_HOME_DIR = @GN_USER_HOME_DIR@
+GOBJECT_QUERY = @GOBJECT_QUERY@
GREP = @GREP@
HAVE_LIBUNISTRING = @HAVE_LIBUNISTRING@
INCLTDL = @INCLTDL@
@@ -480,6 +276,8 @@ LIBCURL_CPPFLAGS = @LIBCURL_CPPFLAGS@
LIBGCRYPT_CFLAGS = @LIBGCRYPT_CFLAGS@
LIBGCRYPT_CONFIG = @LIBGCRYPT_CONFIG@
LIBGCRYPT_LIBS = @LIBGCRYPT_LIBS@
+LIBGTOP_CFLAGS = @LIBGTOP_CFLAGS@
+LIBGTOP_LIBS = @LIBGTOP_LIBS@
LIBICONV = @LIBICONV@
LIBINTL = @LIBINTL@
LIBLTDL = @LIBLTDL@
@@ -501,6 +299,7 @@ LT_CONFIG_H = @LT_CONFIG_H@
LT_DLLOADERS = @LT_DLLOADERS@
LT_DLPREOPEN = @LT_DLPREOPEN@
MAKEINFO = @MAKEINFO@
+MANIFEST_TOOL = @MANIFEST_TOOL@
MKDIR_P = @MKDIR_P@
MONKEYPREFIX = @MONKEYPREFIX@
MSGFMT = @MSGFMT@
@@ -510,6 +309,7 @@ MYSQL_CPPFLAGS = @MYSQL_CPPFLAGS@
MYSQL_LDFLAGS = @MYSQL_LDFLAGS@
NM = @NM@
NMEDIT = @NMEDIT@
+NSS_DIR = @NSS_DIR@
OBJC = @OBJC@
OBJCDEPMODE = @OBJCDEPMODE@
OBJCFLAGS = @OBJCFLAGS@
@@ -525,6 +325,7 @@ PACKAGE_TARNAME = @PACKAGE_TARNAME@
PACKAGE_URL = @PACKAGE_URL@
PACKAGE_VERSION = @PACKAGE_VERSION@
PATH_SEPARATOR = @PATH_SEPARATOR@
+PKG_CONFIG = @PKG_CONFIG@
POSTGRES_CPPFLAGS = @POSTGRES_CPPFLAGS@
POSTGRES_LDFLAGS = @POSTGRES_LDFLAGS@
POSUB = @POSUB@
@@ -556,6 +357,7 @@ abs_builddir = @abs_builddir@
abs_srcdir = @abs_srcdir@
abs_top_builddir = @abs_top_builddir@
abs_top_srcdir = @abs_top_srcdir@
+ac_ct_AR = @ac_ct_AR@
ac_ct_CC = @ac_ct_CC@
ac_ct_CXX = @ac_ct_CXX@
ac_ct_DUMPBIN = @ac_ct_DUMPBIN@
@@ -578,6 +380,7 @@ datarootdir = @datarootdir@
docdir = @docdir@
dvidir = @dvidir@
exec_prefix = @exec_prefix@
+gitcommand = @gitcommand@
host = @host@
host_alias = @host_alias@
host_cpu = @host_cpu@
@@ -591,7 +394,6 @@ libdir = @libdir@
libexecdir = @libexecdir@
localedir = @localedir@
localstatedir = @localstatedir@
-lt_ECHO = @lt_ECHO@
ltdl_LIBOBJS = @ltdl_LIBOBJS@
ltdl_LTLIBOBJS = @ltdl_LTLIBOBJS@
mandir = @mandir@
@@ -609,6 +411,7 @@ sbindir = @sbindir@
sharedstatedir = @sharedstatedir@
srcdir = @srcdir@
subdirs = @subdirs@
+svnversioncommand = @svnversioncommand@
sys_symbol_underscore = @sys_symbol_underscore@
sysconfdir = @sysconfdir@
target = @target@
@@ -627,54 +430,30 @@ pkgcfgdir = $(pkgdatadir)/config.d/
dist_pkgcfg_DATA = \
testing.conf
-@HAVE_EXPENSIVE_TESTS_TRUE@EXPENSIVE_TESTS = \
-@HAVE_EXPENSIVE_TESTS_TRUE@ test_testing_topology_stability \
-@HAVE_EXPENSIVE_TESTS_TRUE@ test_testing_topology_clique_random \
-@HAVE_EXPENSIVE_TESTS_TRUE@ test_testing_topology_clique_minimum \
-@HAVE_EXPENSIVE_TESTS_TRUE@ test_testing_topology_clique_dfs \
-@HAVE_EXPENSIVE_TESTS_TRUE@ test_testing_topology_churn \
-@HAVE_EXPENSIVE_TESTS_TRUE@ test_testing_topology_line \
-@HAVE_EXPENSIVE_TESTS_TRUE@ test_testing_topology_blacklist \
-@HAVE_EXPENSIVE_TESTS_TRUE@ test_testing_group_remote \
-@HAVE_EXPENSIVE_TESTS_TRUE@ test_testing_topology_ring \
-@HAVE_EXPENSIVE_TESTS_TRUE@ test_testing_topology_2d_torus \
-@HAVE_EXPENSIVE_TESTS_TRUE@ test_testing_topology_small_world_ring \
-@HAVE_EXPENSIVE_TESTS_TRUE@ test_testing_topology_small_world_torus \
-@HAVE_EXPENSIVE_TESTS_TRUE@ test_testing_topology_erdos_renyi \
-@HAVE_EXPENSIVE_TESTS_TRUE@ test_testing_topology_internat \
-@HAVE_EXPENSIVE_TESTS_TRUE@ test_testing_topology_scale_free
-
lib_LTLIBRARIES = \
- libgnunettesting.la \
- libgnunettesting_new.la
+ libgnunettesting.la
libgnunettesting_la_SOURCES = \
- helper.c \
- testing.c \
- testing_group.c \
- testing_peergroup.c
-
-libgnunettesting_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 \
- -lm \
- $(top_builddir)/src/util/libgnunetutil.la
+ testing.c
+
+libgnunettesting_la_LIBADD = \
+ $(top_builddir)/src/util/libgnunetutil.la \
+ $(LTLIBINTL)
libgnunettesting_la_LDFLAGS = \
$(GN_LIB_LDFLAGS) \
- -version-info 0:1:0
+ -version-info 2:0:1
-libgnunettesting_new_la_SOURCES = \
- testing_new.c
+gnunet_testing_run_service_SOURCES = \
+ gnunet-testing-run-service.c
-libgnunettesting_new_la_LIBADD = \
- $(top_builddir)/src/util/libgnunetutil.la
+gnunet_testing_run_service_LDADD = \
+ $(top_builddir)/src/util/libgnunetutil.la \
+ $(top_builddir)/src/testing/libgnunettesting.la \
+ $(GN_LIBINTL)
-libgnunettesting_new_la_LDFLAGS = \
- $(GN_LIB_LDFLAGS) \
- -version-info 0:1:0
+gnunet_testing_run_service_DEPENDENCIES = \
+ libgnunettesting.la
gnunet_testing_SOURCES = \
gnunet-testing.c
@@ -687,225 +466,29 @@ gnunet_testing_LDADD = \
gnunet_testing_DEPENDENCIES = \
libgnunettesting.la
-test_testing_SOURCES = \
- test_testing.c
-
-test_testing_LDADD = \
- $(top_builddir)/src/testing/libgnunettesting.la \
- $(top_builddir)/src/util/libgnunetutil.la
-
-test_testing_connect_SOURCES = \
- test_testing_connect.c
-
-test_testing_connect_LDADD = \
- $(top_builddir)/src/testing/libgnunettesting.la \
- $(top_builddir)/src/util/libgnunetutil.la
-
-test_testing_reconnect_SOURCES = \
- test_testing_reconnect.c
-
-test_testing_reconnect_LDADD = \
- $(top_builddir)/src/testing/libgnunettesting.la \
- $(top_builddir)/src/util/libgnunetutil.la
-
-test_testing_group_SOURCES = \
- test_testing_group.c
-
-test_testing_group_LDADD = \
- $(top_builddir)/src/testing/libgnunettesting.la \
- $(top_builddir)/src/util/libgnunetutil.la
-
-test_testing_peergroup_SOURCES = \
- test_testing_peergroup.c
+test_testing_portreservation_SOURCES = \
+ test_testing_portreservation.c
-test_testing_peergroup_LDADD = \
+test_testing_portreservation_LDADD = \
$(top_builddir)/src/testing/libgnunettesting.la \
- $(top_builddir)/src/util/libgnunetutil.la
-
-test_testing_topology_clique_SOURCES = \
- test_testing_topology.c
-
-test_testing_topology_clique_LDADD = \
- $(top_builddir)/src/testing/libgnunettesting.la \
- $(top_builddir)/src/core/libgnunetcore.la \
- $(top_builddir)/src/util/libgnunetutil.la
-
-test_testing_topology_stability_SOURCES = \
- test_testing_topology.c
-
-test_testing_topology_stability_LDADD = \
- $(top_builddir)/src/testing/libgnunettesting.la \
- $(top_builddir)/src/core/libgnunetcore.la \
- $(top_builddir)/src/util/libgnunetutil.la
-
-test_testing_topology_blacklist_SOURCES = \
- test_testing_topology_blacklist.c
-
-test_testing_topology_blacklist_LDADD = \
- $(top_builddir)/src/testing/libgnunettesting.la \
- $(top_builddir)/src/util/libgnunetutil.la
-
-test_testing_topology_churn_SOURCES = \
- test_testing_topology_churn.c
-
-test_testing_topology_churn_LDADD = \
- $(top_builddir)/src/testing/libgnunettesting.la \
- $(top_builddir)/src/util/libgnunetutil.la
-
-test_testing_topology_clique_random_SOURCES = \
- test_testing_topology.c
-
-test_testing_topology_clique_random_LDADD = \
- $(top_builddir)/src/testing/libgnunettesting.la \
- $(top_builddir)/src/core/libgnunetcore.la \
- $(top_builddir)/src/util/libgnunetutil.la
-
-test_testing_topology_clique_minimum_SOURCES = \
- test_testing_topology.c
-
-test_testing_topology_clique_minimum_LDADD = \
- $(top_builddir)/src/testing/libgnunettesting.la \
- $(top_builddir)/src/core/libgnunetcore.la \
- $(top_builddir)/src/util/libgnunetutil.la
-
-test_testing_topology_clique_dfs_SOURCES = \
- test_testing_topology.c
-
-test_testing_topology_clique_dfs_LDADD = \
- $(top_builddir)/src/testing/libgnunettesting.la \
- $(top_builddir)/src/core/libgnunetcore.la \
- $(top_builddir)/src/util/libgnunetutil.la
-
-test_testing_topology_line_SOURCES = \
- test_testing_topology.c
-
-test_testing_topology_line_LDADD = \
- $(top_builddir)/src/testing/libgnunettesting.la \
- $(top_builddir)/src/core/libgnunetcore.la \
- $(top_builddir)/src/util/libgnunetutil.la
-
-test_testing_group_remote_SOURCES = \
- test_testing_group_remote.c
-
-test_testing_group_remote_LDADD = \
- $(top_builddir)/src/testing/libgnunettesting.la \
- $(top_builddir)/src/util/libgnunetutil.la
-
-test_testing_2dtorus_SOURCES = \
- test_testing_2dtorus.c
-
-test_testing_2dtorus_LDADD = \
- $(top_builddir)/src/testing/libgnunettesting.la \
- $(top_builddir)/src/util/libgnunetutil.la
-
-test_testing_topology_ring_SOURCES = \
- test_testing_topology.c
-
-test_testing_topology_ring_LDADD = \
- $(top_builddir)/src/testing/libgnunettesting.la \
- $(top_builddir)/src/core/libgnunetcore.la \
- $(top_builddir)/src/util/libgnunetutil.la
-
-test_testing_topology_2d_torus_SOURCES = \
- test_testing_topology.c
-
-test_testing_topology_2d_torus_LDADD = \
- $(top_builddir)/src/testing/libgnunettesting.la \
- $(top_builddir)/src/core/libgnunetcore.la \
- $(top_builddir)/src/util/libgnunetutil.la
-
-test_testing_topology_small_world_ring_SOURCES = \
- test_testing_topology.c
-
-test_testing_topology_small_world_ring_LDADD = \
- $(top_builddir)/src/testing/libgnunettesting.la \
- $(top_builddir)/src/core/libgnunetcore.la \
- $(top_builddir)/src/util/libgnunetutil.la
-
-test_testing_topology_small_world_torus_SOURCES = \
- test_testing_topology.c
-
-test_testing_topology_small_world_torus_LDADD = \
- $(top_builddir)/src/testing/libgnunettesting.la \
- $(top_builddir)/src/core/libgnunetcore.la \
- $(top_builddir)/src/util/libgnunetutil.la
-
-test_testing_topology_internat_SOURCES = \
- test_testing_topology.c
-
-test_testing_topology_internat_LDADD = \
- $(top_builddir)/src/testing/libgnunettesting.la \
- $(top_builddir)/src/core/libgnunetcore.la \
$(top_builddir)/src/util/libgnunetutil.la
-test_testing_topology_erdos_renyi_SOURCES = \
- test_testing_topology.c
+test_testing_peerstartup_SOURCES = \
+ test_testing_peerstartup.c
-test_testing_topology_erdos_renyi_LDADD = \
+test_testing_peerstartup_LDADD = \
$(top_builddir)/src/testing/libgnunettesting.la \
- $(top_builddir)/src/core/libgnunetcore.la \
$(top_builddir)/src/util/libgnunetutil.la
-test_testing_topology_scale_free_SOURCES = \
- test_testing_topology.c
+test_testing_servicestartup_SOURCES = \
+ test_testing_servicestartup.c
-test_testing_topology_scale_free_LDADD = \
+test_testing_servicestartup_LDADD = \
$(top_builddir)/src/testing/libgnunettesting.la \
- $(top_builddir)/src/core/libgnunetcore.la \
- $(top_builddir)/src/util/libgnunetutil.la
-
-test_testing_topology_none_SOURCES = \
- test_testing_topology.c
-
-test_testing_topology_none_LDADD = \
- $(top_builddir)/src/testing/libgnunettesting.la \
- $(top_builddir)/src/core/libgnunetcore.la \
- $(top_builddir)/src/util/libgnunetutil.la
-
-test_testing_new_portreservation_SOURCES = \
- test_testing_new_portreservation.c
-
-test_testing_new_portreservation_LDADD = \
- $(top_builddir)/src/testing/libgnunettesting_new.la \
- $(top_builddir)/src/util/libgnunetutil.la
-
-test_testing_new_peerstartup_SOURCES = \
- test_testing_new_peerstartup.c
-
-test_testing_new_peerstartup_LDADD = \
- $(top_builddir)/src/testing/libgnunettesting_new.la \
- $(top_builddir)/src/util/libgnunetutil.la
-
-test_testing_new_servicestartup_SOURCES = \
- test_testing_new_servicestartup.c
-
-test_testing_new_servicestartup_LDADD = \
- $(top_builddir)/src/testing/libgnunettesting_new.la \
$(top_builddir)/src/util/libgnunetutil.la
EXTRA_DIST = \
- test_testing_defaults.conf \
- test_testing_data.conf \
- test_testing_connect_peer1.conf \
- test_testing_connect_peer2.conf \
- test_testing_2dtorus.conf \
- test_testing_data_topology_clique.conf \
- test_testing_data_topology_clique_random.conf \
- test_testing_data_topology_clique_minimum.conf \
- test_testing_data_topology_clique_dfs.conf \
- test_testing_data_topology_ring.conf \
- test_testing_data_topology_2d_torus.conf \
- test_testing_data_topology_small_world_ring.conf \
- test_testing_data_topology_small_world_torus.conf \
- test_testing_data_topology_erdos_renyi.conf \
- test_testing_data_topology_internat.conf \
- test_testing_data_topology_scale_free.conf \
- test_testing_data_topology_blacklist.conf \
- test_testing_data_topology_churn.conf \
- test_testing_data_topology_none.conf \
- test_testing_data_remote.conf \
- test_testing_data_topology_stability.conf \
- test_testing_peergroup_data.conf
+ test_testing_defaults.conf
all: all-am
@@ -943,7 +526,6 @@ $(ACLOCAL_M4): $(am__aclocal_m4_deps)
$(am__aclocal_m4_deps):
install-libLTLIBRARIES: $(lib_LTLIBRARIES)
@$(NORMAL_INSTALL)
- test -z "$(libdir)" || $(MKDIR_P) "$(DESTDIR)$(libdir)"
@list='$(lib_LTLIBRARIES)'; test -n "$(libdir)" || list=; \
list2=; for p in $$list; do \
if test -f $$p; then \
@@ -951,6 +533,8 @@ install-libLTLIBRARIES: $(lib_LTLIBRARIES)
else :; fi; \
done; \
test -z "$$list2" || { \
+ echo " $(MKDIR_P) '$(DESTDIR)$(libdir)'"; \
+ $(MKDIR_P) "$(DESTDIR)$(libdir)" || exit 1; \
echo " $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(INSTALL) $(INSTALL_STRIP_FLAG) $$list2 '$(DESTDIR)$(libdir)'"; \
$(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(INSTALL) $(INSTALL_STRIP_FLAG) $$list2 "$(DESTDIR)$(libdir)"; \
}
@@ -972,14 +556,15 @@ clean-libLTLIBRARIES:
echo "rm -f \"$${dir}/so_locations\""; \
rm -f "$${dir}/so_locations"; \
done
-libgnunettesting.la: $(libgnunettesting_la_OBJECTS) $(libgnunettesting_la_DEPENDENCIES)
+libgnunettesting.la: $(libgnunettesting_la_OBJECTS) $(libgnunettesting_la_DEPENDENCIES) $(EXTRA_libgnunettesting_la_DEPENDENCIES)
$(AM_V_CCLD)$(libgnunettesting_la_LINK) -rpath $(libdir) $(libgnunettesting_la_OBJECTS) $(libgnunettesting_la_LIBADD) $(LIBS)
-libgnunettesting_new.la: $(libgnunettesting_new_la_OBJECTS) $(libgnunettesting_new_la_DEPENDENCIES)
- $(AM_V_CCLD)$(libgnunettesting_new_la_LINK) -rpath $(libdir) $(libgnunettesting_new_la_OBJECTS) $(libgnunettesting_new_la_LIBADD) $(LIBS)
install-binPROGRAMS: $(bin_PROGRAMS)
@$(NORMAL_INSTALL)
- test -z "$(bindir)" || $(MKDIR_P) "$(DESTDIR)$(bindir)"
@list='$(bin_PROGRAMS)'; test -n "$(bindir)" || list=; \
+ if test -n "$$list"; then \
+ echo " $(MKDIR_P) '$(DESTDIR)$(bindir)'"; \
+ $(MKDIR_P) "$(DESTDIR)$(bindir)" || exit 1; \
+ fi; \
for p in $$list; do echo "$$p $$p"; done | \
sed 's/$(EXEEXT)$$//' | \
while read p p1; do if test -f $$p || test -f $$p1; \
@@ -1028,87 +613,21 @@ clean-checkPROGRAMS:
list=`for p in $$list; do echo "$$p"; done | sed 's/$(EXEEXT)$$//'`; \
echo " rm -f" $$list; \
rm -f $$list
-gnunet-testing$(EXEEXT): $(gnunet_testing_OBJECTS) $(gnunet_testing_DEPENDENCIES)
+gnunet-testing$(EXEEXT): $(gnunet_testing_OBJECTS) $(gnunet_testing_DEPENDENCIES) $(EXTRA_gnunet_testing_DEPENDENCIES)
@rm -f gnunet-testing$(EXEEXT)
$(AM_V_CCLD)$(LINK) $(gnunet_testing_OBJECTS) $(gnunet_testing_LDADD) $(LIBS)
-test_testing$(EXEEXT): $(test_testing_OBJECTS) $(test_testing_DEPENDENCIES)
- @rm -f test_testing$(EXEEXT)
- $(AM_V_CCLD)$(LINK) $(test_testing_OBJECTS) $(test_testing_LDADD) $(LIBS)
-test_testing_2dtorus$(EXEEXT): $(test_testing_2dtorus_OBJECTS) $(test_testing_2dtorus_DEPENDENCIES)
- @rm -f test_testing_2dtorus$(EXEEXT)
- $(AM_V_CCLD)$(LINK) $(test_testing_2dtorus_OBJECTS) $(test_testing_2dtorus_LDADD) $(LIBS)
-test_testing_connect$(EXEEXT): $(test_testing_connect_OBJECTS) $(test_testing_connect_DEPENDENCIES)
- @rm -f test_testing_connect$(EXEEXT)
- $(AM_V_CCLD)$(LINK) $(test_testing_connect_OBJECTS) $(test_testing_connect_LDADD) $(LIBS)
-test_testing_group$(EXEEXT): $(test_testing_group_OBJECTS) $(test_testing_group_DEPENDENCIES)
- @rm -f test_testing_group$(EXEEXT)
- $(AM_V_CCLD)$(LINK) $(test_testing_group_OBJECTS) $(test_testing_group_LDADD) $(LIBS)
-test_testing_group_remote$(EXEEXT): $(test_testing_group_remote_OBJECTS) $(test_testing_group_remote_DEPENDENCIES)
- @rm -f test_testing_group_remote$(EXEEXT)
- $(AM_V_CCLD)$(LINK) $(test_testing_group_remote_OBJECTS) $(test_testing_group_remote_LDADD) $(LIBS)
-test_testing_new_peerstartup$(EXEEXT): $(test_testing_new_peerstartup_OBJECTS) $(test_testing_new_peerstartup_DEPENDENCIES)
- @rm -f test_testing_new_peerstartup$(EXEEXT)
- $(AM_V_CCLD)$(LINK) $(test_testing_new_peerstartup_OBJECTS) $(test_testing_new_peerstartup_LDADD) $(LIBS)
-test_testing_new_portreservation$(EXEEXT): $(test_testing_new_portreservation_OBJECTS) $(test_testing_new_portreservation_DEPENDENCIES)
- @rm -f test_testing_new_portreservation$(EXEEXT)
- $(AM_V_CCLD)$(LINK) $(test_testing_new_portreservation_OBJECTS) $(test_testing_new_portreservation_LDADD) $(LIBS)
-test_testing_new_servicestartup$(EXEEXT): $(test_testing_new_servicestartup_OBJECTS) $(test_testing_new_servicestartup_DEPENDENCIES)
- @rm -f test_testing_new_servicestartup$(EXEEXT)
- $(AM_V_CCLD)$(LINK) $(test_testing_new_servicestartup_OBJECTS) $(test_testing_new_servicestartup_LDADD) $(LIBS)
-test_testing_peergroup$(EXEEXT): $(test_testing_peergroup_OBJECTS) $(test_testing_peergroup_DEPENDENCIES)
- @rm -f test_testing_peergroup$(EXEEXT)
- $(AM_V_CCLD)$(LINK) $(test_testing_peergroup_OBJECTS) $(test_testing_peergroup_LDADD) $(LIBS)
-test_testing_reconnect$(EXEEXT): $(test_testing_reconnect_OBJECTS) $(test_testing_reconnect_DEPENDENCIES)
- @rm -f test_testing_reconnect$(EXEEXT)
- $(AM_V_CCLD)$(LINK) $(test_testing_reconnect_OBJECTS) $(test_testing_reconnect_LDADD) $(LIBS)
-test_testing_topology_2d_torus$(EXEEXT): $(test_testing_topology_2d_torus_OBJECTS) $(test_testing_topology_2d_torus_DEPENDENCIES)
- @rm -f test_testing_topology_2d_torus$(EXEEXT)
- $(AM_V_CCLD)$(LINK) $(test_testing_topology_2d_torus_OBJECTS) $(test_testing_topology_2d_torus_LDADD) $(LIBS)
-test_testing_topology_blacklist$(EXEEXT): $(test_testing_topology_blacklist_OBJECTS) $(test_testing_topology_blacklist_DEPENDENCIES)
- @rm -f test_testing_topology_blacklist$(EXEEXT)
- $(AM_V_CCLD)$(LINK) $(test_testing_topology_blacklist_OBJECTS) $(test_testing_topology_blacklist_LDADD) $(LIBS)
-test_testing_topology_churn$(EXEEXT): $(test_testing_topology_churn_OBJECTS) $(test_testing_topology_churn_DEPENDENCIES)
- @rm -f test_testing_topology_churn$(EXEEXT)
- $(AM_V_CCLD)$(LINK) $(test_testing_topology_churn_OBJECTS) $(test_testing_topology_churn_LDADD) $(LIBS)
-test_testing_topology_clique$(EXEEXT): $(test_testing_topology_clique_OBJECTS) $(test_testing_topology_clique_DEPENDENCIES)
- @rm -f test_testing_topology_clique$(EXEEXT)
- $(AM_V_CCLD)$(LINK) $(test_testing_topology_clique_OBJECTS) $(test_testing_topology_clique_LDADD) $(LIBS)
-test_testing_topology_clique_dfs$(EXEEXT): $(test_testing_topology_clique_dfs_OBJECTS) $(test_testing_topology_clique_dfs_DEPENDENCIES)
- @rm -f test_testing_topology_clique_dfs$(EXEEXT)
- $(AM_V_CCLD)$(LINK) $(test_testing_topology_clique_dfs_OBJECTS) $(test_testing_topology_clique_dfs_LDADD) $(LIBS)
-test_testing_topology_clique_minimum$(EXEEXT): $(test_testing_topology_clique_minimum_OBJECTS) $(test_testing_topology_clique_minimum_DEPENDENCIES)
- @rm -f test_testing_topology_clique_minimum$(EXEEXT)
- $(AM_V_CCLD)$(LINK) $(test_testing_topology_clique_minimum_OBJECTS) $(test_testing_topology_clique_minimum_LDADD) $(LIBS)
-test_testing_topology_clique_random$(EXEEXT): $(test_testing_topology_clique_random_OBJECTS) $(test_testing_topology_clique_random_DEPENDENCIES)
- @rm -f test_testing_topology_clique_random$(EXEEXT)
- $(AM_V_CCLD)$(LINK) $(test_testing_topology_clique_random_OBJECTS) $(test_testing_topology_clique_random_LDADD) $(LIBS)
-test_testing_topology_erdos_renyi$(EXEEXT): $(test_testing_topology_erdos_renyi_OBJECTS) $(test_testing_topology_erdos_renyi_DEPENDENCIES)
- @rm -f test_testing_topology_erdos_renyi$(EXEEXT)
- $(AM_V_CCLD)$(LINK) $(test_testing_topology_erdos_renyi_OBJECTS) $(test_testing_topology_erdos_renyi_LDADD) $(LIBS)
-test_testing_topology_internat$(EXEEXT): $(test_testing_topology_internat_OBJECTS) $(test_testing_topology_internat_DEPENDENCIES)
- @rm -f test_testing_topology_internat$(EXEEXT)
- $(AM_V_CCLD)$(LINK) $(test_testing_topology_internat_OBJECTS) $(test_testing_topology_internat_LDADD) $(LIBS)
-test_testing_topology_line$(EXEEXT): $(test_testing_topology_line_OBJECTS) $(test_testing_topology_line_DEPENDENCIES)
- @rm -f test_testing_topology_line$(EXEEXT)
- $(AM_V_CCLD)$(LINK) $(test_testing_topology_line_OBJECTS) $(test_testing_topology_line_LDADD) $(LIBS)
-test_testing_topology_none$(EXEEXT): $(test_testing_topology_none_OBJECTS) $(test_testing_topology_none_DEPENDENCIES)
- @rm -f test_testing_topology_none$(EXEEXT)
- $(AM_V_CCLD)$(LINK) $(test_testing_topology_none_OBJECTS) $(test_testing_topology_none_LDADD) $(LIBS)
-test_testing_topology_ring$(EXEEXT): $(test_testing_topology_ring_OBJECTS) $(test_testing_topology_ring_DEPENDENCIES)
- @rm -f test_testing_topology_ring$(EXEEXT)
- $(AM_V_CCLD)$(LINK) $(test_testing_topology_ring_OBJECTS) $(test_testing_topology_ring_LDADD) $(LIBS)
-test_testing_topology_scale_free$(EXEEXT): $(test_testing_topology_scale_free_OBJECTS) $(test_testing_topology_scale_free_DEPENDENCIES)
- @rm -f test_testing_topology_scale_free$(EXEEXT)
- $(AM_V_CCLD)$(LINK) $(test_testing_topology_scale_free_OBJECTS) $(test_testing_topology_scale_free_LDADD) $(LIBS)
-test_testing_topology_small_world_ring$(EXEEXT): $(test_testing_topology_small_world_ring_OBJECTS) $(test_testing_topology_small_world_ring_DEPENDENCIES)
- @rm -f test_testing_topology_small_world_ring$(EXEEXT)
- $(AM_V_CCLD)$(LINK) $(test_testing_topology_small_world_ring_OBJECTS) $(test_testing_topology_small_world_ring_LDADD) $(LIBS)
-test_testing_topology_small_world_torus$(EXEEXT): $(test_testing_topology_small_world_torus_OBJECTS) $(test_testing_topology_small_world_torus_DEPENDENCIES)
- @rm -f test_testing_topology_small_world_torus$(EXEEXT)
- $(AM_V_CCLD)$(LINK) $(test_testing_topology_small_world_torus_OBJECTS) $(test_testing_topology_small_world_torus_LDADD) $(LIBS)
-test_testing_topology_stability$(EXEEXT): $(test_testing_topology_stability_OBJECTS) $(test_testing_topology_stability_DEPENDENCIES)
- @rm -f test_testing_topology_stability$(EXEEXT)
- $(AM_V_CCLD)$(LINK) $(test_testing_topology_stability_OBJECTS) $(test_testing_topology_stability_LDADD) $(LIBS)
+gnunet-testing-run-service$(EXEEXT): $(gnunet_testing_run_service_OBJECTS) $(gnunet_testing_run_service_DEPENDENCIES) $(EXTRA_gnunet_testing_run_service_DEPENDENCIES)
+ @rm -f gnunet-testing-run-service$(EXEEXT)
+ $(AM_V_CCLD)$(LINK) $(gnunet_testing_run_service_OBJECTS) $(gnunet_testing_run_service_LDADD) $(LIBS)
+test_testing_peerstartup$(EXEEXT): $(test_testing_peerstartup_OBJECTS) $(test_testing_peerstartup_DEPENDENCIES) $(EXTRA_test_testing_peerstartup_DEPENDENCIES)
+ @rm -f test_testing_peerstartup$(EXEEXT)
+ $(AM_V_CCLD)$(LINK) $(test_testing_peerstartup_OBJECTS) $(test_testing_peerstartup_LDADD) $(LIBS)
+test_testing_portreservation$(EXEEXT): $(test_testing_portreservation_OBJECTS) $(test_testing_portreservation_DEPENDENCIES) $(EXTRA_test_testing_portreservation_DEPENDENCIES)
+ @rm -f test_testing_portreservation$(EXEEXT)
+ $(AM_V_CCLD)$(LINK) $(test_testing_portreservation_OBJECTS) $(test_testing_portreservation_LDADD) $(LIBS)
+test_testing_servicestartup$(EXEEXT): $(test_testing_servicestartup_OBJECTS) $(test_testing_servicestartup_DEPENDENCIES) $(EXTRA_test_testing_servicestartup_DEPENDENCIES)
+ @rm -f test_testing_servicestartup$(EXEEXT)
+ $(AM_V_CCLD)$(LINK) $(test_testing_servicestartup_OBJECTS) $(test_testing_servicestartup_LDADD) $(LIBS)
mostlyclean-compile:
-rm -f *.$(OBJEXT)
@@ -1116,49 +635,33 @@ mostlyclean-compile:
distclean-compile:
-rm -f *.tab.c
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/gnunet-testing-run-service.Po@am__quote@
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/gnunet-testing.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/helper.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/test_testing.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/test_testing_2dtorus.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/test_testing_connect.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/test_testing_group.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/test_testing_group_remote.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/test_testing_new_peerstartup.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/test_testing_new_portreservation.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/test_testing_new_servicestartup.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/test_testing_peergroup.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/test_testing_reconnect.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/test_testing_topology.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/test_testing_topology_blacklist.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/test_testing_topology_churn.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/test_testing_peerstartup.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/test_testing_portreservation.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/test_testing_servicestartup.Po@am__quote@
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/testing.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/testing_group.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/testing_new.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/testing_peergroup.Plo@am__quote@
.c.o:
@am__fastdepCC_TRUE@ $(AM_V_CC)$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
-@am__fastdepCC_FALSE@ $(AM_V_CC) @AM_BACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@ $(COMPILE) -c $<
+@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(COMPILE) -c $<
.c.obj:
@am__fastdepCC_TRUE@ $(AM_V_CC)$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'`
@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
-@am__fastdepCC_FALSE@ $(AM_V_CC) @AM_BACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@ $(COMPILE) -c `$(CYGPATH_W) '$<'`
+@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(COMPILE) -c `$(CYGPATH_W) '$<'`
.c.lo:
@am__fastdepCC_TRUE@ $(AM_V_CC)$(LTCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Plo
-@am__fastdepCC_FALSE@ $(AM_V_CC) @AM_BACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@
@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@ $(LTCOMPILE) -c -o $@ $<
+@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(LTCOMPILE) -c -o $@ $<
mostlyclean-libtool:
-rm -f *.lo
@@ -1167,8 +670,11 @@ clean-libtool:
-rm -rf .libs _libs
install-dist_pkgcfgDATA: $(dist_pkgcfg_DATA)
@$(NORMAL_INSTALL)
- test -z "$(pkgcfgdir)" || $(MKDIR_P) "$(DESTDIR)$(pkgcfgdir)"
@list='$(dist_pkgcfg_DATA)'; test -n "$(pkgcfgdir)" || list=; \
+ if test -n "$$list"; then \
+ echo " $(MKDIR_P) '$(DESTDIR)$(pkgcfgdir)'"; \
+ $(MKDIR_P) "$(DESTDIR)$(pkgcfgdir)" || exit 1; \
+ fi; \
for p in $$list; do \
if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
echo "$$d$$p"; \
@@ -1182,9 +688,7 @@ uninstall-dist_pkgcfgDATA:
@$(NORMAL_UNINSTALL)
@list='$(dist_pkgcfg_DATA)'; test -n "$(pkgcfgdir)" || list=; \
files=`for p in $$list; do echo $$p; done | sed -e 's|^.*/||'`; \
- test -n "$$files" || exit 0; \
- echo " ( cd '$(DESTDIR)$(pkgcfgdir)' && rm -f" $$files ")"; \
- cd "$(DESTDIR)$(pkgcfgdir)" && rm -f $$files
+ dir='$(DESTDIR)$(pkgcfgdir)'; $(am__uninstall_files_from_dir)
ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES)
list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
@@ -1319,14 +823,15 @@ check-TESTS: $(TESTS)
fi; \
dashes=`echo "$$dashes" | sed s/./=/g`; \
if test "$$failed" -eq 0; then \
- echo "$$grn$$dashes"; \
+ col="$$grn"; \
else \
- echo "$$red$$dashes"; \
+ col="$$red"; \
fi; \
- echo "$$banner"; \
- test -z "$$skipped" || echo "$$skipped"; \
- test -z "$$report" || echo "$$report"; \
- echo "$$dashes$$std"; \
+ echo "$${col}$$dashes$${std}"; \
+ echo "$${col}$$banner$${std}"; \
+ test -z "$$skipped" || echo "$${col}$$skipped$${std}"; \
+ test -z "$$report" || echo "$${col}$$report$${std}"; \
+ echo "$${col}$$dashes$${std}"; \
test "$$failed" -eq 0; \
else :; fi
@@ -1381,10 +886,15 @@ install-am: all-am
installcheck: installcheck-am
install-strip:
- $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
- install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
- `test -z '$(STRIP)' || \
- echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install
+ if test -z '$(STRIP)'; then \
+ $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
+ install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
+ install; \
+ else \
+ $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
+ install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
+ "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'" install; \
+ fi
mostlyclean-generic:
clean-generic: