X-Git-Url: https://git.librecmc.org/?a=blobdiff_plain;f=src%2Fset%2FMakefile.am;h=a2ca25f94e96d0ad91884d95aef5807452607bb7;hb=fdbe690beeec04066f18302401096eb5212c3f6a;hp=a4c4fa6be25bdd62f5ac3fa518dead0b12af0d2f;hpb=490b07064ed2f8a26ab63d2ea050f5583cccb3d0;p=oweals%2Fgnunet.git

diff --git a/src/set/Makefile.am b/src/set/Makefile.am
index a4c4fa6be..a2ca25f94 100644
--- 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/
 
@@ -16,7 +16,7 @@ if USE_COVERAGE
 endif
 
 bin_PROGRAMS = \
- gnunet-set gnunet-set-bug
+ gnunet-set-profiler gnunet-set-ibf-profiler
 
 libexec_PROGRAMS = \
  gnunet-service-set
@@ -24,56 +24,49 @@ 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 \
   $(top_builddir)/src/set/libgnunetset.la \
-  $(top_builddir)/src/stream/libgnunetstream.la \
-  $(top_builddir)/src/testbed/libgnunettestbed.la \
+  $(top_builddir)/src/testing/libgnunettesting.la \
   $(GN_LIBINTL)
-gnunet_set_DEPENDENCIES = \
+gnunet_set_profiler_DEPENDENCIES = \
   libgnunetset.la
 
-gnunet_set_bug_SOURCES = \
- gnunet-set-bug.c \
- mq.c
-gnunet_set_bug_LDADD = \
+
+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/stream/libgnunetstream.la \
   $(GN_LIBINTL)
-# hack for mq.c, see automake Objects ‘created with both libtool and without’
-# remove once GNUNET_MQ is in util/
-gnunet_set_bug_CFLAGS = $(AM_CFLAGS)
 
 gnunet_service_set_SOURCES = \
  gnunet-service-set.c \
  gnunet-service-set_union.c \
- mq.c \
+ gnunet-service-set_intersection.c \
  ibf.c \
  strata_estimator.c
 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/block/libgnunetblock.la \
   $(GN_LIBINTL)
-# hack for mq.c, see automake Objects ‘created with both libtool and without’
-# remove once GNUNET_MQ is in util/
-gnunet_service_set_CFLAGS = $(AM_CFLAGS)
 
 libgnunetset_la_SOURCES = \
-  set_api.c \
-  mq.c
+  set_api.c
 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
+endif
 
 if ENABLE_TEST_RUN
 TESTS = $(check_PROGRAMS)
@@ -88,6 +81,15 @@ test_set_api_LDADD = \
 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 \
+  $(top_builddir)/src/set/libgnunetset.la
+test_set_union_result_full_DEPENDENCIES = \
+  libgnunetset.la
+
 EXTRA_DIST = \
   test_set.conf