AM_CFLAGS = -fprofile-arcs -ftest-coverage
endif
-bin_PROGRAMS = \
+noinst_PROGRAMS = \
gnunet-set-profiler gnunet-set-ibf-profiler
libexec_PROGRAMS = \
gnunet-set-profiler.c
gnunet_set_profiler_LDADD = \
$(top_builddir)/src/util/libgnunetutil.la \
- $(top_builddir)/src/set/libgnunetset.la \
+ libgnunetset.la \
$(top_builddir)/src/testing/libgnunettesting.la \
$(GN_LIBINTL)
-gnunet_set_profiler_DEPENDENCIES = \
- libgnunetset.la
gnunet_set_ibf_profiler_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/core/libgnunetcore.la \
- $(top_builddir)/src/mesh/libgnunetmesh.la \
+ $(top_builddir)/src/cadet/libgnunetcadet.la \
$(top_builddir)/src/block/libgnunetblock.la \
$(GN_LIBINTL)
if HAVE_TESTING
check_PROGRAMS = \
- test_set_api test_set_union_result_full
+ test_set_api test_set_union_result_full test_set_intersection_result_full
endif
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;
TESTS = $(check_PROGRAMS)
endif
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_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 = \
+ test_set_intersection_result_full.c
+test_set_intersection_result_full_LDADD = \
+ $(top_builddir)/src/util/libgnunetutil.la \
+ $(top_builddir)/src/testing/libgnunettesting.la \
libgnunetset.la
EXTRA_DIST = \