gnunet-statistics can retrieve stats from remote hosts without config

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

diff --git a/src/statistics/Makefile.am b/src/statistics/Makefile.am
index 8ea7e93d2672cd1764bba065eebd621bb8b007f8..5485a9c189d578cd0701ce9cd936404582c14207 100644 (file)
--- a/src/statistics/Makefile.am
+++ b/src/statistics/Makefile.am
@@ -11,7 +11,7 @@ endif
 
 pkgcfgdir= $(pkgdatadir)/config.d/
 
-dist_pkgcfg_DATA = \
+pkgcfg_DATA = \
   statistics.conf
 
 lib_LTLIBRARIES = libgnunetstatistics.la
@@ -23,7 +23,7 @@ libgnunetstatistics_la_LIBADD = \
   $(GN_LIBINTL) $(XLIB)
 libgnunetstatistics_la_LDFLAGS = \
   $(GN_LIB_LDFLAGS)  $(WINFLAGS) \
-  -version-info 1:0:1
+  -version-info 1:1:1
 
 
 bin_PROGRAMS = \
@@ -51,7 +51,8 @@ gnunet_service_statistics_DEPENDENCIES = \
 check_PROGRAMS = \
  test_statistics_api \
  test_statistics_api_loop \
- test_statistics_api_watch 
+ test_statistics_api_watch \
+ test_statistics_api_watch_zero_value 
 
 if ENABLE_TEST_RUN
 TESTS = $(check_PROGRAMS) $(check_SCRIPTS)
@@ -75,11 +76,27 @@ test_statistics_api_watch_LDADD = \
   $(top_builddir)/src/statistics/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 \
+  $(top_builddir)/src/util/libgnunetutil.la  
+
 check_SCRIPTS = \
-  test_gnunet_statistics.sh
+  test_gnunet_statistics.py
+
+do_subst = $(SED) -e 's,[@]PYTHON[@],$(PYTHON),g'
+
+%.py: %.py.in Makefile
+       $(do_subst) < $(srcdir)/$< > $@
+       chmod +x $@
+
+test_gnunet_statistics.py: test_gnunet_statistics.py.in Makefile
+       $(do_subst) < $(srcdir)/test_gnunet_statistics.py.in > test_gnunet_statistics.py
+       chmod +x test_gnunet_statistics.py
 
 EXTRA_DIST = \
   test_statistics_api_data.conf \
-  $(check_SCRIPTS) 
+  test_gnunet_statistics.py.in