X-Git-Url: https://git.librecmc.org/?a=blobdiff_plain;f=src%2Fset%2FMakefile.am;h=10f7ddc5d7046dee0bdc0166247943d5ba472809;hb=6a4d709e73096dde998015e5851b0022ecf8af0a;hp=bda512be697a8117c2a2591976839b13ae1cd0e3;hpb=1b4ccddc7946888fc0b66c58b1434e1814a43822;p=oweals%2Fgnunet.git

diff --git a/src/set/Makefile.am b/src/set/Makefile.am
index bda512be6..10f7ddc5d 100644
--- a/src/set/Makefile.am
+++ b/src/set/Makefile.am
@@ -16,8 +16,13 @@ if USE_COVERAGE
   AM_CFLAGS = -fprofile-arcs -ftest-coverage
 endif
 
+if HAVE_TESTING
+bin_PROGRAMS = \
+ gnunet-set-profiler
+
 noinst_PROGRAMS = \
- gnunet-set-profiler gnunet-set-ibf-profiler
+ gnunet-set-ibf-profiler
+endif
 
 libexec_PROGRAMS = \
  gnunet-service-set
@@ -29,6 +34,7 @@ gnunet_set_profiler_SOURCES = \
  gnunet-set-profiler.c
 gnunet_set_profiler_LDADD = \
   $(top_builddir)/src/util/libgnunetutil.la \
+  $(top_builddir)/src/statistics/libgnunetstatistics.la \
   libgnunetset.la \
   $(top_builddir)/src/testing/libgnunettesting.la \
   $(GN_LIBINTL)
@@ -50,9 +56,11 @@ gnunet_service_set_SOURCES = \
  gnunet-service-set_protocol.h
 gnunet_service_set_LDADD = \
   $(top_builddir)/src/util/libgnunetutil.la \
+  $(top_builddir)/src/statistics/libgnunetstatistics.la \
   $(top_builddir)/src/core/libgnunetcore.la \
-  $(top_builddir)/src/cadet/libgnunetcadet.la \
+  $(top_builddir)/src/cadet/libgnunetcadetnew.la \
   $(top_builddir)/src/block/libgnunetblock.la \
+  libgnunetset.la \
   $(GN_LIBINTL)
 
 libgnunetset_la_SOURCES = \
@@ -65,11 +73,14 @@ libgnunetset_la_LDFLAGS = \
 
 if HAVE_TESTING
 check_PROGRAMS = \
- test_set_api test_set_union_result_full test_set_intersection_result_full
+ test_set_api \
+ test_set_union_result_symmetric \
+ test_set_intersection_result_full \
+ test_set_union_copy
 endif
 
 if ENABLE_TEST_RUN
-AM_TESTS_ENVIRONMENT=export GNUNET_PREFIX=$${GNUNET_PREFIX:-@libdir@};export PATH=$${GNUNET_PREFIX:-@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
 
@@ -80,9 +91,9 @@ test_set_api_LDADD = \
   $(top_builddir)/src/testing/libgnunettesting.la \
   libgnunetset.la
 
-test_set_union_result_full_SOURCES = \
- test_set_union_result_full.c
-test_set_union_result_full_LDADD = \
+test_set_union_result_symmetric_SOURCES = \
+ test_set_union_result_symmetric.c
+test_set_union_result_symmetric_LDADD = \
   $(top_builddir)/src/util/libgnunetutil.la \
   $(top_builddir)/src/testing/libgnunettesting.la \
   libgnunetset.la
@@ -94,6 +105,12 @@ test_set_intersection_result_full_LDADD = \
   $(top_builddir)/src/testing/libgnunettesting.la \
   libgnunetset.la
 
+test_set_union_copy_SOURCES = \
+ test_set_union_copy.c
+test_set_union_copy_LDADD = \
+  $(top_builddir)/src/util/libgnunetutil.la \
+  $(top_builddir)/src/testing/libgnunettesting.la \
+  libgnunetset.la
+
 EXTRA_DIST = \
   test_set.conf
-