aboutsummaryrefslogtreecommitdiff
path: root/src/statistics/Makefile.am
diff options
context:
space:
mode:
authorChristian Grothoff <christian@grothoff.org>2016-06-21 18:29:03 +0000
committerChristian Grothoff <christian@grothoff.org>2016-06-21 18:29:03 +0000
commit3d7b29ec1c5d1c2de96cf4c9badaa112e86ef899 (patch)
treeb586e13615fe58377cef5c0a238a677e5fd8f609 /src/statistics/Makefile.am
parent1732154b8c021e7ee0e34c28cf3b1a843454727a (diff)
downloadgnunet-3d7b29ec1c5d1c2de96cf4c9badaa112e86ef899.tar.gz
gnunet-3d7b29ec1c5d1c2de96cf4c9badaa112e86ef899.zip
update statistics API to use new MQ API style, also get rid of timeout argument
Diffstat (limited to 'src/statistics/Makefile.am')
-rw-r--r--src/statistics/Makefile.am22
1 files changed, 10 insertions, 12 deletions
diff --git a/src/statistics/Makefile.am b/src/statistics/Makefile.am
index 1168fd476..0907c4a37 100644
--- a/src/statistics/Makefile.am
+++ b/src/statistics/Makefile.am
@@ -2,7 +2,7 @@
2AM_CPPFLAGS = -I$(top_srcdir)/src/include 2AM_CPPFLAGS = -I$(top_srcdir)/src/include
3 3
4if MINGW 4if MINGW
5 WINFLAGS = -Wl,--no-undefined -Wl,--export-all-symbols 5 WINFLAGS = -Wl,--no-undefined -Wl,--export-all-symbols
6endif 6endif
7 7
8if USE_COVERAGE 8if USE_COVERAGE
@@ -26,23 +26,23 @@ libgnunetstatistics_la_LIBADD = \
26 $(GN_LIBINTL) $(XLIB) 26 $(GN_LIBINTL) $(XLIB)
27libgnunetstatistics_la_LDFLAGS = \ 27libgnunetstatistics_la_LDFLAGS = \
28 $(GN_LIB_LDFLAGS) $(WINFLAGS) \ 28 $(GN_LIB_LDFLAGS) $(WINFLAGS) \
29 -version-info 1:3:1 29 -version-info 2:0:0
30 30
31libexec_PROGRAMS = \ 31libexec_PROGRAMS = \
32 gnunet-service-statistics 32 gnunet-service-statistics
33 33
34bin_PROGRAMS = \ 34bin_PROGRAMS = \
35 gnunet-statistics 35 gnunet-statistics
36 36
37gnunet_statistics_SOURCES = \ 37gnunet_statistics_SOURCES = \
38 gnunet-statistics.c 38 gnunet-statistics.c
39gnunet_statistics_LDADD = \ 39gnunet_statistics_LDADD = \
40 libgnunetstatistics.la \ 40 libgnunetstatistics.la \
41 $(top_builddir)/src/util/libgnunetutil.la \ 41 $(top_builddir)/src/util/libgnunetutil.la \
42 $(GN_LIBINTL) 42 $(GN_LIBINTL)
43 43
44gnunet_service_statistics_SOURCES = \ 44gnunet_service_statistics_SOURCES = \
45 gnunet-service-statistics.c 45 gnunet-service-statistics.c
46gnunet_service_statistics_LDADD = \ 46gnunet_service_statistics_LDADD = \
47 libgnunetstatistics.la \ 47 libgnunetstatistics.la \
48 $(top_builddir)/src/util/libgnunetutil.la \ 48 $(top_builddir)/src/util/libgnunetutil.la \
@@ -52,7 +52,7 @@ check_PROGRAMS = \
52 test_statistics_api \ 52 test_statistics_api \
53 test_statistics_api_loop \ 53 test_statistics_api_loop \
54 test_statistics_api_watch \ 54 test_statistics_api_watch \
55 test_statistics_api_watch_zero_value 55 test_statistics_api_watch_zero_value
56 56
57if ENABLE_TEST_RUN 57if ENABLE_TEST_RUN
58AM_TESTS_ENVIRONMENT=export GNUNET_PREFIX=$${GNUNET_PREFIX:-@libdir@};export PATH=$${GNUNET_PREFIX:-@prefix@}/bin:$$PATH; 58AM_TESTS_ENVIRONMENT=export GNUNET_PREFIX=$${GNUNET_PREFIX:-@libdir@};export PATH=$${GNUNET_PREFIX:-@prefix@}/bin:$$PATH;
@@ -63,25 +63,25 @@ test_statistics_api_SOURCES = \
63 test_statistics_api.c 63 test_statistics_api.c
64test_statistics_api_LDADD = \ 64test_statistics_api_LDADD = \
65 libgnunetstatistics.la \ 65 libgnunetstatistics.la \
66 $(top_builddir)/src/util/libgnunetutil.la 66 $(top_builddir)/src/util/libgnunetutil.la
67 67
68test_statistics_api_loop_SOURCES = \ 68test_statistics_api_loop_SOURCES = \
69 test_statistics_api_loop.c 69 test_statistics_api_loop.c
70test_statistics_api_loop_LDADD = \ 70test_statistics_api_loop_LDADD = \
71 libgnunetstatistics.la \ 71 libgnunetstatistics.la \
72 $(top_builddir)/src/util/libgnunetutil.la 72 $(top_builddir)/src/util/libgnunetutil.la
73 73
74test_statistics_api_watch_SOURCES = \ 74test_statistics_api_watch_SOURCES = \
75 test_statistics_api_watch.c 75 test_statistics_api_watch.c
76test_statistics_api_watch_LDADD = \ 76test_statistics_api_watch_LDADD = \
77 libgnunetstatistics.la \ 77 libgnunetstatistics.la \
78 $(top_builddir)/src/util/libgnunetutil.la 78 $(top_builddir)/src/util/libgnunetutil.la
79 79
80test_statistics_api_watch_zero_value_SOURCES = \ 80test_statistics_api_watch_zero_value_SOURCES = \
81 test_statistics_api_watch_zero_value.c 81 test_statistics_api_watch_zero_value.c
82test_statistics_api_watch_zero_value_LDADD = \ 82test_statistics_api_watch_zero_value_LDADD = \
83 libgnunetstatistics.la \ 83 libgnunetstatistics.la \
84 $(top_builddir)/src/util/libgnunetutil.la 84 $(top_builddir)/src/util/libgnunetutil.la
85 85
86if HAVE_PYTHON 86if HAVE_PYTHON
87check_SCRIPTS = \ 87check_SCRIPTS = \
@@ -101,5 +101,3 @@ test_gnunet_statistics.py: test_gnunet_statistics.py.in Makefile
101EXTRA_DIST = \ 101EXTRA_DIST = \
102 test_statistics_api_data.conf \ 102 test_statistics_api_data.conf \
103 test_gnunet_statistics.py.in 103 test_gnunet_statistics.py.in
104
105