diff options
author | Christian Grothoff <christian@grothoff.org> | 2013-08-23 13:42:15 +0000 |
---|---|---|
committer | Christian Grothoff <christian@grothoff.org> | 2013-08-23 13:42:15 +0000 |
commit | 33b89b07e0ea833955f64d07b7e54e64aab500e9 (patch) | |
tree | cfc01062d4d6951606b00bc62ac087ae78cb500c /src/scalarproduct/Makefile.am | |
parent | 22ab4538a2f7a21c0c831599a56d50c147de0ae5 (diff) | |
download | gnunet-33b89b07e0ea833955f64d07b7e54e64aab500e9.tar.gz gnunet-33b89b07e0ea833955f64d07b7e54e64aab500e9.zip |
-more vector -> scalar renaming
Diffstat (limited to 'src/scalarproduct/Makefile.am')
-rw-r--r-- | src/scalarproduct/Makefile.am | 86 |
1 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/ | |||
5 | libexecdir= $(pkglibdir)/libexec/ | 5 | libexecdir= $(pkglibdir)/libexec/ |
6 | 6 | ||
7 | pkgcfg_DATA = \ | 7 | pkgcfg_DATA = \ |
8 | vectorproduct.conf | 8 | scalarproduct.conf |
9 | 9 | ||
10 | if MINGW | 10 | if MINGW |
11 | WINFLAGS = -Wl,--no-undefined -Wl,--export-all-symbols | 11 | WINFLAGS = -Wl,--no-undefined -Wl,--export-all-symbols |
@@ -16,33 +16,27 @@ if USE_COVERAGE | |||
16 | endif | 16 | endif |
17 | 17 | ||
18 | bin_PROGRAMS = \ | 18 | bin_PROGRAMS = \ |
19 | gnunet-vectorproduct | 19 | gnunet-scalarproduct |
20 | 20 | ||
21 | libexec_PROGRAMS = \ | 21 | libexec_PROGRAMS = \ |
22 | gnunet-service-vectorproduct | 22 | gnunet-service-scalarproduct |
23 | |||
24 | # FIXME: add option "configure --with-evil"? | ||
25 | #if HAVE_EXPERIMENTAL | ||
26 | #libexec_PROGRAMS += \ | ||
27 | # gnunet-service-evil-consensus | ||
28 | #endif | ||
29 | 23 | ||
30 | lib_LTLIBRARIES = \ | 24 | lib_LTLIBRARIES = \ |
31 | libgnunetvectorproduct.la | 25 | libgnunetscalarproduct.la |
32 | 26 | ||
33 | gnunet_vectorproduct_SOURCES = \ | 27 | gnunet_scalarproduct_SOURCES = \ |
34 | gnunet-vectorproduct.c | 28 | gnunet-scalarproduct.c |
35 | gnunet_vectorproduct_LDADD = \ | 29 | gnunet_scalarproduct_LDADD = \ |
36 | $(top_builddir)/src/util/libgnunetutil.la \ | 30 | $(top_builddir)/src/util/libgnunetutil.la \ |
37 | $(top_builddir)/src/vectorproduct/libgnunetvectorproduct.la \ | 31 | $(top_builddir)/src/scalarproduct/libgnunetscalarproduct.la \ |
38 | -lgcrypt \ | 32 | -lgcrypt \ |
39 | $(GN_LIBINTL) | 33 | $(GN_LIBINTL) |
40 | gnunet_vectorproduct_DEPENDENCIES = \ | 34 | gnunet_scalarproduct_DEPENDENCIES = \ |
41 | libgnunetvectorproduct.la | 35 | libgnunetscalarproduct.la |
42 | 36 | ||
43 | gnunet_service_vectorproduct_SOURCES = \ | 37 | gnunet_service_scalarproduct_SOURCES = \ |
44 | gnunet-service-vectorproduct.c | 38 | gnunet-service-scalarproduct.c |
45 | gnunet_service_vectorproduct_LDADD = \ | 39 | gnunet_service_scalarproduct_LDADD = \ |
46 | $(top_builddir)/src/util/libgnunetutil.la \ | 40 | $(top_builddir)/src/util/libgnunetutil.la \ |
47 | $(top_builddir)/src/core/libgnunetcore.la \ | 41 | $(top_builddir)/src/core/libgnunetcore.la \ |
48 | $(top_builddir)/src/mesh/libgnunetmesh.la \ | 42 | $(top_builddir)/src/mesh/libgnunetmesh.la \ |
@@ -50,22 +44,22 @@ gnunet_service_vectorproduct_LDADD = \ | |||
50 | -lgcrypt \ | 44 | -lgcrypt \ |
51 | $(GN_LIBINTL) | 45 | $(GN_LIBINTL) |
52 | 46 | ||
53 | libgnunetvectorproduct_la_SOURCES = \ | 47 | libgnunetscalarproduct_la_SOURCES = \ |
54 | vectorproduct_api.c | 48 | scalarproduct_api.c |
55 | libgnunetvectorproduct_la_LIBADD = \ | 49 | libgnunetscalarproduct_la_LIBADD = \ |
56 | $(top_builddir)/src/util/libgnunetutil.la \ | 50 | $(top_builddir)/src/util/libgnunetutil.la \ |
57 | $(top_builddir)/src/statistics/libgnunetstatistics.la \ | 51 | $(top_builddir)/src/statistics/libgnunetstatistics.la \ |
58 | -lgcrypt \ | 52 | -lgcrypt \ |
59 | $(LTLIBINTL) | 53 | $(LTLIBINTL) |
60 | libgnunetvectorproduct_la_LDFLAGS = \ | 54 | libgnunetscalarproduct_la_LDFLAGS = \ |
61 | $(GN_LIB_LDFLAGS) | 55 | $(GN_LIB_LDFLAGS) |
62 | 56 | ||
63 | check_PROGRAMS = \ | 57 | check_PROGRAMS = \ |
64 | test_vectorproduct_api_regression \ | 58 | test_scalarproduct_api_regression \ |
65 | test_vectorproduct_api \ | 59 | test_scalarproduct_api \ |
66 | test_vectorproduct_api_4peers | 60 | test_scalarproduct_api_4peers |
67 | #FIXME unfinished | 61 | #FIXME unfinished |
68 | #test_vectorproduct_api_regression2 | 62 | #test_scalarproduct_api_regression2 |
69 | 63 | ||
70 | if ENABLE_TEST_RUN | 64 | if ENABLE_TEST_RUN |
71 | TESTS = $(check_PROGRAMS) | 65 | TESTS = $(check_PROGRAMS) |
@@ -78,35 +72,35 @@ test_consensus_api_LDADD = \ | |||
78 | $(top_builddir)/src/testing/libgnunettesting.la \ | 72 | $(top_builddir)/src/testing/libgnunettesting.la \ |
79 | $(top_builddir)/src/consensus/libgnunetconsensus.la | 73 | $(top_builddir)/src/consensus/libgnunetconsensus.la |
80 | 74 | ||
81 | test_vectorproduct_api_SOURCES = \ | 75 | test_scalarproduct_api_SOURCES = \ |
82 | test_vectorproduct_api.c | 76 | test_scalarproduct_api.c |
83 | test_vectorproduct_api_LDADD = \ | 77 | test_scalarproduct_api_LDADD = \ |
84 | $(top_builddir)/src/util/libgnunetutil.la \ | 78 | $(top_builddir)/src/util/libgnunetutil.la \ |
85 | $(top_builddir)/src/vectorproduct/libgnunetvectorproduct.la \ | 79 | $(top_builddir)/src/scalarproduct/libgnunetscalarproduct.la \ |
86 | -lgcrypt | 80 | -lgcrypt |
87 | 81 | ||
88 | #FIXME unfinished | 82 | #FIXME unfinished |
89 | #test_vectorproduct_api_regression2_SOURCES = \ | 83 | #test_scalarproduct_api_regression2_SOURCES = \ |
90 | # test_vectorproduct_api_regression2.c | 84 | # test_scalarproduct_api_regression2.c |
91 | #test_vectorproduct_api_regression2_LDADD = \ | 85 | #test_scalarproduct_api_regression2_LDADD = \ |
92 | # $(top_builddir)/src/vectorproduct/libgnunetvectorproduct.la \ | 86 | # $(top_builddir)/src/scalarproduct/libgnunetscalarproduct.la \ |
93 | # $(top_builddir)/src/util/libgnunetutil.la \ | 87 | # $(top_builddir)/src/util/libgnunetutil.la \ |
94 | # -lgcrypt | 88 | # -lgcrypt |
95 | 89 | ||
96 | test_vectorproduct_api_regression_SOURCES = \ | 90 | test_scalarproduct_api_regression_SOURCES = \ |
97 | test_vectorproduct_api_regression.c | 91 | test_scalarproduct_api_regression.c |
98 | test_vectorproduct_api_regression_LDADD = \ | 92 | test_scalarproduct_api_regression_LDADD = \ |
99 | $(top_builddir)/src/util/libgnunetutil.la \ | 93 | $(top_builddir)/src/util/libgnunetutil.la \ |
100 | $(top_builddir)/src/vectorproduct/libgnunetvectorproduct.la \ | 94 | $(top_builddir)/src/scalarproduct/libgnunetscalarproduct.la \ |
101 | -lgcrypt | 95 | -lgcrypt |
102 | 96 | ||
103 | test_vectorproduct_api_4peers_SOURCES = \ | 97 | test_scalarproduct_api_4peers_SOURCES = \ |
104 | test_vectorproduct_api_4peers.c | 98 | test_scalarproduct_api_4peers.c |
105 | test_vectorproduct_api_4peers_LDADD = \ | 99 | test_scalarproduct_api_4peers_LDADD = \ |
106 | $(top_builddir)/src/util/libgnunetutil.la \ | 100 | $(top_builddir)/src/util/libgnunetutil.la \ |
107 | $(top_builddir)/src/vectorproduct/libgnunetvectorproduct.la \ | 101 | $(top_builddir)/src/scalarproduct/libgnunetscalarproduct.la \ |
108 | -lgcrypt | 102 | -lgcrypt |
109 | 103 | ||
110 | EXTRA_DIST = \ | 104 | EXTRA_DIST = \ |
111 | test_vectorproduct.conf | 105 | test_scalarproduct.conf |
112 | 106 | ||