-fixing misc issues and bugs, including better termination logic for intersection...

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

diff --git a/src/set/Makefile.am b/src/set/Makefile.am
index 71e71c86715e9cc3fe88e691f94d0d028c817f5d..f0e05caa14589bc979814745d01d4bf8081c9f3a 100644 (file)
--- a/src/set/Makefile.am
+++ b/src/set/Makefile.am
@@ -1,4 +1,4 @@
-INCLUDES = -I$(top_srcdir)/src/include
+AM_CPPFLAGS = -I$(top_srcdir)/src/include
 
 pkgcfgdir= $(pkgdatadir)/config.d/
 
@@ -8,15 +8,15 @@ pkgcfg_DATA = \
   set.conf
 
 if MINGW
- WINFLAGS = -Wl,--no-undefined -Wl,--export-all-symbols 
+ WINFLAGS = -Wl,--no-undefined -Wl,--export-all-symbols
 endif
 
 if USE_COVERAGE
   AM_CFLAGS = -fprofile-arcs -ftest-coverage
 endif
 
-bin_PROGRAMS = \
- gnunet-set
+noinst_PROGRAMS = \
+ gnunet-set-profiler gnunet-set-ibf-profiler
 
 libexec_PROGRAMS = \
  gnunet-service-set
@@ -24,42 +24,51 @@ libexec_PROGRAMS = \
 lib_LTLIBRARIES = \
   libgnunetset.la
 
-gnunet_set_SOURCES = \
- gnunet-set.c
-gnunet_set_LDADD = \
+gnunet_set_profiler_SOURCES = \
+ gnunet-set-profiler.c
+gnunet_set_profiler_LDADD = \
+  $(top_builddir)/src/util/libgnunetutil.la \
+  libgnunetset.la \
+  $(top_builddir)/src/testing/libgnunettesting.la \
+  $(GN_LIBINTL)
+
+
+gnunet_set_ibf_profiler_SOURCES = \
+ gnunet-set-ibf-profiler.c \
+ ibf.c
+gnunet_set_ibf_profiler_LDADD = \
   $(top_builddir)/src/util/libgnunetutil.la \
-  $(top_builddir)/src/set/libgnunetset.la \
-  $(top_builddir)/src/stream/libgnunetstream.la \
-  $(top_builddir)/src/testbed/libgnunettestbed.la \
   $(GN_LIBINTL)
-gnunet_set_DEPENDENCIES = \
-  libgnunetset.la
 
 gnunet_service_set_SOURCES = \
- gnunet-service-set.c \
+ gnunet-service-set.c gnunet-service-set.h \
  gnunet-service-set_union.c \
- ibf.c \
- strata_estimator.c
+ gnunet-service-set_intersection.c \
+ ibf.c ibf.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/stream/libgnunetstream.la \
-  $(top_builddir)/src/mesh/libgnunetmesh.la \
+  $(top_builddir)/src/cadet/libgnunetcadet.la \
+  $(top_builddir)/src/block/libgnunetblock.la \
   $(GN_LIBINTL)
 
 libgnunetset_la_SOURCES = \
-  set_api.c
+  set_api.c set.h
 libgnunetset_la_LIBADD = \
   $(top_builddir)/src/util/libgnunetutil.la \
-  $(top_builddir)/src/stream/libgnunetstream.la \
   $(LTLIBINTL)
 libgnunetset_la_LDFLAGS = \
   $(GN_LIB_LDFLAGS)
 
+if HAVE_TESTING
 check_PROGRAMS = \
- test_set_api 
+ test_set_api test_set_union_result_full test_set_intersection_result_full
+endif
 
 if ENABLE_TEST_RUN
+AM_TESTS_ENVIRONMENT=export GNUNET_PREFIX=$${GNUNET_PREFIX:-@libdir@};export PATH=$${GNUNET_PREFIX:-@prefix@}/bin:$$PATH;
 TESTS = $(check_PROGRAMS)
 endif
 
@@ -68,8 +77,20 @@ 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 = \
+  $(top_builddir)/src/util/libgnunetutil.la \
+  $(top_builddir)/src/testing/libgnunettesting.la \
+  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 = \