-ensure stats queues do not grow too big

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

diff --git a/src/testing/Makefile.am b/src/testing/Makefile.am
index c1b41c265d8f4fb180b475d186e49ba803bb0535..859d950fae0f837991663dbfc1f12c2bc5c14a1b 100644 (file)
--- a/src/testing/Makefile.am
+++ b/src/testing/Makefile.am
@@ -1,3 +1,4 @@
+# This Makefile.am is in the public domain
 AM_CPPFLAGS = -I$(top_srcdir)/src/include
 
 if MINGW
@@ -36,11 +37,9 @@ noinst_PROGRAMS = \
 gnunet_testing_SOURCES = \
  gnunet-testing.c         
 gnunet_testing_LDADD = \
- $(top_builddir)/src/testing/libgnunettesting.la \
+ libgnunettesting.la \
  $(top_builddir)/src/util/libgnunetutil.la \
  $(GN_LIBINTL)
-gnunet_testing_DEPENDENCIES = \
- libgnunettesting.la
 
 list_keys_SOURCES = \
  list-keys.c
@@ -57,7 +56,7 @@ check_PROGRAMS = \
  test_testing_sharedservices
 
 if ENABLE_TEST_RUN 
-TESTS_ENVIRONMENT=export GNUNET_PREFIX=@prefix@;export PATH=@prefix@/bin:$$PATH;
+AM_TESTS_ENVIRONMENT=export GNUNET_PREFIX=$${GNUNET_PREFIX:-@libdir@};export PATH=$${GNUNET_PREFIX:-@prefix@}/bin:$$PATH;
 TESTS = \
  test_testing_portreservation \
  test_testing_peerstartup \
@@ -68,31 +67,31 @@ endif
 test_testing_portreservation_SOURCES = \
  test_testing_portreservation.c
 test_testing_portreservation_LDADD = \
- $(top_builddir)/src/testing/libgnunettesting.la \
+ libgnunettesting.la \
  $(top_builddir)/src/util/libgnunetutil.la
 
 test_testing_peerstartup_SOURCES = \
  test_testing_peerstartup.c
 test_testing_peerstartup_LDADD = \
- $(top_builddir)/src/testing/libgnunettesting.la \
+ 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 \
+ 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 \
+ 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 \
+ libgnunettesting.la \
  $(top_builddir)/src/util/libgnunetutil.la
 
 EXTRA_DIST = \