X-Git-Url: https://git.librecmc.org/?a=blobdiff_plain;f=src%2Fstatistics%2FMakefile.am;h=0907c4a37134fa6c87cceb74e6244d7aa176f38d;hb=5b32752cd7b02adcb8e6fec7798637638c6f63a0;hp=5485a9c189d578cd0701ce9cd936404582c14207;hpb=8bdc9a4b52d7b36c2beacdf645a64d4f200ec280;p=oweals%2Fgnunet.git

diff --git a/src/statistics/Makefile.am b/src/statistics/Makefile.am
index 5485a9c18..0907c4a37 100644
--- a/src/statistics/Makefile.am
+++ b/src/statistics/Makefile.am
@@ -1,7 +1,8 @@
-INCLUDES = -I$(top_srcdir)/src/include
+# This Makefile.am is in the public domain
+AM_CPPFLAGS = -I$(top_srcdir)/src/include
 
 if MINGW
- WINFLAGS = -Wl,--no-undefined -Wl,--export-all-symbols 
+ WINFLAGS = -Wl,--no-undefined -Wl,--export-all-symbols
 endif
 
 if USE_COVERAGE
@@ -11,6 +12,8 @@ endif
 
 pkgcfgdir= $(pkgdatadir)/config.d/
 
+libexecdir= $(pkglibdir)/libexec/
+
 pkgcfg_DATA = \
   statistics.conf
 
@@ -23,67 +26,67 @@ libgnunetstatistics_la_LIBADD = \
   $(GN_LIBINTL) $(XLIB)
 libgnunetstatistics_la_LDFLAGS = \
   $(GN_LIB_LDFLAGS)  $(WINFLAGS) \
-  -version-info 1:1:1
+  -version-info 2:0:0
 
+libexec_PROGRAMS = \
+ gnunet-service-statistics
 
 bin_PROGRAMS = \
- gnunet-statistics \
- gnunet-service-statistics
+ gnunet-statistics
 
 gnunet_statistics_SOURCES = \
- gnunet-statistics.c         
+ 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.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 \
  test_statistics_api_loop \
  test_statistics_api_watch \
- test_statistics_api_watch_zero_value 
+ test_statistics_api_watch_zero_value
 
 if ENABLE_TEST_RUN
+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 \
-  $(top_builddir)/src/util/libgnunetutil.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 \
-  $(top_builddir)/src/util/libgnunetutil.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 \
-  $(top_builddir)/src/util/libgnunetutil.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 \
-  $(top_builddir)/src/util/libgnunetutil.la  
+  libgnunetstatistics.la \
+  $(top_builddir)/src/util/libgnunetutil.la
 
+if HAVE_PYTHON
 check_SCRIPTS = \
   test_gnunet_statistics.py
+endif
 
 do_subst = $(SED) -e 's,[@]PYTHON[@],$(PYTHON),g'
 
@@ -98,5 +101,3 @@ test_gnunet_statistics.py: test_gnunet_statistics.py.in Makefile
 EXTRA_DIST = \
   test_statistics_api_data.conf \
   test_gnunet_statistics.py.in
-
-