use new connecT API

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

diff --git a/src/consensus/Makefile.am b/src/consensus/Makefile.am
index 5929a4d9779655f8bd6ec25fc4de2aec47dd75c3..c63434f94809bb99cc0b5fc00f7b842b3c6f71ee 100644 (file)
--- a/src/consensus/Makefile.am
+++ b/src/consensus/Makefile.am
@@ -1,4 +1,5 @@
-INCLUDES = -I$(top_srcdir)/src/include
+# This Makefile.am is in the public domain
+AM_CPPFLAGS = -I$(top_srcdir)/src/include
 
 pkgcfgdir= $(pkgdatadir)/config.d/
 
@@ -8,7 +9,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,33 +17,70 @@ if USE_COVERAGE
 endif
 
 bin_PROGRAMS = \
- gnunet-consensus 
+ gnunet-consensus-profiler
 
 libexec_PROGRAMS = \
  gnunet-service-consensus
 
-gnunet_consensus_SOURCES = \
- gnunet-consensus.c         
-gnunet_consensus_LDADD = \
+if ENABLE_MALICIOUS
+libexec_PROGRAMS += \
+ gnunet-service-evil-consensus
+endif
+
+lib_LTLIBRARIES = \
+  libgnunetconsensus.la
+
+gnunet_consensus_profiler_SOURCES = \
+ gnunet-consensus-profiler.c
+gnunet_consensus_profiler_LDADD = \
   $(top_builddir)/src/util/libgnunetutil.la \
+  libgnunetconsensus.la \
+  $(top_builddir)/src/testbed/libgnunettestbed.la \
   $(GN_LIBINTL)
 
 gnunet_service_consensus_SOURCES = \
- gnunet-service-consensus.cc
+ gnunet-service-consensus.c
 gnunet_service_consensus_LDADD = \
   $(top_builddir)/src/util/libgnunetutil.la \
-  $(GN_LIBINTL) 
+  $(top_builddir)/src/core/libgnunetcore.la \
+  $(top_builddir)/src/set/libgnunetset.la \
+  $(top_builddir)/src/statistics/libgnunetstatistics.la \
+  $(GN_LIBINTL)
 
+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 \
+  $(top_builddir)/src/statistics/libgnunetstatistics.la \
+  $(GN_LIBINTL)
+gnunet_service_evil_consensus_CFLAGS = -DEVIL
 
-#check_PROGRAMS = \
-# test_consensus_api
+libgnunetconsensus_la_SOURCES = \
+  consensus_api.c \
+  consensus.h
+libgnunetconsensus_la_LIBADD = \
+  $(top_builddir)/src/util/libgnunetutil.la \
+  $(LTLIBINTL)
+libgnunetconsensus_la_LDFLAGS = \
+  $(GN_LIB_LDFLAGS)
+
+check_PROGRAMS = \
+ test_consensus_api
 
-#if ENABLE_TEST_RUN
-#TESTS = $(check_PROGRAMS)
-#endif
-#
-#test_consensus_api_SOURCES = \
-# test_consensus_api.c
-#test_consensus_api_LDADD = \
-#  $(top_builddir)/src/util/libgnunetutil.la  
+if ENABLE_TEST_RUN
+AM_TESTS_ENVIRONMENT=export GNUNET_PREFIX=$${GNUNET_PREFIX:-@libdir@};export PATH=$${GNUNET_PREFIX:-@prefix@}/bin:$$PATH;
+TESTS = $(check_PROGRAMS)
+endif
+
+test_consensus_api_SOURCES = \
+ test_consensus_api.c
+test_consensus_api_LDADD = \
+  $(top_builddir)/src/util/libgnunetutil.la \
+  $(top_builddir)/src/testing/libgnunettesting.la \
+  libgnunetconsensus.la
 
+EXTRA_DIST = \
+  test_consensus.conf