- rename also contents of config files, update config files

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

diff --git a/src/testing/Makefile.am b/src/testing/Makefile.am
index b028e1ab19b7b3e426b5867de947e0bead2c7b29..899708102f6324f7cb290e9123718964369790c7 100644 (file)
--- a/src/testing/Makefile.am
+++ b/src/testing/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
@@ -28,19 +28,10 @@ libgnunettesting_la_LDFLAGS = \
  -version-info 2:0:1
 
 bin_PROGRAMS = \
- gnunet-testing-run-service \
  gnunet-testing
 
-
-gnunet_testing_run_service_SOURCES = \
- gnunet-testing-run-service.c
-
-gnunet_testing_run_service_LDADD = \
- $(top_builddir)/src/util/libgnunetutil.la \
- $(top_builddir)/src/testing/libgnunettesting.la \
- $(GN_LIBINTL)
-gnunet_testing_run_service_DEPENDENCIES = \
-  libgnunettesting.la
+noinst_PROGRAMS = \
+ list-keys
 
 gnunet_testing_SOURCES = \
  gnunet-testing.c         
@@ -51,6 +42,12 @@ gnunet_testing_LDADD = \
 gnunet_testing_DEPENDENCIES = \
  libgnunettesting.la
 
+list_keys_SOURCES = \
+ list-keys.c
+list_keys_LDADD = \
+ $(top_builddir)/src/util/libgnunetutil.la \
+ $(GN_LIBINTL)
+
 
 check_PROGRAMS = \
  test_testing_portreservation \
@@ -60,6 +57,7 @@ check_PROGRAMS = \
  test_testing_sharedservices
 
 if ENABLE_TEST_RUN 
+AM_TESTS_ENVIRONMENT=export GNUNET_PREFIX=$${GNUNET_PREFIX:-@libdir@};export PATH=$${GNUNET_PREFIX:-@prefix@}/bin:$$PATH;
 TESTS = \
  test_testing_portreservation \
  test_testing_peerstartup \
@@ -97,7 +95,6 @@ test_testing_sharedservices_LDADD = \
  $(top_builddir)/src/testing/libgnunettesting.la \
  $(top_builddir)/src/util/libgnunetutil.la
 
-
-
 EXTRA_DIST = \
   test_testing_defaults.conf
+