-fixes

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

diff --git a/src/testing/Makefile.am b/src/testing/Makefile.am
index 878cffa2720cc9c5f8c6769aecc924ff5cf70e8f..050691d13ae8d42ed0192f125ee1396a7729e4d2 100644 (file)
--- a/src/testing/Makefile.am
+++ b/src/testing/Makefile.am
@@ -9,6 +9,11 @@ if USE_COVERAGE
   XLIB = -lgcov
 endif
 
+pkgcfgdir= $(pkgdatadir)/config.d/
+
+dist_pkgcfg_DATA = \
+  testing.conf
+
 if HAVE_EXPENSIVE_TESTS
   EXPENSIVE_TESTS = \
    test_testing_topology_stability \
@@ -31,6 +36,7 @@ endif
 lib_LTLIBRARIES = libgnunettesting.la
 
 libgnunettesting_la_SOURCES = \
+  helper.c \
   testing.c  \
   testing_group.c \
   testing_peergroup.c
@@ -41,6 +47,12 @@ libgnunettesting_la_LIBADD = $(XLIB) \
  $(top_builddir)/src/hello/libgnunethello.la \
  -lm \
  $(top_builddir)/src/util/libgnunetutil.la 
+libgnunettesting_la_LDFLAGS = \
+ $(GN_LIB_LDFLAGS) \
+ -version-info 0:1:0
+
+bin_PROGRAMS = \
+ gnunet-testing
 
 check_PROGRAMS = \
  test_testing \
@@ -57,6 +69,7 @@ check_PROGRAMS = \
  test_testing_topology_line \
  test_testing_topology_blacklist \
  test_testing_group_remote \
+ test_testing_2dtorus \
  test_testing_topology_ring \
  test_testing_topology_2d_torus \
  test_testing_topology_small_world_ring \
@@ -73,9 +86,20 @@ TESTS = \
  test_testing_reconnect \
  test_testing_group \
  test_testing_peergroup \
- test_testing_topology_clique
+ test_testing_topology_clique \
+ test_testing_2dtorus
 endif
 
+gnunet_testing_SOURCES = \
+ gnunet-testing.c         
+gnunet_testing_LDADD = \
+ $(top_builddir)/src/testing/libgnunettesting.la \
+ $(top_builddir)/src/util/libgnunetutil.la \
+ $(GN_LIBINTL)
+gnunet_testing_DEPENDENCIES = \
+ libgnunettesting.la
+
+
 test_testing_SOURCES = \
  test_testing.c
 test_testing_LDADD = \
@@ -167,6 +191,12 @@ 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 = \
@@ -225,9 +255,11 @@ test_testing_topology_none_LDADD = \
 
 
 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 \