fix state when requesting full IBF

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

diff --git a/src/set/Makefile.am b/src/set/Makefile.am
index 7dc26944666b3baa2f59ba1a32f235ac4acbfcec..10f7ddc5d7046dee0bdc0166247943d5ba472809 100644 (file)
--- a/src/set/Makefile.am
+++ b/src/set/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/
@@ -15,8 +16,13 @@ if USE_COVERAGE
   AM_CFLAGS = -fprofile-arcs -ftest-coverage
 endif
 
+if HAVE_TESTING
 bin_PROGRAMS = \
- gnunet-set-profiler gnunet-set-ibf-profiler
+ gnunet-set-profiler
+
+noinst_PROGRAMS = \
+ gnunet-set-ibf-profiler
+endif
 
 libexec_PROGRAMS = \
  gnunet-service-set
@@ -28,11 +34,10 @@ gnunet_set_profiler_SOURCES = \
  gnunet-set-profiler.c
 gnunet_set_profiler_LDADD = \
   $(top_builddir)/src/util/libgnunetutil.la \
-  $(top_builddir)/src/set/libgnunetset.la \
+  $(top_builddir)/src/statistics/libgnunetstatistics.la \
+  libgnunetset.la \
   $(top_builddir)/src/testing/libgnunettesting.la \
   $(GN_LIBINTL)
-gnunet_set_profiler_DEPENDENCIES = \
-  libgnunetset.la
 
 
 gnunet_set_ibf_profiler_SOURCES = \
@@ -47,13 +52,15 @@ gnunet_service_set_SOURCES = \
  gnunet-service-set_union.c \
  gnunet-service-set_intersection.c \
  ibf.c ibf.h \
- strata_estimator.c strata_estimator.h \
- set_protocol.h
+ gnunet-service-set_union_strata_estimator.c gnunet-service-set_union_strata_estimator.h \
+ 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 = \
@@ -66,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
 
@@ -79,17 +89,13 @@ test_set_api_SOURCES = \
 test_set_api_LDADD = \
   $(top_builddir)/src/util/libgnunetutil.la \
   $(top_builddir)/src/testing/libgnunettesting.la \
-  $(top_builddir)/src/set/libgnunetset.la
-test_set_api_DEPENDENCIES = \
   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 \
-  $(top_builddir)/src/set/libgnunetset.la
-test_set_union_result_full_DEPENDENCIES = \
   libgnunetset.la
 
 test_set_intersection_result_full_SOURCES = \
@@ -97,10 +103,14 @@ test_set_intersection_result_full_SOURCES = \
 test_set_intersection_result_full_LDADD = \
   $(top_builddir)/src/util/libgnunetutil.la \
   $(top_builddir)/src/testing/libgnunettesting.la \
-  $(top_builddir)/src/set/libgnunetset.la
-test_set_intersection_result_full_DEPENDENCIES = \
+  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
-