- fix coverity

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

diff --git a/src/scalarproduct/Makefile.am b/src/scalarproduct/Makefile.am
index c4c56a802d739a9b2d439305d3271c91a0401ee4..e2487d9f3821333da8544ed533c013806b257976 100644 (file)
--- a/src/scalarproduct/Makefile.am
+++ b/src/scalarproduct/Makefile.am
@@ -1,3 +1,4 @@
+# This Makefile.am is in the public domain
 AM_CPPFLAGS = -I$(top_srcdir)/src/include
 
 pkgcfgdir= $(pkgdatadir)/config.d/
@@ -5,10 +6,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
@@ -19,7 +20,10 @@ bin_PROGRAMS = \
  gnunet-scalarproduct
 
 libexec_PROGRAMS = \
- gnunet-service-scalarproduct
+ gnunet-service-scalarproduct-alice \
+ gnunet-service-scalarproduct-bob \
+ gnunet-service-scalarproduct-ecc-alice \
+ gnunet-service-scalarproduct-ecc-bob
 
 lib_LTLIBRARIES = \
   libgnunetscalarproduct.la
@@ -28,71 +32,87 @@ gnunet_scalarproduct_SOURCES = \
   gnunet-scalarproduct.c
 gnunet_scalarproduct_LDADD = \
   $(top_builddir)/src/util/libgnunetutil.la \
-  $(top_builddir)/src/scalarproduct/libgnunetscalarproduct.la \
+  libgnunetscalarproduct.la \
+  $(LIBGCRYPT_LIBS) \
   -lgcrypt \
-  $(GN_LIBINTL) 
-gnunet_scalarproduct_DEPENDENCIES = \
-  libgnunetscalarproduct.la
+  $(GN_LIBINTL)
+
+gnunet_service_scalarproduct_alice_SOURCES = \
+  gnunet-service-scalarproduct.h \
+  gnunet-service-scalarproduct_alice.c
+gnunet_service_scalarproduct_alice_LDADD = \
+  $(top_builddir)/src/util/libgnunetutil.la \
+  $(top_builddir)/src/cadet/libgnunetcadet.la \
+  $(top_builddir)/src/set/libgnunetset.la \
+  $(LIBGCRYPT_LIBS) \
+  -lgcrypt \
+  $(GN_LIBINTL)
+
+gnunet_service_scalarproduct_bob_SOURCES = \
+  gnunet-service-scalarproduct.h \
+  gnunet-service-scalarproduct_bob.c
+gnunet_service_scalarproduct_bob_LDADD = \
+  $(top_builddir)/src/util/libgnunetutil.la \
+  $(top_builddir)/src/cadet/libgnunetcadet.la \
+  $(top_builddir)/src/set/libgnunetset.la \
+  $(LIBGCRYPT_LIBS) \
+  -lgcrypt \
+  $(GN_LIBINTL)
+
+gnunet_service_scalarproduct_ecc_alice_SOURCES = \
+  gnunet-service-scalarproduct-ecc.h \
+  gnunet-service-scalarproduct-ecc_alice.c
+gnunet_service_scalarproduct_ecc_alice_LDADD = \
+  $(top_builddir)/src/util/libgnunetutil.la \
+  $(top_builddir)/src/cadet/libgnunetcadet.la \
+  $(top_builddir)/src/set/libgnunetset.la \
+  $(LIBGCRYPT_LIBS) \
+  -lgcrypt \
+  $(GN_LIBINTL)
 
-gnunet_service_scalarproduct_SOURCES = \
-  gnunet-service-scalarproduct.c
-gnunet_service_scalarproduct_LDADD = \
+gnunet_service_scalarproduct_ecc_bob_SOURCES = \
+  gnunet-service-scalarproduct-ecc.h \
+  gnunet-service-scalarproduct-ecc_bob.c
+gnunet_service_scalarproduct_ecc_bob_LDADD = \
   $(top_builddir)/src/util/libgnunetutil.la \
-  $(top_builddir)/src/mesh/libgnunetmesh.la \
+  $(top_builddir)/src/cadet/libgnunetcadet.la \
   $(top_builddir)/src/set/libgnunetset.la \
+  $(LIBGCRYPT_LIBS) \
   -lgcrypt \
   $(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 \
+  $(LIBGCRYPT_LIBS) \
   -lgcrypt \
   $(LTLIBINTL)
 libgnunetscalarproduct_la_LDFLAGS = \
   $(GN_LIB_LDFLAGS)
 
-#check_PROGRAMS = \
-#      test_scalarproduct_api_regression \
-#      test_scalarproduct_api \
-#      test_scalarproduct_api_4peers
-#FIXME unfinished
-#test_scalarproduct_api_regression2 
+EXTRA_DIST = \
+  test_scalarproduct.conf \
+  $(check_SCRIPTS)
+
+check_SCRIPTS = \
+  test_scalarproduct.sh \
+  test_scalarproduct_negative.sh \
+  test_scalarproduct_negativezero.sh
+
+check_PROGRAMS = \
+  test_ecc_scalarproduct
 
 if ENABLE_TEST_RUN
-  TESTS = $(check_PROGRAMS)
+  AM_TESTS_ENVIRONMENT=export GNUNET_PREFIX=$${GNUNET_PREFIX:-@libdir@};export PATH=$${GNUNET_PREFIX:-@prefix@}/bin:$$PATH;
+  TESTS = $(check_SCRIPTS) $(check_PROGRAMS)
 endif
 
-test_scalarproduct_api_SOURCES = \
-  test_scalarproduct_api.c
-test_scalarproduct_api_LDADD = \
-  $(top_builddir)/src/util/libgnunetutil.la \
-  $(top_builddir)/src/scalarproduct/libgnunetscalarproduct.la \
-  -lgcrypt
-
-#FIXME unfinished
-#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_scalarproduct_api_regression_SOURCES = \
-        test_scalarproduct_api_regression.c
-test_scalarproduct_api_regression_LDADD = \
-  $(top_builddir)/src/util/libgnunetutil.la \
-  $(top_builddir)/src/scalarproduct/libgnunetscalarproduct.la \
-  -lgcrypt
 
-test_scalarproduct_api_4peers_SOURCES = \
- test_scalarproduct_api_4peers.c
-test_scalarproduct_api_4peers_LDADD = \
+test_ecc_scalarproduct_SOURCES = \
+ test_ecc_scalarproduct.c
+test_ecc_scalarproduct_LDADD = \
   $(top_builddir)/src/util/libgnunetutil.la \
-  $(top_builddir)/src/scalarproduct/libgnunetscalarproduct.la \
   -lgcrypt
-
-EXTRA_DIST = \
-  test_scalarproduct.conf
-