-simplify

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

diff --git a/src/consensus/Makefile.am b/src/consensus/Makefile.am
index 2041ec1acdf264e4d2f519338d2e01b4c99ff695..82af29c87a38511072eabd4ff68afa7054fa5c12 100644 (file)
--- a/src/consensus/Makefile.am
+++ b/src/consensus/Makefile.am
@@ -15,34 +15,95 @@ if USE_COVERAGE
   AM_CFLAGS = -fprofile-arcs -ftest-coverage
 endif
 
-#bin_PROGRAMS = \
-# gnunet-consensus 
+bin_PROGRAMS = \
+ gnunet-consensus \
+ gnunet-consensus-start-peers \
+ gnunet-consensus-ibf
 
 libexec_PROGRAMS = \
  gnunet-service-consensus
 
-#gnunet_consensus_SOURCES = \
-# gnunet-consensus.c         
-#gnunet_consensus_LDADD = \
-#  $(top_builddir)/src/util/libgnunetutil.la \
-#  $(GN_LIBINTL)
+# 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 = \
+  $(top_builddir)/src/util/libgnunetutil.la \
+  $(top_builddir)/src/consensus/libgnunetconsensus.la \
+  $(top_builddir)/src/testbed/libgnunettestbed.la \
+  $(GN_LIBINTL)
+gnunet_consensus_DEPENDENCIES = \
+  libgnunetconsensus.la
+
+gnunet_consensus_start_peers_SOURCES = \
+ gnunet-consensus-start-peers.c
+gnunet_consensus_start_peers_LDADD = \
+  $(top_builddir)/src/util/libgnunetutil.la \
+  $(top_builddir)/src/testbed/libgnunettestbed.la \
+  $(top_builddir)/src/consensus/libgnunetconsensus.la \
+  $(GN_LIBINTL)
+gnunet_consensus_start_peers_DEPENDENCIES = \
+  libgnunetconsensus.la
+
+gnunet_consensus_ibf_SOURCES = \
+ gnunet-consensus-ibf.c \
+ ibf.c
+gnunet_consensus_ibf_LDADD = \
+  $(top_builddir)/src/util/libgnunetutil.la \
+  $(GN_LIBINTL)
 
 gnunet_service_consensus_SOURCES = \
- gnunet-service-consensus.cc
+ gnunet-service-consensus.c \
+ ibf.c \
+ strata_estimator.c
 gnunet_service_consensus_LDADD = \
   $(top_builddir)/src/util/libgnunetutil.la \
-  $(GN_LIBINTL) 
+  $(top_builddir)/src/core/libgnunetcore.la \
+  $(top_builddir)/src/stream/libgnunetstream.la \
+  $(top_builddir)/src/mesh/libgnunetmesh.la \
+  $(GN_LIBINTL)
 
+gnunet_service_evil_consensus_SOURCES = \
+ gnunet-service-consensus.c \
+ ibf.c \
+ strata_estimator.c
+gnunet_service_evil_consensus_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 \
+  $(GN_LIBINTL)
+gnunet_service_evil_consensus_CFLAGS = -DEVIL
+
+libgnunetconsensus_la_SOURCES = \
+  consensus_api.c
+libgnunetconsensus_la_LIBADD = \
+  $(top_builddir)/src/util/libgnunetutil.la \
+  $(LTLIBINTL)
+libgnunetconsensus_la_LDFLAGS = \
+  $(GN_LIB_LDFLAGS)
+
+check_PROGRAMS = \
+ test_consensus_api
 
-#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 \
+  $(top_builddir)/src/testing/libgnunettesting.la \
+  $(top_builddir)/src/consensus/libgnunetconsensus.la
 
-#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  
+EXTRA_DIST = \
+  test_consensus.conf