11 files changed, 40 insertions, 46 deletions

diff --git a/src/scalarproduct/Makefile.am b/src/scalarproduct/Makefile.am
index 1f0912e50..33ddfcf60 100644
--- a/src/scalarproduct/Makefile.am
+++ b/src/scalarproduct/Makefile.am
@@ -5,7 +5,7 @@ pkgcfgdir= $(pkgdatadir)/config.d/
 libexecdir= $(pkglibdir)/libexec/
 
 pkgcfg_DATA = \
-  vectorproduct.conf 
+  scalarproduct.conf 
 
 if MINGW
  WINFLAGS = -Wl,--no-undefined -Wl,--export-all-symbols 
@@ -16,33 +16,27 @@ if USE_COVERAGE
 endif
 
 bin_PROGRAMS = \
- gnunet-vectorproduct
+ gnunet-scalarproduct
 
 libexec_PROGRAMS = \
- gnunet-service-vectorproduct
-
-# FIXME: add option "configure --with-evil"?
-#if HAVE_EXPERIMENTAL
-#libexec_PROGRAMS += \
-# gnunet-service-evil-consensus
-#endif
+ gnunet-service-scalarproduct
 
 lib_LTLIBRARIES = \
-  libgnunetvectorproduct.la
+  libgnunetscalarproduct.la
 
-gnunet_vectorproduct_SOURCES = \
-  gnunet-vectorproduct.c
-gnunet_vectorproduct_LDADD = \
+gnunet_scalarproduct_SOURCES = \
+  gnunet-scalarproduct.c
+gnunet_scalarproduct_LDADD = \
   $(top_builddir)/src/util/libgnunetutil.la \
-  $(top_builddir)/src/vectorproduct/libgnunetvectorproduct.la \
+  $(top_builddir)/src/scalarproduct/libgnunetscalarproduct.la \
   -lgcrypt \
   $(GN_LIBINTL) 
-gnunet_vectorproduct_DEPENDENCIES = \
-  libgnunetvectorproduct.la
+gnunet_scalarproduct_DEPENDENCIES = \
+  libgnunetscalarproduct.la
 
-gnunet_service_vectorproduct_SOURCES = \
-  gnunet-service-vectorproduct.c
-gnunet_service_vectorproduct_LDADD = \
+gnunet_service_scalarproduct_SOURCES = \
+  gnunet-service-scalarproduct.c
+gnunet_service_scalarproduct_LDADD = \
   $(top_builddir)/src/util/libgnunetutil.la \
   $(top_builddir)/src/core/libgnunetcore.la \
   $(top_builddir)/src/mesh/libgnunetmesh.la \
@@ -50,22 +44,22 @@ gnunet_service_vectorproduct_LDADD = \
   -lgcrypt \
   $(GN_LIBINTL)
 
-libgnunetvectorproduct_la_SOURCES = \
-  vectorproduct_api.c 
-libgnunetvectorproduct_la_LIBADD = \
+libgnunetscalarproduct_la_SOURCES = \
+  scalarproduct_api.c 
+libgnunetscalarproduct_la_LIBADD = \
   $(top_builddir)/src/util/libgnunetutil.la \
   $(top_builddir)/src/statistics/libgnunetstatistics.la \
   -lgcrypt \
   $(LTLIBINTL)
-libgnunetvectorproduct_la_LDFLAGS = \
+libgnunetscalarproduct_la_LDFLAGS = \
   $(GN_LIB_LDFLAGS)
 
 check_PROGRAMS = \
-        test_vectorproduct_api_regression \
-        test_vectorproduct_api \
-        test_vectorproduct_api_4peers
+        test_scalarproduct_api_regression \
+        test_scalarproduct_api \
+        test_scalarproduct_api_4peers
 #FIXME unfinished
-#test_vectorproduct_api_regression2 
+#test_scalarproduct_api_regression2 
 
 if ENABLE_TEST_RUN
   TESTS = $(check_PROGRAMS)
@@ -78,35 +72,35 @@ test_consensus_api_LDADD = \
   $(top_builddir)/src/testing/libgnunettesting.la \
   $(top_builddir)/src/consensus/libgnunetconsensus.la
 
-test_vectorproduct_api_SOURCES = \
-  test_vectorproduct_api.c
-test_vectorproduct_api_LDADD = \
+test_scalarproduct_api_SOURCES = \
+  test_scalarproduct_api.c
+test_scalarproduct_api_LDADD = \
   $(top_builddir)/src/util/libgnunetutil.la \
-  $(top_builddir)/src/vectorproduct/libgnunetvectorproduct.la \
+  $(top_builddir)/src/scalarproduct/libgnunetscalarproduct.la \
   -lgcrypt
 
 #FIXME unfinished
-#test_vectorproduct_api_regression2_SOURCES = \
-#       test_vectorproduct_api_regression2.c
-#test_vectorproduct_api_regression2_LDADD = \
-#  $(top_builddir)/src/vectorproduct/libgnunetvectorproduct.la \
+#test_scalarproduct_api_regression2_SOURCES = \
+#       test_scalarproduct_api_regression2.c
+#test_scalarproduct_api_regression2_LDADD = \
+#  $(top_builddir)/src/scalarproduct/libgnunetscalarproduct.la \
 #  $(top_builddir)/src/util/libgnunetutil.la \
 #  -lgcrypt
 
-test_vectorproduct_api_regression_SOURCES = \
-        test_vectorproduct_api_regression.c
-test_vectorproduct_api_regression_LDADD = \
+test_scalarproduct_api_regression_SOURCES = \
+        test_scalarproduct_api_regression.c
+test_scalarproduct_api_regression_LDADD = \
   $(top_builddir)/src/util/libgnunetutil.la \
-  $(top_builddir)/src/vectorproduct/libgnunetvectorproduct.la \
+  $(top_builddir)/src/scalarproduct/libgnunetscalarproduct.la \
   -lgcrypt
 
-test_vectorproduct_api_4peers_SOURCES = \
- test_vectorproduct_api_4peers.c
-test_vectorproduct_api_4peers_LDADD = \
+test_scalarproduct_api_4peers_SOURCES = \
+ test_scalarproduct_api_4peers.c
+test_scalarproduct_api_4peers_LDADD = \
   $(top_builddir)/src/util/libgnunetutil.la \
-  $(top_builddir)/src/vectorproduct/libgnunetvectorproduct.la \
+  $(top_builddir)/src/scalarproduct/libgnunetscalarproduct.la \
   -lgcrypt
- 
+
 EXTRA_DIST = \
-  test_vectorproduct.conf
- 
+  test_scalarproduct.conf
+
diff --git a/src/scalarproduct/gnunet-vectorproduct.c b/src/scalarproduct/gnunet-scalarproduct.c
index 449085593..449085593 100644
--- a/src/scalarproduct/gnunet-vectorproduct.c
+++ b/src/scalarproduct/gnunet-scalarproduct.c
diff --git a/src/scalarproduct/gnunet-service-vectorproduct.c b/src/scalarproduct/gnunet-service-scalarproduct.c
index 8724af60d..8724af60d 100644
--- a/src/scalarproduct/gnunet-service-vectorproduct.c
+++ b/src/scalarproduct/gnunet-service-scalarproduct.c
diff --git a/src/scalarproduct/gnunet_vectorproduct.h b/src/scalarproduct/gnunet_scalarproduct.h
index 4b116646b..4b116646b 100644
--- a/src/scalarproduct/gnunet_vectorproduct.h
+++ b/src/scalarproduct/gnunet_scalarproduct.h
diff --git a/src/scalarproduct/vectorproduct.conf b/src/scalarproduct/scalarproduct.conf
index d00093922..d00093922 100644
--- a/src/scalarproduct/vectorproduct.conf
+++ b/src/scalarproduct/scalarproduct.conf
diff --git a/src/scalarproduct/vectorproduct_api.c b/src/scalarproduct/scalarproduct_api.c
index 4f8cde8fe..4f8cde8fe 100644
--- a/src/scalarproduct/vectorproduct_api.c
+++ b/src/scalarproduct/scalarproduct_api.c
diff --git a/src/scalarproduct/test_vectorproduct_api.c b/src/scalarproduct/test_scalarproduct_api.c
index 802015694..802015694 100644
--- a/src/scalarproduct/test_vectorproduct_api.c
+++ b/src/scalarproduct/test_scalarproduct_api.c
diff --git a/src/scalarproduct/test_vectorproduct_api_4peers.c b/src/scalarproduct/test_scalarproduct_api_4peers.c
index 73ab634f9..73ab634f9 100644
--- a/src/scalarproduct/test_vectorproduct_api_4peers.c
+++ b/src/scalarproduct/test_scalarproduct_api_4peers.c
diff --git a/src/scalarproduct/test_vectorproduct_api_data.conf b/src/scalarproduct/test_scalarproduct_api_data.conf
index b0b1c257e..b0b1c257e 100644
--- a/src/scalarproduct/test_vectorproduct_api_data.conf
+++ b/src/scalarproduct/test_scalarproduct_api_data.conf
diff --git a/src/scalarproduct/test_vectorproduct_api_regression.c b/src/scalarproduct/test_scalarproduct_api_regression.c
index 2bc0adec6..2bc0adec6 100644
--- a/src/scalarproduct/test_vectorproduct_api_regression.c
+++ b/src/scalarproduct/test_scalarproduct_api_regression.c
diff --git a/src/scalarproduct/test_vectorproduct_api_regression2.c b/src/scalarproduct/test_scalarproduct_api_regression2.c
index 8a0162b40..8a0162b40 100644
--- a/src/scalarproduct/test_vectorproduct_api_regression2.c
+++ b/src/scalarproduct/test_scalarproduct_api_regression2.c