WIP commit of scalar product 2.0. It is unfinished and does not yet pass tests. This...

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

diff --git a/src/consensus/Makefile.am b/src/consensus/Makefile.am
index 10b22cc87798392ce9139345dee82a44fff96f1e..5d590f46728988fd9d3567943eab80a98d7501e4 100644 (file)
--- a/src/consensus/Makefile.am
+++ b/src/consensus/Makefile.am
@@ -1,4 +1,4 @@
-INCLUDES = -I$(top_srcdir)/src/include
+AM_CPPFLAGS = -I$(top_srcdir)/src/include
 
 pkgcfgdir= $(pkgdatadir)/config.d/
 
@@ -8,7 +8,7 @@ pkgcfg_DATA = \
   consensus.conf
 
 if MINGW
- WINFLAGS = -Wl,--no-undefined -Wl,--export-all-symbols 
+ WINFLAGS = -Wl,--no-undefined -Wl,--export-all-symbols
 endif
 
 if USE_COVERAGE
@@ -16,30 +16,55 @@ if USE_COVERAGE
 endif
 
 bin_PROGRAMS = \
- gnunet-consensus 
+ gnunet-consensus-profiler
 
 libexec_PROGRAMS = \
  gnunet-service-consensus
 
+# FIXME: add option "configure --with-evil"?
+if HAVE_EXPERIMENTAL
+libexec_PROGRAMS += \
+ gnunet-service-evil-consensus
+endif
+
 lib_LTLIBRARIES = \
   libgnunetconsensus.la
 
-gnunet_consensus_SOURCES = \
- gnunet-consensus.c         
-gnunet_consensus_LDADD = \
+gnunet_consensus_profiler_SOURCES = \
+ gnunet-consensus-profiler.c
+gnunet_consensus_profiler_LDADD = \
   $(top_builddir)/src/util/libgnunetutil.la \
   $(top_builddir)/src/consensus/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 \
-  $(GN_LIBINTL) 
+  $(top_builddir)/src/set/libgnunetset.la \
+  $(GN_LIBINTL)
+gnunet_service_consensus_DEPENDENCIES = \
+  $(top_builddir)/src/set/libgnunetset.la
+
+gnunet_service_evil_consensus_SOURCES = \
+ gnunet-service-consensus.c \
+ consensus_protocol.h
+gnunet_service_evil_consensus_LDADD = \
+  $(top_builddir)/src/util/libgnunetutil.la \
+  $(top_builddir)/src/core/libgnunetcore.la \
+  $(top_builddir)/src/set/libgnunetset.la \
+  $(GN_LIBINTL)
+gnunet_service_evil_consensus_DEPENDENCIES = \
+  $(top_builddir)/src/set/libgnunetset.la
+gnunet_service_evil_consensus_CFLAGS = -DEVIL
 
 libgnunetconsensus_la_SOURCES = \
-  consensus_api.c
+  consensus_api.c \
+  consensus.h
 libgnunetconsensus_la_LIBADD = \
   $(top_builddir)/src/util/libgnunetutil.la \
   $(LTLIBINTL)
@@ -50,6 +75,7 @@ check_PROGRAMS = \
  test_consensus_api
 
 if ENABLE_TEST_RUN
+AM_TESTS_ENVIRONMENT=export GNUNET_PREFIX=$${GNUNET_PREFIX:-@libdir@};export PATH=$${GNUNET_PREFIX:-@prefix@}/bin:$$PATH;
 TESTS = $(check_PROGRAMS)
 endif
 
@@ -60,6 +86,6 @@ test_consensus_api_LDADD = \
   $(top_builddir)/src/testing/libgnunettesting.la \
   $(top_builddir)/src/consensus/libgnunetconsensus.la
 
-
 EXTRA_DIST = \
   test_consensus.conf
+