guix-env: some update.

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

diff --git a/src/peerinfo/Makefile.am b/src/peerinfo/Makefile.am
index 13a763b476e0a8b2c8a5b52668aa4ee6b7acb295..eeb5ee54e9bce23826fa45b612db82a7a8205840 100644 (file)
--- a/src/peerinfo/Makefile.am
+++ b/src/peerinfo/Makefile.am
@@ -1,8 +1,11 @@
-INCLUDES = -I$(top_srcdir)/src/include
+# This Makefile.am is in the public domain
+AM_CPPFLAGS = -I$(top_srcdir)/src/include
 
 pkgcfgdir= $(pkgdatadir)/config.d/
 
-dist_pkgcfg_DATA = \
+libexecdir= $(pkglibdir)/libexec/
+
+pkgcfg_DATA = \
   peerinfo.conf
 
 if MINGW
@@ -22,48 +25,82 @@ libgnunetpeerinfo_la_SOURCES = \
 libgnunetpeerinfo_la_LIBADD = \
   $(top_builddir)/src/hello/libgnunethello.la \
   $(top_builddir)/src/util/libgnunetutil.la \
-  $(XLIB)
+  $(XLIB) \
+  $(LTLIBINTL)
 libgnunetpeerinfo_la_LDFLAGS = \
   $(GN_LIB_LDFLAGS) $(WINFLAGS) \
   -version-info 0:0:0
 
 
-bin_PROGRAMS = \
+libexec_PROGRAMS = \
  gnunet-service-peerinfo
 
 gnunet_service_peerinfo_SOURCES = \
- gnunet-service-peerinfo.c         
+ gnunet-service-peerinfo.c
 gnunet_service_peerinfo_LDADD = \
   $(top_builddir)/src/hello/libgnunethello.la \
   $(top_builddir)/src/statistics/libgnunetstatistics.la \
-  $(top_builddir)/src/util/libgnunetutil.la 
+  $(top_builddir)/src/util/libgnunetutil.la
 
 if HAVE_BENCHMARKS
  PEERINFO_BENCHMARKS = \
  perf_peerinfo_api
 endif
 
+if HAVE_TESTING
 check_PROGRAMS = \
+ test_peerinfo_shipped_hellos \
  test_peerinfo_api \
- $(PEERINFO_BENCHMARKS) 
+ test_peerinfo_api_friend_only \
+ test_peerinfo_api_notify_friend_only \
+ $(PEERINFO_BENCHMARKS)
+endif
+
 
 if ENABLE_TEST_RUN
+AM_TESTS_ENVIRONMENT=export GNUNET_PREFIX=$${GNUNET_PREFIX:-@libdir@};export PATH=$${GNUNET_PREFIX:-@prefix@}/bin:$$PATH;unset XDG_DATA_HOME;unset XDG_CONFIG_HOME;
 TESTS = $(check_PROGRAMS)
 endif
 
+test_peerinfo_shipped_hellos_SOURCES = \
+ test_peerinfo_shipped_hellos.c
+test_peerinfo_shipped_hellos_LDADD = \
+ $(top_builddir)/src/hello/libgnunethello.la \
+ libgnunetpeerinfo.la \
+ $(top_builddir)/src/testing/libgnunettesting.la \
+ $(top_builddir)/src/util/libgnunetutil.la
+
 test_peerinfo_api_SOURCES = \
  test_peerinfo_api.c
 test_peerinfo_api_LDADD = \
  $(top_builddir)/src/hello/libgnunethello.la \
- $(top_builddir)/src/peerinfo/libgnunetpeerinfo.la \
- $(top_builddir)/src/util/libgnunetutil.la  
+ libgnunetpeerinfo.la \
+ $(top_builddir)/src/testing/libgnunettesting.la \
+ $(top_builddir)/src/util/libgnunetutil.la
+
+test_peerinfo_api_friend_only_SOURCES = \
+ test_peerinfo_api_friend_only.c
+test_peerinfo_api_friend_only_LDADD = \
+ $(top_builddir)/src/hello/libgnunethello.la \
+ libgnunetpeerinfo.la \
+ $(top_builddir)/src/testing/libgnunettesting.la \
+ $(top_builddir)/src/util/libgnunetutil.la
+
+test_peerinfo_api_notify_friend_only_SOURCES = \
+ test_peerinfo_api_notify_friend_only.c
+test_peerinfo_api_notify_friend_only_LDADD = \
+ $(top_builddir)/src/hello/libgnunethello.la \
+ libgnunetpeerinfo.la \
+ $(top_builddir)/src/testing/libgnunettesting.la \
+ $(top_builddir)/src/util/libgnunetutil.la
 
 perf_peerinfo_api_SOURCES = \
  perf_peerinfo_api.c
 perf_peerinfo_api_LDADD = \
  $(top_builddir)/src/hello/libgnunethello.la \
- $(top_builddir)/src/peerinfo/libgnunetpeerinfo.la \
- $(top_builddir)/src/util/libgnunetutil.la  
+ libgnunetpeerinfo.la \
+ $(top_builddir)/src/testing/libgnunettesting.la \
+ $(top_builddir)/src/util/libgnunetutil.la
 
 EXTRA_DIST = \
-  test_peerinfo_api_data.conf 
+  test_peerinfo_api_data.conf