Merge branch 'master' of ssh://gnunet.org/gnunet

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

diff --git a/src/secretsharing/Makefile.am b/src/secretsharing/Makefile.am
index 556356b6ffae16f646639c0f2f9e7940786061c6..485183e36f6c0a9f6db25aa3f582942b704145e4 100644 (file)
--- a/src/secretsharing/Makefile.am
+++ b/src/secretsharing/Makefile.am
@@ -1,3 +1,4 @@
+# This Makefile.am is in the public domain
 AM_CPPFLAGS = -I$(top_srcdir)/src/include
 
 pkgcfgdir= $(pkgdatadir)/config.d/
@@ -29,12 +30,10 @@ lib_LTLIBRARIES = \
 gnunet_secretsharing_profiler_SOURCES = \
  gnunet-secretsharing-profiler.c
 gnunet_secretsharing_profiler_LDADD = \
-  $(top_builddir)/src/util/libgnunetutil.la \
-  $(top_builddir)/src/secretsharing/libgnunetsecretsharing.la \
+  libgnunetsecretsharing.la \
   $(top_builddir)/src/testbed/libgnunettestbed.la \
+  $(top_builddir)/src/util/libgnunetutil.la \
   $(GN_LIBINTL)
-gnunet_secretsharing_profiler_DEPENDENCIES = \
-  libgnunetsecretsharing.la
 
 gnunet_service_secretsharing_SOURCES = \
  gnunet-service-secretsharing.c \
@@ -46,8 +45,6 @@ gnunet_service_secretsharing_LDADD = \
   $(top_builddir)/src/consensus/libgnunetconsensus.la \
   $(LIBGCRYPT_LIBS) \
   $(GN_LIBINTL)
-gnunet_service_secretsharing_DEPENDENCIES = \
-  $(top_builddir)/src/set/libgnunetset.la
 
 libgnunetsecretsharing_la_SOURCES = \
   secretsharing_api.c \
@@ -59,21 +56,22 @@ libgnunetsecretsharing_la_LIBADD = \
 libgnunetsecretsharing_la_LDFLAGS = \
   $(GN_LIB_LDFLAGS)
 
+if HAVE_TESTING
 check_PROGRAMS = \
  test_secretsharing_api
 
 if ENABLE_TEST_RUN
-TESTS_ENVIRONMENT=export GNUNET_PREFIX=@prefix@;export PATH=@prefix@/bin:$$PATH;
+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
+endif
 
 test_secretsharing_api_SOURCES = \
  test_secretsharing_api.c
 test_secretsharing_api_LDADD = \
-  $(top_builddir)/src/util/libgnunetutil.la \
+  libgnunetsecretsharing.la \
   $(top_builddir)/src/testing/libgnunettesting.la \
-  $(top_builddir)/src/secretsharing/libgnunetsecretsharing.la
+  $(top_builddir)/src/util/libgnunetutil.la
 
 EXTRA_DIST = \
   test_secretsharing.conf
-