-fix off-by-1

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

diff --git a/src/statistics/Makefile.am b/src/statistics/Makefile.am
index 3baea558056b2ecc0d34a79612ebb35861586ca3..1168fd476562e6c5d35a8b6fe2c17398a5e1a9a0 100644 (file)
--- a/src/statistics/Makefile.am
+++ b/src/statistics/Makefile.am
@@ -1,3 +1,4 @@
+# This Makefile.am is in the public domain
 AM_CPPFLAGS = -I$(top_srcdir)/src/include
 
 if MINGW
@@ -25,7 +26,7 @@ libgnunetstatistics_la_LIBADD = \
   $(GN_LIBINTL) $(XLIB)
 libgnunetstatistics_la_LDFLAGS = \
   $(GN_LIB_LDFLAGS)  $(WINFLAGS) \
-  -version-info 1:2:1
+  -version-info 1:3:1
 
 libexec_PROGRAMS = \
  gnunet-service-statistics
@@ -36,20 +37,16 @@ bin_PROGRAMS = \
 gnunet_statistics_SOURCES = \
  gnunet-statistics.c         
 gnunet_statistics_LDADD = \
-  $(top_builddir)/src/statistics/libgnunetstatistics.la \
+  libgnunetstatistics.la \
   $(top_builddir)/src/util/libgnunetutil.la \
   $(GN_LIBINTL)
-gnunet_statistics_DEPENDENCIES = \
-  libgnunetstatistics.la                                
 
 gnunet_service_statistics_SOURCES = \
  gnunet-service-statistics.c         
 gnunet_service_statistics_LDADD = \
-  $(top_builddir)/src/statistics/libgnunetstatistics.la \
+  libgnunetstatistics.la \
   $(top_builddir)/src/util/libgnunetutil.la \
   $(GN_LIBINTL)
-gnunet_service_statistics_DEPENDENCIES = \
-  libgnunetstatistics.la                                
 
 check_PROGRAMS = \
  test_statistics_api \
@@ -58,32 +55,32 @@ check_PROGRAMS = \
  test_statistics_api_watch_zero_value 
 
 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 = $(check_PROGRAMS) $(check_SCRIPTS)
 endif
 
 test_statistics_api_SOURCES = \
  test_statistics_api.c
 test_statistics_api_LDADD = \
-  $(top_builddir)/src/statistics/libgnunetstatistics.la \
+  libgnunetstatistics.la \
   $(top_builddir)/src/util/libgnunetutil.la  
 
 test_statistics_api_loop_SOURCES = \
  test_statistics_api_loop.c
 test_statistics_api_loop_LDADD = \
-  $(top_builddir)/src/statistics/libgnunetstatistics.la \
+  libgnunetstatistics.la \
   $(top_builddir)/src/util/libgnunetutil.la  
 
 test_statistics_api_watch_SOURCES = \
  test_statistics_api_watch.c
 test_statistics_api_watch_LDADD = \
-  $(top_builddir)/src/statistics/libgnunetstatistics.la \
+  libgnunetstatistics.la \
   $(top_builddir)/src/util/libgnunetutil.la  
 
 test_statistics_api_watch_zero_value_SOURCES = \
  test_statistics_api_watch_zero_value.c
 test_statistics_api_watch_zero_value_LDADD = \
-  $(top_builddir)/src/statistics/libgnunetstatistics.la \
+  libgnunetstatistics.la \
   $(top_builddir)/src/util/libgnunetutil.la  
 
 if HAVE_PYTHON