diff options
author | Christian Grothoff <christian@grothoff.org> | 2015-06-02 08:54:18 +0000 |
---|---|---|
committer | Christian Grothoff <christian@grothoff.org> | 2015-06-02 08:54:18 +0000 |
commit | edb4ddf051d91a2169d46f07b1bfea6df4d216bb (patch) | |
tree | e3b1a1095ece34ca21a420a290ad740663ec36a5 /src | |
parent | a2417d5b3fc632fb1bacca6594c50a0ef7ffd23a (diff) | |
download | gnunet-edb4ddf051d91a2169d46f07b1bfea6df4d216bb.tar.gz gnunet-edb4ddf051d91a2169d46f07b1bfea6df4d216bb.zip |
-noinst-ing non-functional binaries/libraries that just exist as examples/templates
Diffstat (limited to 'src')
-rw-r--r-- | src/block/Makefile.am | 11 | ||||
-rw-r--r-- | src/consensus/Makefile.am | 4 | ||||
-rw-r--r-- | src/datacache/Makefile.am | 32 | ||||
-rw-r--r-- | src/datastore/Makefile.am | 56 | ||||
-rw-r--r-- | src/dht/Makefile.am | 6 | ||||
-rw-r--r-- | src/template/Makefile.am | 18 | ||||
-rw-r--r-- | src/transport/Makefile.am | 6 |
7 files changed, 77 insertions, 56 deletions
diff --git a/src/block/Makefile.am b/src/block/Makefile.am index 19a91f770..c54a4c246 100644 --- a/src/block/Makefile.am +++ b/src/block/Makefile.am | |||
@@ -14,9 +14,12 @@ endif | |||
14 | lib_LTLIBRARIES = libgnunetblock.la | 14 | lib_LTLIBRARIES = libgnunetblock.la |
15 | 15 | ||
16 | plugin_LTLIBRARIES = \ | 16 | plugin_LTLIBRARIES = \ |
17 | libgnunet_plugin_block_template.la \ | 17 | libgnunet_plugin_block_test.la |
18 | libgnunet_plugin_block_test.la | ||
19 | 18 | ||
19 | # Real plugins should of course go into | ||
20 | # plugin_LTLIBRARIES | ||
21 | noinst_LTLIBRARIES = \ | ||
22 | libgnunet_plugin_block_template.la | ||
20 | 23 | ||
21 | libgnunet_plugin_block_template_la_SOURCES = \ | 24 | libgnunet_plugin_block_template_la_SOURCES = \ |
22 | plugin_block_template.c | 25 | plugin_block_template.c |
@@ -38,11 +41,11 @@ libgnunet_plugin_block_test_la_LDFLAGS = \ | |||
38 | 41 | ||
39 | 42 | ||
40 | libgnunetblock_la_SOURCES = \ | 43 | libgnunetblock_la_SOURCES = \ |
41 | block.c | 44 | block.c |
42 | libgnunetblock_la_LIBADD = \ | 45 | libgnunetblock_la_LIBADD = \ |
43 | $(top_builddir)/src/util/libgnunetutil.la | 46 | $(top_builddir)/src/util/libgnunetutil.la |
44 | libgnunetblock_la_DEPENDENCIES = \ | 47 | libgnunetblock_la_DEPENDENCIES = \ |
45 | $(top_builddir)/src/util/libgnunetutil.la | 48 | $(top_builddir)/src/util/libgnunetutil.la |
46 | libgnunetblock_la_LDFLAGS = \ | 49 | libgnunetblock_la_LDFLAGS = \ |
47 | $(GN_LIB_LDFLAGS) \ | 50 | $(GN_LIB_LDFLAGS) \ |
48 | -version-info 0:0:0 | 51 | -version-info 0:0:0 |
diff --git a/src/consensus/Makefile.am b/src/consensus/Makefile.am index 27a0eb2e9..eb0370eb5 100644 --- a/src/consensus/Makefile.am +++ b/src/consensus/Makefile.am | |||
@@ -22,11 +22,12 @@ bin_PROGRAMS = \ | |||
22 | libexec_PROGRAMS = \ | 22 | libexec_PROGRAMS = \ |
23 | gnunet-service-consensus | 23 | gnunet-service-consensus |
24 | 24 | ||
25 | # FIXME: add option "configure --with-evil"? | ||
26 | if HAVE_EXPERIMENTAL | 25 | if HAVE_EXPERIMENTAL |
26 | if ENABLE_MALICIOUS | ||
27 | libexec_PROGRAMS += \ | 27 | libexec_PROGRAMS += \ |
28 | gnunet-service-evil-consensus | 28 | gnunet-service-evil-consensus |
29 | endif | 29 | endif |
30 | endif | ||
30 | 31 | ||
31 | lib_LTLIBRARIES = \ | 32 | lib_LTLIBRARIES = \ |
32 | libgnunetconsensus.la | 33 | libgnunetconsensus.la |
@@ -83,4 +84,3 @@ test_consensus_api_LDADD = \ | |||
83 | 84 | ||
84 | EXTRA_DIST = \ | 85 | EXTRA_DIST = \ |
85 | test_consensus.conf | 86 | test_consensus.conf |
86 | |||
diff --git a/src/datacache/Makefile.am b/src/datacache/Makefile.am index 0219ecc12..9b66636e5 100644 --- a/src/datacache/Makefile.am +++ b/src/datacache/Makefile.am | |||
@@ -28,11 +28,11 @@ lib_LTLIBRARIES = \ | |||
28 | libgnunetdatacache.la | 28 | libgnunetdatacache.la |
29 | 29 | ||
30 | libgnunetdatacache_la_SOURCES = \ | 30 | libgnunetdatacache_la_SOURCES = \ |
31 | datacache.c | 31 | datacache.c |
32 | libgnunetdatacache_la_LIBADD = \ | 32 | libgnunetdatacache_la_LIBADD = \ |
33 | $(top_builddir)/src/statistics/libgnunetstatistics.la \ | 33 | $(top_builddir)/src/statistics/libgnunetstatistics.la \ |
34 | $(top_builddir)/src/util/libgnunetutil.la \ | 34 | $(top_builddir)/src/util/libgnunetutil.la \ |
35 | $(GN_LIBINTL) | 35 | $(GN_LIBINTL) |
36 | libgnunetdatacache_la_LDFLAGS = \ | 36 | libgnunetdatacache_la_LDFLAGS = \ |
37 | $(GN_LIB_LDFLAGS) $(WINFLAGS) \ | 37 | $(GN_LIB_LDFLAGS) $(WINFLAGS) \ |
38 | -version-info 0:1:0 | 38 | -version-info 0:1:0 |
@@ -41,8 +41,12 @@ libgnunetdatacache_la_LDFLAGS = \ | |||
41 | plugin_LTLIBRARIES = \ | 41 | plugin_LTLIBRARIES = \ |
42 | $(SQLITE_PLUGIN) \ | 42 | $(SQLITE_PLUGIN) \ |
43 | $(POSTGRES_PLUGIN) \ | 43 | $(POSTGRES_PLUGIN) \ |
44 | libgnunet_plugin_datacache_heap.la \ | 44 | libgnunet_plugin_datacache_heap.la |
45 | libgnunet_plugin_datacache_template.la | 45 | |
46 | # Real plugins should of course go into | ||
47 | # plugin_LTLIBRARIES | ||
48 | noinst_LTLIBRARIES = \ | ||
49 | libgnunet_plugin_datacache_template.la | ||
46 | 50 | ||
47 | 51 | ||
48 | libgnunet_plugin_datacache_sqlite_la_SOURCES = \ | 52 | libgnunet_plugin_datacache_sqlite_la_SOURCES = \ |
@@ -120,7 +124,7 @@ endif | |||
120 | check_PROGRAMS = \ | 124 | check_PROGRAMS = \ |
121 | $(SQLITE_TESTS) \ | 125 | $(SQLITE_TESTS) \ |
122 | $(HEAP_TESTS) \ | 126 | $(HEAP_TESTS) \ |
123 | $(POSTGRES_TESTS) | 127 | $(POSTGRES_TESTS) |
124 | 128 | ||
125 | if ENABLE_TEST_RUN | 129 | if ENABLE_TEST_RUN |
126 | AM_TESTS_ENVIRONMENT=export GNUNET_PREFIX=$${GNUNET_PREFIX:-@libdir@};export PATH=$${GNUNET_PREFIX:-@prefix@}/bin:$$PATH; | 130 | AM_TESTS_ENVIRONMENT=export GNUNET_PREFIX=$${GNUNET_PREFIX:-@libdir@};export PATH=$${GNUNET_PREFIX:-@prefix@}/bin:$$PATH; |
@@ -132,63 +136,63 @@ test_datacache_sqlite_SOURCES = \ | |||
132 | test_datacache_sqlite_LDADD = \ | 136 | test_datacache_sqlite_LDADD = \ |
133 | $(top_builddir)/src/testing/libgnunettesting.la \ | 137 | $(top_builddir)/src/testing/libgnunettesting.la \ |
134 | libgnunetdatacache.la \ | 138 | libgnunetdatacache.la \ |
135 | $(top_builddir)/src/util/libgnunetutil.la | 139 | $(top_builddir)/src/util/libgnunetutil.la |
136 | 140 | ||
137 | test_datacache_quota_sqlite_SOURCES = \ | 141 | test_datacache_quota_sqlite_SOURCES = \ |
138 | test_datacache_quota.c | 142 | test_datacache_quota.c |
139 | test_datacache_quota_sqlite_LDADD = \ | 143 | test_datacache_quota_sqlite_LDADD = \ |
140 | $(top_builddir)/src/testing/libgnunettesting.la \ | 144 | $(top_builddir)/src/testing/libgnunettesting.la \ |
141 | libgnunetdatacache.la \ | 145 | libgnunetdatacache.la \ |
142 | $(top_builddir)/src/util/libgnunetutil.la | 146 | $(top_builddir)/src/util/libgnunetutil.la |
143 | 147 | ||
144 | perf_datacache_sqlite_SOURCES = \ | 148 | perf_datacache_sqlite_SOURCES = \ |
145 | perf_datacache.c | 149 | perf_datacache.c |
146 | perf_datacache_sqlite_LDADD = \ | 150 | perf_datacache_sqlite_LDADD = \ |
147 | $(top_builddir)/src/testing/libgnunettesting.la \ | 151 | $(top_builddir)/src/testing/libgnunettesting.la \ |
148 | libgnunetdatacache.la \ | 152 | libgnunetdatacache.la \ |
149 | $(top_builddir)/src/util/libgnunetutil.la | 153 | $(top_builddir)/src/util/libgnunetutil.la |
150 | 154 | ||
151 | test_datacache_heap_SOURCES = \ | 155 | test_datacache_heap_SOURCES = \ |
152 | test_datacache.c | 156 | test_datacache.c |
153 | test_datacache_heap_LDADD = \ | 157 | test_datacache_heap_LDADD = \ |
154 | $(top_builddir)/src/testing/libgnunettesting.la \ | 158 | $(top_builddir)/src/testing/libgnunettesting.la \ |
155 | libgnunetdatacache.la \ | 159 | libgnunetdatacache.la \ |
156 | $(top_builddir)/src/util/libgnunetutil.la | 160 | $(top_builddir)/src/util/libgnunetutil.la |
157 | 161 | ||
158 | test_datacache_quota_heap_SOURCES = \ | 162 | test_datacache_quota_heap_SOURCES = \ |
159 | test_datacache_quota.c | 163 | test_datacache_quota.c |
160 | test_datacache_quota_heap_LDADD = \ | 164 | test_datacache_quota_heap_LDADD = \ |
161 | $(top_builddir)/src/testing/libgnunettesting.la \ | 165 | $(top_builddir)/src/testing/libgnunettesting.la \ |
162 | libgnunetdatacache.la \ | 166 | libgnunetdatacache.la \ |
163 | $(top_builddir)/src/util/libgnunetutil.la | 167 | $(top_builddir)/src/util/libgnunetutil.la |
164 | 168 | ||
165 | perf_datacache_heap_SOURCES = \ | 169 | perf_datacache_heap_SOURCES = \ |
166 | perf_datacache.c | 170 | perf_datacache.c |
167 | perf_datacache_heap_LDADD = \ | 171 | perf_datacache_heap_LDADD = \ |
168 | $(top_builddir)/src/testing/libgnunettesting.la \ | 172 | $(top_builddir)/src/testing/libgnunettesting.la \ |
169 | libgnunetdatacache.la \ | 173 | libgnunetdatacache.la \ |
170 | $(top_builddir)/src/util/libgnunetutil.la | 174 | $(top_builddir)/src/util/libgnunetutil.la |
171 | 175 | ||
172 | test_datacache_postgres_SOURCES = \ | 176 | test_datacache_postgres_SOURCES = \ |
173 | test_datacache.c | 177 | test_datacache.c |
174 | test_datacache_postgres_LDADD = \ | 178 | test_datacache_postgres_LDADD = \ |
175 | $(top_builddir)/src/testing/libgnunettesting.la \ | 179 | $(top_builddir)/src/testing/libgnunettesting.la \ |
176 | libgnunetdatacache.la \ | 180 | libgnunetdatacache.la \ |
177 | $(top_builddir)/src/util/libgnunetutil.la | 181 | $(top_builddir)/src/util/libgnunetutil.la |
178 | 182 | ||
179 | test_datacache_quota_postgres_SOURCES = \ | 183 | test_datacache_quota_postgres_SOURCES = \ |
180 | test_datacache_quota.c | 184 | test_datacache_quota.c |
181 | test_datacache_quota_postgres_LDADD = \ | 185 | test_datacache_quota_postgres_LDADD = \ |
182 | $(top_builddir)/src/testing/libgnunettesting.la \ | 186 | $(top_builddir)/src/testing/libgnunettesting.la \ |
183 | libgnunetdatacache.la \ | 187 | libgnunetdatacache.la \ |
184 | $(top_builddir)/src/util/libgnunetutil.la | 188 | $(top_builddir)/src/util/libgnunetutil.la |
185 | 189 | ||
186 | perf_datacache_postgres_SOURCES = \ | 190 | perf_datacache_postgres_SOURCES = \ |
187 | perf_datacache.c | 191 | perf_datacache.c |
188 | perf_datacache_postgres_LDADD = \ | 192 | perf_datacache_postgres_LDADD = \ |
189 | $(top_builddir)/src/testing/libgnunettesting.la \ | 193 | $(top_builddir)/src/testing/libgnunettesting.la \ |
190 | libgnunetdatacache.la \ | 194 | libgnunetdatacache.la \ |
191 | $(top_builddir)/src/util/libgnunetutil.la | 195 | $(top_builddir)/src/util/libgnunetutil.la |
192 | 196 | ||
193 | EXTRA_DIST = \ | 197 | EXTRA_DIST = \ |
194 | test_datacache_data_sqlite.conf \ | 198 | test_datacache_data_sqlite.conf \ |
diff --git a/src/datastore/Makefile.am b/src/datastore/Makefile.am index 241fa5263..4ad0ae028 100644 --- a/src/datastore/Makefile.am +++ b/src/datastore/Makefile.am | |||
@@ -24,11 +24,11 @@ lib_LTLIBRARIES = \ | |||
24 | libgnunetdatastore.la | 24 | libgnunetdatastore.la |
25 | 25 | ||
26 | libgnunetdatastore_la_SOURCES = \ | 26 | libgnunetdatastore_la_SOURCES = \ |
27 | datastore_api.c datastore.h | 27 | datastore_api.c datastore.h |
28 | libgnunetdatastore_la_LIBADD = \ | 28 | libgnunetdatastore_la_LIBADD = \ |
29 | $(top_builddir)/src/statistics/libgnunetstatistics.la \ | 29 | $(top_builddir)/src/statistics/libgnunetstatistics.la \ |
30 | $(top_builddir)/src/util/libgnunetutil.la \ | 30 | $(top_builddir)/src/util/libgnunetutil.la \ |
31 | $(GN_LIBINTL) | 31 | $(GN_LIBINTL) |
32 | libgnunetdatastore_la_LDFLAGS = \ | 32 | libgnunetdatastore_la_LDFLAGS = \ |
33 | $(GN_LIB_LDFLAGS) $(WINFLAGS) \ | 33 | $(GN_LIB_LDFLAGS) $(WINFLAGS) \ |
34 | -version-info 1:0:0 | 34 | -version-info 1:0:0 |
@@ -40,14 +40,14 @@ libexec_PROGRAMS = \ | |||
40 | gnunet-service-datastore | 40 | gnunet-service-datastore |
41 | 41 | ||
42 | gnunet_service_datastore_SOURCES = \ | 42 | gnunet_service_datastore_SOURCES = \ |
43 | gnunet-service-datastore.c | 43 | gnunet-service-datastore.c |
44 | gnunet_service_datastore_LDADD = \ | 44 | gnunet_service_datastore_LDADD = \ |
45 | $(top_builddir)/src/statistics/libgnunetstatistics.la \ | 45 | $(top_builddir)/src/statistics/libgnunetstatistics.la \ |
46 | $(top_builddir)/src/util/libgnunetutil.la \ | 46 | $(top_builddir)/src/util/libgnunetutil.la \ |
47 | $(GN_LIBINTL) | 47 | $(GN_LIBINTL) |
48 | 48 | ||
49 | gnunet_datastore_SOURCES = \ | 49 | gnunet_datastore_SOURCES = \ |
50 | gnunet-datastore.c | 50 | gnunet-datastore.c |
51 | gnunet_datastore_LDADD = \ | 51 | gnunet_datastore_LDADD = \ |
52 | libgnunetdatastore.la \ | 52 | libgnunetdatastore.la \ |
53 | $(top_builddir)/src/util/libgnunetutil.la \ | 53 | $(top_builddir)/src/util/libgnunetutil.la \ |
@@ -104,8 +104,12 @@ plugin_LTLIBRARIES = \ | |||
104 | $(SQLITE_PLUGIN) \ | 104 | $(SQLITE_PLUGIN) \ |
105 | $(MYSQL_PLUGIN) \ | 105 | $(MYSQL_PLUGIN) \ |
106 | $(POSTGRES_PLUGIN) \ | 106 | $(POSTGRES_PLUGIN) \ |
107 | libgnunet_plugin_datastore_heap.la \ | 107 | libgnunet_plugin_datastore_heap.la |
108 | libgnunet_plugin_datastore_template.la | 108 | |
109 | # Real plugins should of course go into | ||
110 | # plugin_LTLIBRARIES | ||
111 | noinst_LTLIBRARIES = \ | ||
112 | libgnunet_plugin_datastore_template.la | ||
109 | 113 | ||
110 | 114 | ||
111 | libgnunet_plugin_datastore_sqlite_la_SOURCES = \ | 115 | libgnunet_plugin_datastore_sqlite_la_SOURCES = \ |
@@ -178,33 +182,33 @@ test_datastore_api_heap_SOURCES = \ | |||
178 | test_datastore_api_heap_LDADD = \ | 182 | test_datastore_api_heap_LDADD = \ |
179 | $(top_builddir)/src/testing/libgnunettesting.la \ | 183 | $(top_builddir)/src/testing/libgnunettesting.la \ |
180 | libgnunetdatastore.la \ | 184 | libgnunetdatastore.la \ |
181 | $(top_builddir)/src/util/libgnunetutil.la | 185 | $(top_builddir)/src/util/libgnunetutil.la |
182 | 186 | ||
183 | test_datastore_api_management_heap_SOURCES = \ | 187 | test_datastore_api_management_heap_SOURCES = \ |
184 | test_datastore_api_management.c | 188 | test_datastore_api_management.c |
185 | test_datastore_api_management_heap_LDADD = \ | 189 | test_datastore_api_management_heap_LDADD = \ |
186 | $(top_builddir)/src/testing/libgnunettesting.la \ | 190 | $(top_builddir)/src/testing/libgnunettesting.la \ |
187 | libgnunetdatastore.la \ | 191 | libgnunetdatastore.la \ |
188 | $(top_builddir)/src/util/libgnunetutil.la | 192 | $(top_builddir)/src/util/libgnunetutil.la |
189 | 193 | ||
190 | perf_datastore_api_heap_SOURCES = \ | 194 | perf_datastore_api_heap_SOURCES = \ |
191 | perf_datastore_api.c | 195 | perf_datastore_api.c |
192 | perf_datastore_api_heap_LDADD = \ | 196 | perf_datastore_api_heap_LDADD = \ |
193 | $(top_builddir)/src/testing/libgnunettesting.la \ | 197 | $(top_builddir)/src/testing/libgnunettesting.la \ |
194 | libgnunetdatastore.la \ | 198 | libgnunetdatastore.la \ |
195 | $(top_builddir)/src/util/libgnunetutil.la | 199 | $(top_builddir)/src/util/libgnunetutil.la |
196 | 200 | ||
197 | perf_plugin_datastore_heap_SOURCES = \ | 201 | perf_plugin_datastore_heap_SOURCES = \ |
198 | perf_plugin_datastore.c | 202 | perf_plugin_datastore.c |
199 | perf_plugin_datastore_heap_LDADD = \ | 203 | perf_plugin_datastore_heap_LDADD = \ |
200 | $(top_builddir)/src/testing/libgnunettesting.la \ | 204 | $(top_builddir)/src/testing/libgnunettesting.la \ |
201 | $(top_builddir)/src/util/libgnunetutil.la | 205 | $(top_builddir)/src/util/libgnunetutil.la |
202 | 206 | ||
203 | test_plugin_datastore_heap_SOURCES = \ | 207 | test_plugin_datastore_heap_SOURCES = \ |
204 | test_plugin_datastore.c | 208 | test_plugin_datastore.c |
205 | test_plugin_datastore_heap_LDADD = \ | 209 | test_plugin_datastore_heap_LDADD = \ |
206 | $(top_builddir)/src/testing/libgnunettesting.la \ | 210 | $(top_builddir)/src/testing/libgnunettesting.la \ |
207 | $(top_builddir)/src/util/libgnunetutil.la | 211 | $(top_builddir)/src/util/libgnunetutil.la |
208 | 212 | ||
209 | 213 | ||
210 | test_datastore_api_sqlite_SOURCES = \ | 214 | test_datastore_api_sqlite_SOURCES = \ |
@@ -212,33 +216,33 @@ test_datastore_api_sqlite_SOURCES = \ | |||
212 | test_datastore_api_sqlite_LDADD = \ | 216 | test_datastore_api_sqlite_LDADD = \ |
213 | $(top_builddir)/src/testing/libgnunettesting.la \ | 217 | $(top_builddir)/src/testing/libgnunettesting.la \ |
214 | libgnunetdatastore.la \ | 218 | libgnunetdatastore.la \ |
215 | $(top_builddir)/src/util/libgnunetutil.la | 219 | $(top_builddir)/src/util/libgnunetutil.la |
216 | 220 | ||
217 | test_datastore_api_management_sqlite_SOURCES = \ | 221 | test_datastore_api_management_sqlite_SOURCES = \ |
218 | test_datastore_api_management.c | 222 | test_datastore_api_management.c |
219 | test_datastore_api_management_sqlite_LDADD = \ | 223 | test_datastore_api_management_sqlite_LDADD = \ |
220 | $(top_builddir)/src/testing/libgnunettesting.la \ | 224 | $(top_builddir)/src/testing/libgnunettesting.la \ |
221 | libgnunetdatastore.la \ | 225 | libgnunetdatastore.la \ |
222 | $(top_builddir)/src/util/libgnunetutil.la | 226 | $(top_builddir)/src/util/libgnunetutil.la |
223 | 227 | ||
224 | perf_datastore_api_sqlite_SOURCES = \ | 228 | perf_datastore_api_sqlite_SOURCES = \ |
225 | perf_datastore_api.c | 229 | perf_datastore_api.c |
226 | perf_datastore_api_sqlite_LDADD = \ | 230 | perf_datastore_api_sqlite_LDADD = \ |
227 | $(top_builddir)/src/testing/libgnunettesting.la \ | 231 | $(top_builddir)/src/testing/libgnunettesting.la \ |
228 | libgnunetdatastore.la \ | 232 | libgnunetdatastore.la \ |
229 | $(top_builddir)/src/util/libgnunetutil.la | 233 | $(top_builddir)/src/util/libgnunetutil.la |
230 | 234 | ||
231 | perf_plugin_datastore_sqlite_SOURCES = \ | 235 | perf_plugin_datastore_sqlite_SOURCES = \ |
232 | perf_plugin_datastore.c | 236 | perf_plugin_datastore.c |
233 | perf_plugin_datastore_sqlite_LDADD = \ | 237 | perf_plugin_datastore_sqlite_LDADD = \ |
234 | $(top_builddir)/src/testing/libgnunettesting.la \ | 238 | $(top_builddir)/src/testing/libgnunettesting.la \ |
235 | $(top_builddir)/src/util/libgnunetutil.la | 239 | $(top_builddir)/src/util/libgnunetutil.la |
236 | 240 | ||
237 | test_plugin_datastore_sqlite_SOURCES = \ | 241 | test_plugin_datastore_sqlite_SOURCES = \ |
238 | test_plugin_datastore.c | 242 | test_plugin_datastore.c |
239 | test_plugin_datastore_sqlite_LDADD = \ | 243 | test_plugin_datastore_sqlite_LDADD = \ |
240 | $(top_builddir)/src/testing/libgnunettesting.la \ | 244 | $(top_builddir)/src/testing/libgnunettesting.la \ |
241 | $(top_builddir)/src/util/libgnunetutil.la | 245 | $(top_builddir)/src/util/libgnunetutil.la |
242 | 246 | ||
243 | 247 | ||
244 | test_datastore_api_mysql_SOURCES = \ | 248 | test_datastore_api_mysql_SOURCES = \ |
@@ -246,33 +250,33 @@ test_datastore_api_mysql_SOURCES = \ | |||
246 | test_datastore_api_mysql_LDADD = \ | 250 | test_datastore_api_mysql_LDADD = \ |
247 | $(top_builddir)/src/testing/libgnunettesting.la \ | 251 | $(top_builddir)/src/testing/libgnunettesting.la \ |
248 | libgnunetdatastore.la \ | 252 | libgnunetdatastore.la \ |
249 | $(top_builddir)/src/util/libgnunetutil.la | 253 | $(top_builddir)/src/util/libgnunetutil.la |
250 | 254 | ||
251 | test_datastore_api_management_mysql_SOURCES = \ | 255 | test_datastore_api_management_mysql_SOURCES = \ |
252 | test_datastore_api_management.c | 256 | test_datastore_api_management.c |
253 | test_datastore_api_management_mysql_LDADD = \ | 257 | test_datastore_api_management_mysql_LDADD = \ |
254 | $(top_builddir)/src/testing/libgnunettesting.la \ | 258 | $(top_builddir)/src/testing/libgnunettesting.la \ |
255 | libgnunetdatastore.la \ | 259 | libgnunetdatastore.la \ |
256 | $(top_builddir)/src/util/libgnunetutil.la | 260 | $(top_builddir)/src/util/libgnunetutil.la |
257 | 261 | ||
258 | perf_datastore_api_mysql_SOURCES = \ | 262 | perf_datastore_api_mysql_SOURCES = \ |
259 | perf_datastore_api.c | 263 | perf_datastore_api.c |
260 | perf_datastore_api_mysql_LDADD = \ | 264 | perf_datastore_api_mysql_LDADD = \ |
261 | $(top_builddir)/src/testing/libgnunettesting.la \ | 265 | $(top_builddir)/src/testing/libgnunettesting.la \ |
262 | libgnunetdatastore.la \ | 266 | libgnunetdatastore.la \ |
263 | $(top_builddir)/src/util/libgnunetutil.la | 267 | $(top_builddir)/src/util/libgnunetutil.la |
264 | 268 | ||
265 | test_plugin_datastore_mysql_SOURCES = \ | 269 | test_plugin_datastore_mysql_SOURCES = \ |
266 | test_plugin_datastore.c | 270 | test_plugin_datastore.c |
267 | test_plugin_datastore_mysql_LDADD = \ | 271 | test_plugin_datastore_mysql_LDADD = \ |
268 | $(top_builddir)/src/testing/libgnunettesting.la \ | 272 | $(top_builddir)/src/testing/libgnunettesting.la \ |
269 | $(top_builddir)/src/util/libgnunetutil.la | 273 | $(top_builddir)/src/util/libgnunetutil.la |
270 | 274 | ||
271 | perf_plugin_datastore_mysql_SOURCES = \ | 275 | perf_plugin_datastore_mysql_SOURCES = \ |
272 | perf_plugin_datastore.c | 276 | perf_plugin_datastore.c |
273 | perf_plugin_datastore_mysql_LDADD = \ | 277 | perf_plugin_datastore_mysql_LDADD = \ |
274 | $(top_builddir)/src/testing/libgnunettesting.la \ | 278 | $(top_builddir)/src/testing/libgnunettesting.la \ |
275 | $(top_builddir)/src/util/libgnunetutil.la | 279 | $(top_builddir)/src/util/libgnunetutil.la |
276 | 280 | ||
277 | 281 | ||
278 | test_datastore_api_postgres_SOURCES = \ | 282 | test_datastore_api_postgres_SOURCES = \ |
@@ -280,33 +284,33 @@ test_datastore_api_postgres_SOURCES = \ | |||
280 | test_datastore_api_postgres_LDADD = \ | 284 | test_datastore_api_postgres_LDADD = \ |
281 | $(top_builddir)/src/testing/libgnunettesting.la \ | 285 | $(top_builddir)/src/testing/libgnunettesting.la \ |
282 | libgnunetdatastore.la \ | 286 | libgnunetdatastore.la \ |
283 | $(top_builddir)/src/util/libgnunetutil.la | 287 | $(top_builddir)/src/util/libgnunetutil.la |
284 | 288 | ||
285 | test_datastore_api_management_postgres_SOURCES = \ | 289 | test_datastore_api_management_postgres_SOURCES = \ |
286 | test_datastore_api_management.c | 290 | test_datastore_api_management.c |
287 | test_datastore_api_management_postgres_LDADD = \ | 291 | test_datastore_api_management_postgres_LDADD = \ |
288 | $(top_builddir)/src/testing/libgnunettesting.la \ | 292 | $(top_builddir)/src/testing/libgnunettesting.la \ |
289 | libgnunetdatastore.la \ | 293 | libgnunetdatastore.la \ |
290 | $(top_builddir)/src/util/libgnunetutil.la | 294 | $(top_builddir)/src/util/libgnunetutil.la |
291 | 295 | ||
292 | perf_datastore_api_postgres_SOURCES = \ | 296 | perf_datastore_api_postgres_SOURCES = \ |
293 | perf_datastore_api.c | 297 | perf_datastore_api.c |
294 | perf_datastore_api_postgres_LDADD = \ | 298 | perf_datastore_api_postgres_LDADD = \ |
295 | $(top_builddir)/src/testing/libgnunettesting.la \ | 299 | $(top_builddir)/src/testing/libgnunettesting.la \ |
296 | libgnunetdatastore.la \ | 300 | libgnunetdatastore.la \ |
297 | $(top_builddir)/src/util/libgnunetutil.la | 301 | $(top_builddir)/src/util/libgnunetutil.la |
298 | 302 | ||
299 | test_plugin_datastore_postgres_SOURCES = \ | 303 | test_plugin_datastore_postgres_SOURCES = \ |
300 | test_plugin_datastore.c | 304 | test_plugin_datastore.c |
301 | test_plugin_datastore_postgres_LDADD = \ | 305 | test_plugin_datastore_postgres_LDADD = \ |
302 | $(top_builddir)/src/testing/libgnunettesting.la \ | 306 | $(top_builddir)/src/testing/libgnunettesting.la \ |
303 | $(top_builddir)/src/util/libgnunetutil.la | 307 | $(top_builddir)/src/util/libgnunetutil.la |
304 | 308 | ||
305 | perf_plugin_datastore_postgres_SOURCES = \ | 309 | perf_plugin_datastore_postgres_SOURCES = \ |
306 | perf_plugin_datastore.c | 310 | perf_plugin_datastore.c |
307 | perf_plugin_datastore_postgres_LDADD = \ | 311 | perf_plugin_datastore_postgres_LDADD = \ |
308 | $(top_builddir)/src/testing/libgnunettesting.la \ | 312 | $(top_builddir)/src/testing/libgnunettesting.la \ |
309 | $(top_builddir)/src/util/libgnunetutil.la | 313 | $(top_builddir)/src/util/libgnunetutil.la |
310 | 314 | ||
311 | 315 | ||
312 | EXTRA_DIST = \ | 316 | EXTRA_DIST = \ |
diff --git a/src/dht/Makefile.am b/src/dht/Makefile.am index 8bfcc4b7d..b252867b7 100644 --- a/src/dht/Makefile.am +++ b/src/dht/Makefile.am | |||
@@ -47,9 +47,13 @@ libgnunet_plugin_block_dht_la_LDFLAGS = \ | |||
47 | 47 | ||
48 | 48 | ||
49 | libexec_PROGRAMS = \ | 49 | libexec_PROGRAMS = \ |
50 | gnunet-service-dht \ | 50 | gnunet-service-dht |
51 | |||
52 | if HAVE_EXPERIMENTAL | ||
53 | libexec_PROGRAMS += \ | ||
51 | gnunet-service-dht-xvine \ | 54 | gnunet-service-dht-xvine \ |
52 | gnunet-service-dht-whanau | 55 | gnunet-service-dht-whanau |
56 | endif | ||
53 | 57 | ||
54 | noinst_PROGRAMS = \ | 58 | noinst_PROGRAMS = \ |
55 | gnunet-dht-monitor \ | 59 | gnunet-dht-monitor \ |
diff --git a/src/template/Makefile.am b/src/template/Makefile.am index b235109bc..bdd5d6ebf 100644 --- a/src/template/Makefile.am +++ b/src/template/Makefile.am | |||
@@ -9,27 +9,30 @@ dist_pkgcfg_DATA = \ | |||
9 | template.conf | 9 | template.conf |
10 | 10 | ||
11 | if MINGW | 11 | if MINGW |
12 | WINFLAGS = -Wl,--no-undefined -Wl,--export-all-symbols | 12 | WINFLAGS = -Wl,--no-undefined -Wl,--export-all-symbols |
13 | endif | 13 | endif |
14 | 14 | ||
15 | if USE_COVERAGE | 15 | if USE_COVERAGE |
16 | AM_CFLAGS = -fprofile-arcs -ftest-coverage | 16 | AM_CFLAGS = -fprofile-arcs -ftest-coverage |
17 | endif | 17 | endif |
18 | 18 | ||
19 | bin_PROGRAMS = \ | 19 | # Note: In a real installation, |
20 | gnunet-template | 20 | # bin_PROGRAMS should be used for gnunet-template |
21 | # libexec_PROGRAMS should be used for gnunet-service-template | ||
21 | 22 | ||
22 | libexec_PROGRAMS = \ | 23 | noinst_PROGRAMS = \ |
24 | gnunet-template \ | ||
23 | gnunet-service-template | 25 | gnunet-service-template |
24 | 26 | ||
27 | |||
25 | gnunet_template_SOURCES = \ | 28 | gnunet_template_SOURCES = \ |
26 | gnunet-template.c | 29 | gnunet-template.c |
27 | gnunet_template_LDADD = \ | 30 | gnunet_template_LDADD = \ |
28 | $(top_builddir)/src/util/libgnunetutil.la \ | 31 | $(top_builddir)/src/util/libgnunetutil.la \ |
29 | $(GN_LIBINTL) | 32 | $(GN_LIBINTL) |
30 | 33 | ||
31 | gnunet_service_template_SOURCES = \ | 34 | gnunet_service_template_SOURCES = \ |
32 | gnunet-service-template.c | 35 | gnunet-service-template.c |
33 | gnunet_service_template_LDADD = \ | 36 | gnunet_service_template_LDADD = \ |
34 | $(top_builddir)/src/util/libgnunetutil.la \ | 37 | $(top_builddir)/src/util/libgnunetutil.la \ |
35 | $(GN_LIBINTL) | 38 | $(GN_LIBINTL) |
@@ -46,5 +49,4 @@ endif | |||
46 | test_template_api_SOURCES = \ | 49 | test_template_api_SOURCES = \ |
47 | test_template_api.c | 50 | test_template_api.c |
48 | test_template_api_LDADD = \ | 51 | test_template_api_LDADD = \ |
49 | $(top_builddir)/src/util/libgnunetutil.la | 52 | $(top_builddir)/src/util/libgnunetutil.la |
50 | |||
diff --git a/src/transport/Makefile.am b/src/transport/Makefile.am index 42432a403..950b0a9a0 100644 --- a/src/transport/Makefile.am +++ b/src/transport/Makefile.am | |||
@@ -278,7 +278,11 @@ plugin_LTLIBRARIES = \ | |||
278 | $(HTTP_SERVER_PLUGIN_LA) \ | 278 | $(HTTP_SERVER_PLUGIN_LA) \ |
279 | $(HTTPS_SERVER_PLUGIN_LA) \ | 279 | $(HTTPS_SERVER_PLUGIN_LA) \ |
280 | $(WLAN_PLUGIN_LA) \ | 280 | $(WLAN_PLUGIN_LA) \ |
281 | $(BT_PLUGIN_LA) \ | 281 | $(BT_PLUGIN_LA) |
282 | |||
283 | # Note: real plugins of course need to be added | ||
284 | # to the plugin_LTLIBRARIES above | ||
285 | noinst_LTLIBRARIES = \ | ||
282 | libgnunet_plugin_transport_template.la | 286 | libgnunet_plugin_transport_template.la |
283 | 287 | ||
284 | libgnunet_plugin_transport_tcp_la_SOURCES = \ | 288 | libgnunet_plugin_transport_tcp_la_SOURCES = \ |