fix #3284: support lib/MULTIARCH/ paths in installation, use GNUNET_PREFIX=@libdir...

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

diff --git a/src/scalarproduct/Makefile.am b/src/scalarproduct/Makefile.am
index e0cc72b013b892322be63b396bbaa156783799e1..010d7ebfa79eec385cb1db14aaf94b0e0440667d 100644 (file)
--- a/src/scalarproduct/Makefile.am
+++ b/src/scalarproduct/Makefile.am
@@ -1,14 +1,14 @@
-INCLUDES = -I$(top_srcdir)/src/include
+AM_CPPFLAGS = -I$(top_srcdir)/src/include
 
 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
@@ -29,8 +29,9 @@ gnunet_scalarproduct_SOURCES = \
 gnunet_scalarproduct_LDADD = \
   $(top_builddir)/src/util/libgnunetutil.la \
   $(top_builddir)/src/scalarproduct/libgnunetscalarproduct.la \
+  $(LIBGCRYPT_LIBS) \
   -lgcrypt \
-  $(GN_LIBINTL) 
+  $(GN_LIBINTL)
 gnunet_scalarproduct_DEPENDENCIES = \
   libgnunetscalarproduct.la
 
@@ -40,59 +41,32 @@ gnunet_service_scalarproduct_LDADD = \
   $(top_builddir)/src/util/libgnunetutil.la \
   $(top_builddir)/src/mesh/libgnunetmesh.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
 
 if ENABLE_TEST_RUN
-  TESTS = $(check_PROGRAMS)
+  TESTS_ENVIRONMENT=export GNUNET_PREFIX=@libdir@;export PATH=@prefix@/bin:$$PATH;
+  TESTS = $(check_SCRIPTS)
 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 = \
-  $(top_builddir)/src/util/libgnunetutil.la \
-  $(top_builddir)/src/scalarproduct/libgnunetscalarproduct.la \
-  -lgcrypt
-
-EXTRA_DIST = \
-  test_scalarproduct.conf
-