-fix build system issues

6 files changed, 33 insertions, 26 deletions

diff --git a/src/consensus/Makefile.am b/src/consensus/Makefile.am
index 1387f6755..ac57ce2dc 100644
--- a/src/consensus/Makefile.am
+++ b/src/consensus/Makefile.am
@@ -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
@@ -52,7 +52,8 @@ gnunet_service_consensus_DEPENDENCIES = \
   $(top_builddir)/src/set/libgnunetset.la
 
 gnunet_service_evil_consensus_SOURCES = \
- gnunet-service-consensus.c
+ gnunet-service-consensus.c \
+ consensus_protocol.h
 gnunet_service_evil_consensus_LDADD = \
   $(top_builddir)/src/util/libgnunetutil.la \
   $(top_builddir)/src/core/libgnunetcore.la \
@@ -64,7 +65,8 @@ gnunet_service_evil_consensus_DEPENDENCIES = \
 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)
diff --git a/src/experimentation/Makefile.am b/src/experimentation/Makefile.am
index a67f39ea8..5935d9388 100644
--- a/src/experimentation/Makefile.am
+++ b/src/experimentation/Makefile.am
@@ -19,11 +19,11 @@ endif
 
 if HAVE_EXPERIMENTAL
  TEXT_EXP_CLIQUE = test_experimentation_clique_connect test_experimentation_clique_run
-endif 
+endif
 
 check_PROGRAMS = \
  $(TEXT_EXP_CLIQUE)
- 
+
 if ENABLE_TEST_RUN
  TESTS = \
  $(TEXT_EXP_CLIQUE)
@@ -33,7 +33,7 @@ libexec_PROGRAMS = \
  gnunet-daemon-experimentation
 
 gnunet_daemon_experimentation_SOURCES = \
- gnunet-daemon-experimentation.c \
+ gnunet-daemon-experimentation.c gnunet-daemon-experimentation.h \
  gnunet-daemon-experimentation_capabilities.c \
  gnunet-daemon-experimentation_nodes.c \
  gnunet-daemon-experimentation_scheduler.c \
@@ -42,7 +42,7 @@ gnunet_daemon_experimentation_SOURCES = \
 gnunet_daemon_experimentation_LDADD = \
   $(top_builddir)/src/core/libgnunetcore.la \
   $(top_builddir)/src/statistics/libgnunetstatistics.la \
-  $(top_builddir)/src/util/libgnunetutil.la 
+  $(top_builddir)/src/util/libgnunetutil.la
 
 test_experimentation_clique_connect_SOURCES = \
  test_experimentation_clique_connect.c
@@ -57,14 +57,14 @@ test_experimentation_clique_run_LDADD = \
  $(top_builddir)/src/util/libgnunetutil.la \
  $(top_builddir)/src/statistics/libgnunetstatistics.la \
  $(top_builddir)/src/testbed/libgnunettestbed.la
- 
+
 #test_experimentation_clique_run_SOURCES = \
 # test_experimentation_clique_run.c
 #test_experimentation_clique_run_LDADD = \
 # $(top_builddir)/src/util/libgnunetutil.la \
 # $(top_builddir)/src/statistics/libgnunetstatistics.la \
-# $(top_builddir)/src/testbed/libgnunettestbed.la 
- 
+# $(top_builddir)/src/testbed/libgnunettestbed.la
+
 
 EXTRA_DIST = \
  test_experimentation_clique.conf \
diff --git a/src/include/Makefile.am b/src/include/Makefile.am
index e55f0aca6..3d65fe2cf 100644
--- a/src/include/Makefile.am
+++ b/src/include/Makefile.am
@@ -27,8 +27,9 @@ gnunetinclude_HEADERS = \
   gnunet_common.h \
   gnunet_constants.h \
   gnunet_configuration_lib.h \
-  gnunet_container_lib.h \
   gnunet_connection_lib.h \
+  gnunet_consensus_service.h \
+  gnunet_container_lib.h \
   gnunet_conversation_service.h \
   gnunet_core_service.h \
   gnunet_crypto_lib.h \
@@ -81,6 +82,7 @@ gnunetinclude_HEADERS = \
   gnunet_revocation_service.h \
   gnunet_scalarproduct_service.h \
   gnunet_scheduler_lib.h \
+  gnunet_secretsharing_service.h \
   gnunet_server_lib.h \
   gnunet_service_lib.h \
   gnunet_set_service.h \
diff --git a/src/multicast/Makefile.am b/src/multicast/Makefile.am
index 442dbd75e..5035c3f79 100644
--- a/src/multicast/Makefile.am
+++ b/src/multicast/Makefile.am
@@ -8,7 +8,7 @@ pkgcfg_DATA = \
   multicast.conf
 
 if MINGW
- WINFLAGS = -Wl,--no-undefined -Wl,--export-all-symbols 
+ WINFLAGS = -Wl,--no-undefined -Wl,--export-all-symbols
 endif
 
 if USE_COVERAGE
@@ -18,8 +18,8 @@ endif
 lib_LTLIBRARIES = libgnunetmulticast.la
 
 libgnunetmulticast_la_SOURCES = \
-  multicast_api.c 
-# multicast.h
+  multicast_api.c \
+  multicast.h
 libgnunetmulticast_la_LIBADD = \
   $(top_builddir)/src/util/libgnunetutil.la \
   $(GN_LIBINTL) $(XLIB)
@@ -29,19 +29,19 @@ libgnunetmulticast_la_LDFLAGS = \
 
 
 bin_PROGRAMS = \
- gnunet-multicast 
+ gnunet-multicast
 
 libexec_PROGRAMS = \
  gnunet-service-multicast
 
 gnunet_multicast_SOURCES = \
- gnunet-multicast.c         
+ gnunet-multicast.c
 gnunet_multicast_LDADD = \
   $(top_builddir)/src/util/libgnunetutil.la \
   $(GN_LIBINTL)
 
 gnunet_service_multicast_SOURCES = \
- gnunet-service-multicast.c         
+ gnunet-service-multicast.c
 gnunet_service_multicast_LDADD = \
   $(top_builddir)/src/util/libgnunetutil.la \
   $(GN_LIBINTL)
@@ -57,5 +57,5 @@ endif
 test_multicast_api_SOURCES = \
  test_multicast_api.c
 test_multicast_api_LDADD = \
-  $(top_builddir)/src/util/libgnunetutil.la  
+  $(top_builddir)/src/util/libgnunetutil.la
 
diff --git a/src/scalarproduct/Makefile.am b/src/scalarproduct/Makefile.am
index 4bfdfcd7d..11a937378 100644
--- a/src/scalarproduct/Makefile.am
+++ b/src/scalarproduct/Makefile.am
@@ -5,10 +5,10 @@ pkgcfgdir= $(pkgdatadir)/config.d/
 libexecdir= $(pkglibdir)/libexec/
 
 pkgcfg_DATA = \
-  scalarproduct.conf 
+  scalarproduct.conf
 
 if MINGW
- WINFLAGS = -Wl,--no-undefined -Wl,--export-all-symbols 
+ WINFLAGS = -Wl,--no-undefined -Wl,--export-all-symbols
 endif
 
 if USE_COVERAGE
@@ -30,7 +30,7 @@ gnunet_scalarproduct_LDADD = \
   $(top_builddir)/src/util/libgnunetutil.la \
   $(top_builddir)/src/scalarproduct/libgnunetscalarproduct.la \
   -lgcrypt \
-  $(GN_LIBINTL) 
+  $(GN_LIBINTL)
 gnunet_scalarproduct_DEPENDENCIES = \
   libgnunetscalarproduct.la
 
@@ -44,7 +44,8 @@ gnunet_service_scalarproduct_LDADD = \
   $(GN_LIBINTL)
 
 libgnunetscalarproduct_la_SOURCES = \
-  scalarproduct_api.c 
+  scalarproduct_api.c \
+  scalarproduct.h
 libgnunetscalarproduct_la_LIBADD = \
   $(top_builddir)/src/util/libgnunetutil.la \
   $(top_builddir)/src/statistics/libgnunetstatistics.la \
@@ -61,7 +62,7 @@ check_SCRIPTS = \
   test_scalarproduct.sh \
   test_scalarproduct_negative.sh \
   test_scalarproduct_negativezero.sh
-  
+
 if ENABLE_TEST_RUN
   TESTS = $(check_SCRIPTS)
 endif
diff --git a/src/secretsharing/Makefile.am b/src/secretsharing/Makefile.am
index a94bf293c..0473820b2 100644
--- a/src/secretsharing/Makefile.am
+++ b/src/secretsharing/Makefile.am
@@ -8,7 +8,7 @@ pkgcfg_DATA = \
   secretsharing.conf
 
 if MINGW
- WINFLAGS = -Wl,--no-undefined -Wl,--export-all-symbols 
+ WINFLAGS = -Wl,--no-undefined -Wl,--export-all-symbols
 endif
 
 if USE_COVERAGE
@@ -37,7 +37,8 @@ gnunet_secretsharing_profiler_DEPENDENCIES = \
   libgnunetsecretsharing.la
 
 gnunet_service_secretsharing_SOURCES = \
- gnunet-service-secretsharing.c
+ gnunet-service-secretsharing.c \
+ secretsharing_protocol.h
 gnunet_service_secretsharing_LDADD = \
   $(top_builddir)/src/util/libgnunetutil.la \
   $(top_builddir)/src/consensus/libgnunetconsensus.la \
@@ -47,7 +48,8 @@ gnunet_service_secretsharing_DEPENDENCIES = \
   $(top_builddir)/src/set/libgnunetset.la
 
 libgnunetsecretsharing_la_SOURCES = \
-  secretsharing_api.c
+  secretsharing_api.c \
+  secretsharing.h
 libgnunetsecretsharing_la_LIBADD = \
   $(top_builddir)/src/util/libgnunetutil.la \
   $(LTLIBINTL)