diff options
author | Christian Grothoff <christian@grothoff.org> | 2014-09-13 13:54:57 +0000 |
---|---|---|
committer | Christian Grothoff <christian@grothoff.org> | 2014-09-13 13:54:57 +0000 |
commit | d94c5185fcdf47c6a57d3233b946fa7e621f7ad9 (patch) | |
tree | 1ded577285183d6457bde8787b9bccaa01f12143 /src/namestore | |
parent | e184df6030ab5c5374fe3b8a94482ff5a30c1580 (diff) | |
download | gnunet-d94c5185fcdf47c6a57d3233b946fa7e621f7ad9.tar.gz gnunet-d94c5185fcdf47c6a57d3233b946fa7e621f7ad9.zip |
fixing parallel build, getting rid of useless _DEPENDENCIES declarations
Diffstat (limited to 'src/namestore')
-rw-r--r-- | src/namestore/Makefile.am | 55 |
1 files changed, 17 insertions, 38 deletions
diff --git a/src/namestore/Makefile.am b/src/namestore/Makefile.am index dba9e6a68..4f3a209b6 100644 --- a/src/namestore/Makefile.am +++ b/src/namestore/Makefile.am | |||
@@ -105,10 +105,6 @@ gnunet_namestore_LDADD = \ | |||
105 | $(top_builddir)/src/util/libgnunetutil.la \ | 105 | $(top_builddir)/src/util/libgnunetutil.la \ |
106 | libgnunetnamestore.la \ | 106 | libgnunetnamestore.la \ |
107 | $(GN_LIBINTL) | 107 | $(GN_LIBINTL) |
108 | gnunet_namestore_DEPENDENCIES = \ | ||
109 | $(top_builddir)/src/identity/libgnunetidentity.la \ | ||
110 | $(top_builddir)/src/util/libgnunetutil.la \ | ||
111 | libgnunetnamestore.la | ||
112 | 108 | ||
113 | 109 | ||
114 | gnunet_namestore_fcfsd_SOURCES = \ | 110 | gnunet_namestore_fcfsd_SOURCES = \ |
@@ -116,12 +112,9 @@ gnunet_namestore_fcfsd_SOURCES = \ | |||
116 | gnunet_namestore_fcfsd_LDADD = -lmicrohttpd \ | 112 | gnunet_namestore_fcfsd_LDADD = -lmicrohttpd \ |
117 | $(top_builddir)/src/gnsrecord/libgnunetgnsrecord.la \ | 113 | $(top_builddir)/src/gnsrecord/libgnunetgnsrecord.la \ |
118 | $(top_builddir)/src/identity/libgnunetidentity.la \ | 114 | $(top_builddir)/src/identity/libgnunetidentity.la \ |
119 | $(top_builddir)/src/namestore/libgnunetnamestore.la \ | 115 | libgnunetnamestore.la \ |
120 | $(top_builddir)/src/util/libgnunetutil.la \ | 116 | $(top_builddir)/src/util/libgnunetutil.la \ |
121 | $(GN_LIBINTL) | 117 | $(GN_LIBINTL) |
122 | gnunet_namestore_fcfsd_DEPENDENCIES = \ | ||
123 | $(top_builddir)/src/util/libgnunetutil.la \ | ||
124 | libgnunetnamestore.la | ||
125 | 118 | ||
126 | 119 | ||
127 | 120 | ||
@@ -135,10 +128,6 @@ gnunet_service_namestore_LDADD = \ | |||
135 | $(top_builddir)/src/util/libgnunetutil.la \ | 128 | $(top_builddir)/src/util/libgnunetutil.la \ |
136 | libgnunetnamestore.la \ | 129 | libgnunetnamestore.la \ |
137 | $(GN_LIBINTL) | 130 | $(GN_LIBINTL) |
138 | gnunet_service_namestore_DEPENDENCIES = \ | ||
139 | $(top_builddir)/src/statistics/libgnunetstatistics.la \ | ||
140 | $(top_builddir)/src/util/libgnunetutil.la \ | ||
141 | libgnunetnamestore.la | ||
142 | 131 | ||
143 | 132 | ||
144 | plugin_LTLIBRARIES = \ | 133 | plugin_LTLIBRARIES = \ |
@@ -154,11 +143,6 @@ libgnunet_plugin_namestore_sqlite_la_LIBADD = \ | |||
154 | $(LTLIBINTL) | 143 | $(LTLIBINTL) |
155 | libgnunet_plugin_namestore_sqlite_la_LDFLAGS = \ | 144 | libgnunet_plugin_namestore_sqlite_la_LDFLAGS = \ |
156 | $(GN_PLUGIN_LDFLAGS) | 145 | $(GN_PLUGIN_LDFLAGS) |
157 | libgnunet_plugin_namestore_sqlite_la_DEPENDENCIES = \ | ||
158 | $(top_builddir)/src/statistics/libgnunetstatistics.la \ | ||
159 | $(top_builddir)/src/util/libgnunetutil.la \ | ||
160 | libgnunetnamestore.la | ||
161 | |||
162 | 146 | ||
163 | libgnunet_plugin_namestore_postgres_la_SOURCES = \ | 147 | libgnunet_plugin_namestore_postgres_la_SOURCES = \ |
164 | plugin_namestore_postgres.c | 148 | plugin_namestore_postgres.c |
@@ -170,11 +154,6 @@ libgnunet_plugin_namestore_postgres_la_LIBADD = \ | |||
170 | $(LTLIBINTL) | 154 | $(LTLIBINTL) |
171 | libgnunet_plugin_namestore_postgres_la_LDFLAGS = \ | 155 | libgnunet_plugin_namestore_postgres_la_LDFLAGS = \ |
172 | $(GN_PLUGIN_LDFLAGS) $(POSTGRESQL_LDFLAGS) | 156 | $(GN_PLUGIN_LDFLAGS) $(POSTGRESQL_LDFLAGS) |
173 | libgnunet_plugin_namestore_postgres_la_DEPENDENCIES = \ | ||
174 | $(top_builddir)/src/postgres/libgnunetpostgres.la \ | ||
175 | $(top_builddir)/src/statistics/libgnunetstatistics.la \ | ||
176 | $(top_builddir)/src/util/libgnunetutil.la \ | ||
177 | libgnunetnamestore.la | ||
178 | 157 | ||
179 | test_namestore_api_store_SOURCES = \ | 158 | test_namestore_api_store_SOURCES = \ |
180 | test_namestore_api_store.c | 159 | test_namestore_api_store.c |
@@ -182,7 +161,7 @@ test_namestore_api_store_LDADD = \ | |||
182 | $(top_builddir)/src/testing/libgnunettesting.la \ | 161 | $(top_builddir)/src/testing/libgnunettesting.la \ |
183 | $(top_builddir)/src/util/libgnunetutil.la \ | 162 | $(top_builddir)/src/util/libgnunetutil.la \ |
184 | $(top_builddir)/src/gnsrecord/libgnunetgnsrecord.la \ | 163 | $(top_builddir)/src/gnsrecord/libgnunetgnsrecord.la \ |
185 | $(top_builddir)/src/namestore/libgnunetnamestore.la | 164 | libgnunetnamestore.la |
186 | 165 | ||
187 | test_namestore_api_store_update_SOURCES = \ | 166 | test_namestore_api_store_update_SOURCES = \ |
188 | test_namestore_api_store_update.c | 167 | test_namestore_api_store_update.c |
@@ -191,7 +170,7 @@ test_namestore_api_store_update_LDADD = \ | |||
191 | $(top_builddir)/src/util/libgnunetutil.la \ | 170 | $(top_builddir)/src/util/libgnunetutil.la \ |
192 | $(top_builddir)/src/gnsrecord/libgnunetgnsrecord.la \ | 171 | $(top_builddir)/src/gnsrecord/libgnunetgnsrecord.la \ |
193 | $(top_builddir)/src/namecache/libgnunetnamecache.la \ | 172 | $(top_builddir)/src/namecache/libgnunetnamecache.la \ |
194 | $(top_builddir)/src/namestore/libgnunetnamestore.la | 173 | libgnunetnamestore.la |
195 | 174 | ||
196 | test_namestore_api_lookup_public_SOURCES = \ | 175 | test_namestore_api_lookup_public_SOURCES = \ |
197 | test_namestore_api_lookup_public.c | 176 | test_namestore_api_lookup_public.c |
@@ -200,7 +179,7 @@ test_namestore_api_lookup_public_LDADD = \ | |||
200 | $(top_builddir)/src/util/libgnunetutil.la \ | 179 | $(top_builddir)/src/util/libgnunetutil.la \ |
201 | $(top_builddir)/src/gnsrecord/libgnunetgnsrecord.la \ | 180 | $(top_builddir)/src/gnsrecord/libgnunetgnsrecord.la \ |
202 | $(top_builddir)/src/namecache/libgnunetnamecache.la \ | 181 | $(top_builddir)/src/namecache/libgnunetnamecache.la \ |
203 | $(top_builddir)/src/namestore/libgnunetnamestore.la | 182 | libgnunetnamestore.la |
204 | 183 | ||
205 | test_namestore_api_lookup_nick_SOURCES = \ | 184 | test_namestore_api_lookup_nick_SOURCES = \ |
206 | test_namestore_api_lookup_nick.c | 185 | test_namestore_api_lookup_nick.c |
@@ -209,7 +188,7 @@ test_namestore_api_lookup_nick_LDADD = \ | |||
209 | $(top_builddir)/src/util/libgnunetutil.la \ | 188 | $(top_builddir)/src/util/libgnunetutil.la \ |
210 | $(top_builddir)/src/gnsrecord/libgnunetgnsrecord.la \ | 189 | $(top_builddir)/src/gnsrecord/libgnunetgnsrecord.la \ |
211 | $(top_builddir)/src/namecache/libgnunetnamecache.la \ | 190 | $(top_builddir)/src/namecache/libgnunetnamecache.la \ |
212 | $(top_builddir)/src/namestore/libgnunetnamestore.la | 191 | libgnunetnamestore.la |
213 | 192 | ||
214 | test_namestore_api_lookup_private_SOURCES = \ | 193 | test_namestore_api_lookup_private_SOURCES = \ |
215 | test_namestore_api_lookup_private.c | 194 | test_namestore_api_lookup_private.c |
@@ -218,7 +197,7 @@ test_namestore_api_lookup_private_LDADD = \ | |||
218 | $(top_builddir)/src/util/libgnunetutil.la \ | 197 | $(top_builddir)/src/util/libgnunetutil.la \ |
219 | $(top_builddir)/src/gnsrecord/libgnunetgnsrecord.la \ | 198 | $(top_builddir)/src/gnsrecord/libgnunetgnsrecord.la \ |
220 | $(top_builddir)/src/namecache/libgnunetnamecache.la \ | 199 | $(top_builddir)/src/namecache/libgnunetnamecache.la \ |
221 | $(top_builddir)/src/namestore/libgnunetnamestore.la | 200 | libgnunetnamestore.la |
222 | 201 | ||
223 | test_namestore_api_lookup_shadow_SOURCES = \ | 202 | test_namestore_api_lookup_shadow_SOURCES = \ |
224 | test_namestore_api_lookup_shadow.c | 203 | test_namestore_api_lookup_shadow.c |
@@ -227,7 +206,7 @@ test_namestore_api_lookup_shadow_LDADD = \ | |||
227 | $(top_builddir)/src/util/libgnunetutil.la \ | 206 | $(top_builddir)/src/util/libgnunetutil.la \ |
228 | $(top_builddir)/src/gnsrecord/libgnunetgnsrecord.la \ | 207 | $(top_builddir)/src/gnsrecord/libgnunetgnsrecord.la \ |
229 | $(top_builddir)/src/namecache/libgnunetnamecache.la \ | 208 | $(top_builddir)/src/namecache/libgnunetnamecache.la \ |
230 | $(top_builddir)/src/namestore/libgnunetnamestore.la | 209 | libgnunetnamestore.la |
231 | 210 | ||
232 | test_namestore_api_lookup_shadow_filter_SOURCES = \ | 211 | test_namestore_api_lookup_shadow_filter_SOURCES = \ |
233 | test_namestore_api_lookup_shadow_filter.c | 212 | test_namestore_api_lookup_shadow_filter.c |
@@ -236,7 +215,7 @@ test_namestore_api_lookup_shadow_filter_LDADD = \ | |||
236 | $(top_builddir)/src/util/libgnunetutil.la \ | 215 | $(top_builddir)/src/util/libgnunetutil.la \ |
237 | $(top_builddir)/src/gnsrecord/libgnunetgnsrecord.la \ | 216 | $(top_builddir)/src/gnsrecord/libgnunetgnsrecord.la \ |
238 | $(top_builddir)/src/namecache/libgnunetnamecache.la \ | 217 | $(top_builddir)/src/namecache/libgnunetnamecache.la \ |
239 | $(top_builddir)/src/namestore/libgnunetnamestore.la | 218 | libgnunetnamestore.la |
240 | 219 | ||
241 | test_namestore_api_remove_SOURCES = \ | 220 | test_namestore_api_remove_SOURCES = \ |
242 | test_namestore_api_remove.c | 221 | test_namestore_api_remove.c |
@@ -244,7 +223,7 @@ test_namestore_api_remove_LDADD = \ | |||
244 | $(top_builddir)/src/testing/libgnunettesting.la \ | 223 | $(top_builddir)/src/testing/libgnunettesting.la \ |
245 | $(top_builddir)/src/util/libgnunetutil.la \ | 224 | $(top_builddir)/src/util/libgnunetutil.la \ |
246 | $(top_builddir)/src/gnsrecord/libgnunetgnsrecord.la \ | 225 | $(top_builddir)/src/gnsrecord/libgnunetgnsrecord.la \ |
247 | $(top_builddir)/src/namestore/libgnunetnamestore.la | 226 | libgnunetnamestore.la |
248 | 227 | ||
249 | test_namestore_api_remove_not_existing_record_SOURCES = \ | 228 | test_namestore_api_remove_not_existing_record_SOURCES = \ |
250 | test_namestore_api_remove_not_existing_record.c | 229 | test_namestore_api_remove_not_existing_record.c |
@@ -252,20 +231,20 @@ test_namestore_api_remove_not_existing_record_LDADD = \ | |||
252 | $(top_builddir)/src/testing/libgnunettesting.la \ | 231 | $(top_builddir)/src/testing/libgnunettesting.la \ |
253 | $(top_builddir)/src/util/libgnunetutil.la \ | 232 | $(top_builddir)/src/util/libgnunetutil.la \ |
254 | $(top_builddir)/src/gnsrecord/libgnunetgnsrecord.la \ | 233 | $(top_builddir)/src/gnsrecord/libgnunetgnsrecord.la \ |
255 | $(top_builddir)/src/namestore/libgnunetnamestore.la | 234 | libgnunetnamestore.la |
256 | 235 | ||
257 | #test_namestore_api_zone_to_name_SOURCES = \ | 236 | #test_namestore_api_zone_to_name_SOURCES = \ |
258 | # test_namestore_api_zone_to_name.c | 237 | # test_namestore_api_zone_to_name.c |
259 | #test_namestore_api_zone_to_name_LDADD = \ | 238 | #test_namestore_api_zone_to_name_LDADD = \ |
260 | # $(top_builddir)/src/testing/libgnunettesting.la \ | 239 | # $(top_builddir)/src/testing/libgnunettesting.la \ |
261 | # $(top_builddir)/src/util/libgnunetutil.la \ | 240 | # $(top_builddir)/src/util/libgnunetutil.la \ |
262 | # $(top_builddir)/src/namestore/libgnunetnamestore.la | 241 | # libgnunetnamestore.la |
263 | 242 | ||
264 | test_namestore_api_monitoring_SOURCES = \ | 243 | test_namestore_api_monitoring_SOURCES = \ |
265 | test_namestore_api_monitoring.c | 244 | test_namestore_api_monitoring.c |
266 | test_namestore_api_monitoring_LDADD = \ | 245 | test_namestore_api_monitoring_LDADD = \ |
267 | $(top_builddir)/src/testing/libgnunettesting.la \ | 246 | $(top_builddir)/src/testing/libgnunettesting.la \ |
268 | $(top_builddir)/src/namestore/libgnunetnamestore.la \ | 247 | libgnunetnamestore.la \ |
269 | $(top_builddir)/src/gnsrecord/libgnunetgnsrecord.la \ | 248 | $(top_builddir)/src/gnsrecord/libgnunetgnsrecord.la \ |
270 | $(top_builddir)/src/util/libgnunetutil.la | 249 | $(top_builddir)/src/util/libgnunetutil.la |
271 | 250 | ||
@@ -273,7 +252,7 @@ test_namestore_api_monitoring_existing_SOURCES = \ | |||
273 | test_namestore_api_monitoring_existing.c | 252 | test_namestore_api_monitoring_existing.c |
274 | test_namestore_api_monitoring_existing_LDADD = \ | 253 | test_namestore_api_monitoring_existing_LDADD = \ |
275 | $(top_builddir)/src/testing/libgnunettesting.la \ | 254 | $(top_builddir)/src/testing/libgnunettesting.la \ |
276 | $(top_builddir)/src/namestore/libgnunetnamestore.la \ | 255 | libgnunetnamestore.la \ |
277 | $(top_builddir)/src/gnsrecord/libgnunetgnsrecord.la \ | 256 | $(top_builddir)/src/gnsrecord/libgnunetgnsrecord.la \ |
278 | $(top_builddir)/src/util/libgnunetutil.la | 257 | $(top_builddir)/src/util/libgnunetutil.la |
279 | 258 | ||
@@ -283,7 +262,7 @@ test_namestore_api_zone_iteration_LDADD = \ | |||
283 | $(top_builddir)/src/testing/libgnunettesting.la \ | 262 | $(top_builddir)/src/testing/libgnunettesting.la \ |
284 | $(top_builddir)/src/util/libgnunetutil.la \ | 263 | $(top_builddir)/src/util/libgnunetutil.la \ |
285 | $(top_builddir)/src/gnsrecord/libgnunetgnsrecord.la \ | 264 | $(top_builddir)/src/gnsrecord/libgnunetgnsrecord.la \ |
286 | $(top_builddir)/src/namestore/libgnunetnamestore.la | 265 | libgnunetnamestore.la |
287 | 266 | ||
288 | test_namestore_api_zone_iteration_nick_SOURCES = \ | 267 | test_namestore_api_zone_iteration_nick_SOURCES = \ |
289 | test_namestore_api_zone_iteration_nick.c | 268 | test_namestore_api_zone_iteration_nick.c |
@@ -291,7 +270,7 @@ test_namestore_api_zone_iteration_nick_LDADD = \ | |||
291 | $(top_builddir)/src/testing/libgnunettesting.la \ | 270 | $(top_builddir)/src/testing/libgnunettesting.la \ |
292 | $(top_builddir)/src/util/libgnunetutil.la \ | 271 | $(top_builddir)/src/util/libgnunetutil.la \ |
293 | $(top_builddir)/src/gnsrecord/libgnunetgnsrecord.la \ | 272 | $(top_builddir)/src/gnsrecord/libgnunetgnsrecord.la \ |
294 | $(top_builddir)/src/namestore/libgnunetnamestore.la | 273 | libgnunetnamestore.la |
295 | 274 | ||
296 | 275 | ||
297 | test_namestore_api_zone_iteration_specific_zone_SOURCES = \ | 276 | test_namestore_api_zone_iteration_specific_zone_SOURCES = \ |
@@ -300,7 +279,7 @@ test_namestore_api_zone_iteration_specific_zone_LDADD = \ | |||
300 | $(top_builddir)/src/testing/libgnunettesting.la \ | 279 | $(top_builddir)/src/testing/libgnunettesting.la \ |
301 | $(top_builddir)/src/util/libgnunetutil.la \ | 280 | $(top_builddir)/src/util/libgnunetutil.la \ |
302 | $(top_builddir)/src/gnsrecord/libgnunetgnsrecord.la \ | 281 | $(top_builddir)/src/gnsrecord/libgnunetgnsrecord.la \ |
303 | $(top_builddir)/src/namestore/libgnunetnamestore.la | 282 | libgnunetnamestore.la |
304 | 283 | ||
305 | test_namestore_api_zone_iteration_stop_SOURCES = \ | 284 | test_namestore_api_zone_iteration_stop_SOURCES = \ |
306 | test_namestore_api_zone_iteration_stop.c | 285 | test_namestore_api_zone_iteration_stop.c |
@@ -308,7 +287,7 @@ test_namestore_api_zone_iteration_stop_LDADD = \ | |||
308 | $(top_builddir)/src/testing/libgnunettesting.la \ | 287 | $(top_builddir)/src/testing/libgnunettesting.la \ |
309 | $(top_builddir)/src/util/libgnunetutil.la \ | 288 | $(top_builddir)/src/util/libgnunetutil.la \ |
310 | $(top_builddir)/src/gnsrecord/libgnunetgnsrecord.la \ | 289 | $(top_builddir)/src/gnsrecord/libgnunetgnsrecord.la \ |
311 | $(top_builddir)/src/namestore/libgnunetnamestore.la | 290 | libgnunetnamestore.la |
312 | 291 | ||
313 | test_plugin_namestore_sqlite_SOURCES = \ | 292 | test_plugin_namestore_sqlite_SOURCES = \ |
314 | test_plugin_namestore.c | 293 | test_plugin_namestore.c |