- 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 670b1d2e04baa4861b26571d2f2da138a48b0aff..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
@@ -21,35 +21,47 @@ libgnunettesting_la_SOURCES = \
   testing.c  
 libgnunettesting_la_LIBADD = \
  $(top_builddir)/src/util/libgnunetutil.la \
+ $(top_builddir)/src/arm/libgnunetarm.la \
  $(LTLIBINTL)
 libgnunettesting_la_LDFLAGS = \
  $(GN_LIB_LDFLAGS) \
- -version-info 0:1:0
+ -version-info 2:0:1
 
 bin_PROGRAMS = \
- gnunet-testing-run-service
+ gnunet-testing
 
+noinst_PROGRAMS = \
+ list-keys
 
-gnunet_testing_run_service_SOURCES = \
- gnunet-testing-run-service.c
+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
 
-gnunet_testing_run_service_LDADD = \
+list_keys_SOURCES = \
+ list-keys.c
+list_keys_LDADD = \
  $(top_builddir)/src/util/libgnunetutil.la \
- $(top_builddir)/src/testing/libgnunettesting.la \
  $(GN_LIBINTL)
-gnunet_testing_run_service_DEPENDENCIES = \
-  libgnunettesting.la
 
 
 check_PROGRAMS = \
  test_testing_portreservation \
+ test_testing_servicestartup \
  test_testing_peerstartup \
- test_testing_servicestartup
+ test_testing_peerstartup2 \
+ 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 \
+ test_testing_peerstartup2 \
  test_testing_servicestartup
 endif
 
@@ -65,12 +77,24 @@ test_testing_peerstartup_LDADD = \
  $(top_builddir)/src/testing/libgnunettesting.la \
  $(top_builddir)/src/util/libgnunetutil.la
 
+test_testing_peerstartup2_SOURCES = \
+ test_testing_peerstartup2.c
+test_testing_peerstartup2_LDADD = \
+ $(top_builddir)/src/testing/libgnunettesting.la \
+ $(top_builddir)/src/util/libgnunetutil.la
+
 test_testing_servicestartup_SOURCES = \
  test_testing_servicestartup.c
 test_testing_servicestartup_LDADD = \
  $(top_builddir)/src/testing/libgnunettesting.la \
  $(top_builddir)/src/util/libgnunetutil.la
 
+test_testing_sharedservices_SOURCES = \
+ test_testing_sharedservices.c
+test_testing_sharedservices_LDADD = \
+ $(top_builddir)/src/testing/libgnunettesting.la \
+ $(top_builddir)/src/util/libgnunetutil.la
 
 EXTRA_DIST = \
   test_testing_defaults.conf
+