use new connecT API

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

diff --git a/src/consensus/Makefile.am b/src/consensus/Makefile.am
index a6222b69c57cb75fc8c5adef18b7de8b581b308b..c63434f94809bb99cc0b5fc00f7b842b3c6f71ee 100644 (file)
--- a/src/consensus/Makefile.am
+++ b/src/consensus/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/
@@ -21,8 +22,7 @@ bin_PROGRAMS = \
 libexec_PROGRAMS = \
  gnunet-service-consensus
 
-# FIXME: add option "configure --with-evil"?
-if HAVE_EXPERIMENTAL
+if ENABLE_MALICIOUS
 libexec_PROGRAMS += \
  gnunet-service-evil-consensus
 endif
@@ -34,22 +34,18 @@ gnunet_consensus_profiler_SOURCES = \
  gnunet-consensus-profiler.c
 gnunet_consensus_profiler_LDADD = \
   $(top_builddir)/src/util/libgnunetutil.la \
-  $(top_builddir)/src/consensus/libgnunetconsensus.la \
+  libgnunetconsensus.la \
   $(top_builddir)/src/testbed/libgnunettestbed.la \
   $(GN_LIBINTL)
-gnunet_consensus_profiler_DEPENDENCIES = \
-  libgnunetconsensus.la
 
 gnunet_service_consensus_SOURCES = \
  gnunet-service-consensus.c
 gnunet_service_consensus_LDADD = \
   $(top_builddir)/src/util/libgnunetutil.la \
   $(top_builddir)/src/core/libgnunetcore.la \
-  $(top_builddir)/src/mesh/libgnunetmesh.la \
   $(top_builddir)/src/set/libgnunetset.la \
+  $(top_builddir)/src/statistics/libgnunetstatistics.la \
   $(GN_LIBINTL)
-gnunet_service_consensus_DEPENDENCIES = \
-  $(top_builddir)/src/set/libgnunetset.la
 
 gnunet_service_evil_consensus_SOURCES = \
  gnunet-service-consensus.c \
@@ -57,11 +53,9 @@ gnunet_service_evil_consensus_SOURCES = \
 gnunet_service_evil_consensus_LDADD = \
   $(top_builddir)/src/util/libgnunetutil.la \
   $(top_builddir)/src/core/libgnunetcore.la \
-  $(top_builddir)/src/mesh/libgnunetmesh.la \
   $(top_builddir)/src/set/libgnunetset.la \
+  $(top_builddir)/src/statistics/libgnunetstatistics.la \
   $(GN_LIBINTL)
-gnunet_service_evil_consensus_DEPENDENCIES = \
-  $(top_builddir)/src/set/libgnunetset.la
 gnunet_service_evil_consensus_CFLAGS = -DEVIL
 
 libgnunetconsensus_la_SOURCES = \
@@ -86,8 +80,7 @@ test_consensus_api_SOURCES = \
 test_consensus_api_LDADD = \
   $(top_builddir)/src/util/libgnunetutil.la \
   $(top_builddir)/src/testing/libgnunettesting.la \
-  $(top_builddir)/src/consensus/libgnunetconsensus.la
+  libgnunetconsensus.la
 
 EXTRA_DIST = \
   test_consensus.conf
-