new timeout tests for WLAN and bluetooth

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

diff --git a/src/statistics/Makefile.am b/src/statistics/Makefile.am
index 09f1905f45a608c85ae1854cd0c44595f3bf495f..30d01661d197ef61a2003e8e638b478ffef1ddf4 100644 (file)
--- a/src/statistics/Makefile.am
+++ b/src/statistics/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 
@@ -11,6 +11,8 @@ endif
 
 pkgcfgdir= $(pkgdatadir)/config.d/
 
+libexecdir= $(pkglibdir)/libexec/
+
 pkgcfg_DATA = \
   statistics.conf
 
@@ -23,12 +25,13 @@ libgnunetstatistics_la_LIBADD = \
   $(GN_LIBINTL) $(XLIB)
 libgnunetstatistics_la_LDFLAGS = \
   $(GN_LIB_LDFLAGS)  $(WINFLAGS) \
-  -version-info 1:0:1
+  -version-info 1:2:1
 
+libexec_PROGRAMS = \
+ gnunet-service-statistics
 
 bin_PROGRAMS = \
- gnunet-statistics \
- gnunet-service-statistics
+ gnunet-statistics 
 
 gnunet_statistics_SOURCES = \
  gnunet-statistics.c         
@@ -82,11 +85,23 @@ test_statistics_api_watch_zero_value_LDADD = \
   $(top_builddir)/src/statistics/libgnunetstatistics.la \
   $(top_builddir)/src/util/libgnunetutil.la  
 
+if HAVE_PYTHON
 check_SCRIPTS = \
-  test_gnunet_statistics.sh
+  test_gnunet_statistics.py
+endif
+
+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