aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--src/arm/Makefile.am13
-rw-r--r--src/ats/Makefile.am112
-rw-r--r--src/block/Makefile.am10
-rw-r--r--src/cadet/Makefile.am42
-rw-r--r--src/consensus/Makefile.am10
-rw-r--r--src/core/Makefile.am20
-rw-r--r--src/datacache/Makefile.am18
-rw-r--r--src/datastore/Makefile.am28
-rw-r--r--src/dht/Makefile.am59
-rw-r--r--src/dns/Makefile.am21
-rw-r--r--src/dv/Makefile.am4
-rw-r--r--src/env/Makefile.am6
-rw-r--r--src/fragmentation/Makefile.am2
-rw-r--r--src/fs/Makefile.am136
-rw-r--r--src/gns/Makefile.am56
-rw-r--r--src/gnsrecord/Makefile.am6
-rw-r--r--src/hello/Makefile.am9
-rw-r--r--src/identity/Makefile.am17
-rw-r--r--src/multicast/Makefile.am12
-rw-r--r--src/namecache/Makefile.am27
-rw-r--r--src/namestore/Makefile.am55
-rw-r--r--src/nat/Makefile.am10
-rw-r--r--src/nse/Makefile.am19
-rw-r--r--src/peerinfo/Makefile.am10
-rw-r--r--src/peerstore/Makefile.am19
-rw-r--r--src/psyc/Makefile.am20
-rw-r--r--src/psycstore/Makefile.am20
-rw-r--r--src/regex/Makefile.am88
-rw-r--r--src/revocation/Makefile.am6
-rw-r--r--src/scalarproduct/Makefile.am4
-rw-r--r--src/secretsharing/Makefile.am8
-rw-r--r--src/sensor/Makefile.am10
-rw-r--r--src/set/Makefile.am10
-rw-r--r--src/social/Makefile.am22
-rw-r--r--src/statistics/Makefile.am16
-rw-r--r--src/testbed/Makefile.am28
-rw-r--r--src/testing/Makefile.am14
-rw-r--r--src/transport/Makefile.am324
-rw-r--r--src/tun/Makefile.am4
-rw-r--r--src/util/Makefile.am141
-rw-r--r--src/vpn/Makefile.am4
41 files changed, 488 insertions, 952 deletions
diff --git a/src/arm/Makefile.am b/src/arm/Makefile.am
index a3ba06652..5f2206712 100644
--- a/src/arm/Makefile.am
+++ b/src/arm/Makefile.am
@@ -40,20 +40,15 @@ libexec_PROGRAMS = \
40gnunet_arm_SOURCES = \ 40gnunet_arm_SOURCES = \
41 gnunet-arm.c 41 gnunet-arm.c
42gnunet_arm_LDADD = \ 42gnunet_arm_LDADD = \
43 $(top_builddir)/src/arm/libgnunetarm.la \ 43 libgnunetarm.la \
44 $(top_builddir)/src/util/libgnunetutil.la \ 44 $(top_builddir)/src/util/libgnunetutil.la \
45 $(GN_LIBINTL) 45 $(GN_LIBINTL)
46gnunet_arm_DEPENDENCIES = \
47 libgnunetarm.la
48 46
49gnunet_service_arm_SOURCES = \ 47gnunet_service_arm_SOURCES = \
50 gnunet-service-arm.c 48 gnunet-service-arm.c
51gnunet_service_arm_LDADD = \ 49gnunet_service_arm_LDADD = \
52 $(top_builddir)/src/util/libgnunetutil.la \ 50 $(top_builddir)/src/util/libgnunetutil.la \
53 $(GN_LIBINTL) 51 $(GN_LIBINTL)
54gnunet_service_arm_DEPENDENCIES = \
55 libgnunetarm.la
56
57 52
58mockup_service_SOURCES = \ 53mockup_service_SOURCES = \
59 mockup-service.c 54 mockup-service.c
@@ -79,19 +74,19 @@ endif
79test_arm_api_SOURCES = \ 74test_arm_api_SOURCES = \
80 test_arm_api.c 75 test_arm_api.c
81test_arm_api_LDADD = \ 76test_arm_api_LDADD = \
82 $(top_builddir)/src/arm/libgnunetarm.la \ 77 libgnunetarm.la \
83 $(top_builddir)/src/util/libgnunetutil.la 78 $(top_builddir)/src/util/libgnunetutil.la
84 79
85test_exponential_backoff_SOURCES = \ 80test_exponential_backoff_SOURCES = \
86 test_exponential_backoff.c 81 test_exponential_backoff.c
87test_exponential_backoff_LDADD = \ 82test_exponential_backoff_LDADD = \
88 $(top_builddir)/src/arm/libgnunetarm.la \ 83 libgnunetarm.la \
89 $(top_builddir)/src/util/libgnunetutil.la 84 $(top_builddir)/src/util/libgnunetutil.la
90 85
91test_gnunet_service_arm_SOURCES = \ 86test_gnunet_service_arm_SOURCES = \
92 test_gnunet_service_arm.c 87 test_gnunet_service_arm.c
93 test_gnunet_service_arm_LDADD = \ 88 test_gnunet_service_arm_LDADD = \
94 $(top_builddir)/src/arm/libgnunetarm.la \ 89 libgnunetarm.la \
95 $(top_builddir)/src/util/libgnunetutil.la 90 $(top_builddir)/src/util/libgnunetutil.la
96 91
97do_subst = $(SED) -e 's,[@]PYTHON[@],$(PYTHON),g' 92do_subst = $(SED) -e 's,[@]PYTHON[@],$(PYTHON),g'
diff --git a/src/ats/Makefile.am b/src/ats/Makefile.am
index d7a321522..c6e7c186d 100644
--- a/src/ats/Makefile.am
+++ b/src/ats/Makefile.am
@@ -45,13 +45,9 @@ gnunet_ats_solver_eval_SOURCES = \
45 gnunet-service-ats_normalization.c 45 gnunet-service-ats_normalization.c
46gnunet_ats_solver_eval_LDADD = \ 46gnunet_ats_solver_eval_LDADD = \
47 $(top_builddir)/src/util/libgnunetutil.la \ 47 $(top_builddir)/src/util/libgnunetutil.la \
48 $(top_builddir)/src/ats/libgnunetats.la \ 48 libgnunetats.la \
49 $(top_builddir)/src/statistics/libgnunetstatistics.la \ 49 $(top_builddir)/src/statistics/libgnunetstatistics.la \
50 $(LTLIBINTL) 50 $(LTLIBINTL)
51gnunet_ats_solver_eval_DEPENDENCIES = \
52 $(top_builddir)/src/util/libgnunetutil.la \
53 $(top_builddir)/src/ats/libgnunetats.la \
54 $(top_builddir)/src/statistics/libgnunetstatistics.la
55 51
56libgnunetats_la_SOURCES = \ 52libgnunetats_la_SOURCES = \
57 ats_api_scheduling.c \ 53 ats_api_scheduling.c \
@@ -66,14 +62,10 @@ libgnunetats_la_LDFLAGS = \
66libgnunet_plugin_ats_proportional_la_SOURCES = \ 62libgnunet_plugin_ats_proportional_la_SOURCES = \
67 plugin_ats_proportional.c 63 plugin_ats_proportional.c
68libgnunet_plugin_ats_proportional_la_LIBADD = \ 64libgnunet_plugin_ats_proportional_la_LIBADD = \
69 $(top_builddir)/src/ats/libgnunetats.la \ 65 libgnunetats.la \
70 $(top_builddir)/src/statistics/libgnunetstatistics.la \ 66 $(top_builddir)/src/statistics/libgnunetstatistics.la \
71 $(top_builddir)/src/util/libgnunetutil.la \ 67 $(top_builddir)/src/util/libgnunetutil.la \
72 $(LTLIBINTL) 68 $(LTLIBINTL)
73libgnunet_plugin_ats_proportional_la_DEPENDENCIES = \
74 $(top_builddir)/src/ats/libgnunetats.la \
75 $(top_builddir)/src/statistics/libgnunetstatistics.la \
76 $(top_builddir)/src/util/libgnunetutil.la
77libgnunet_plugin_ats_proportional_la_LDFLAGS = \ 69libgnunet_plugin_ats_proportional_la_LDFLAGS = \
78 $(GN_PLUGIN_LDFLAGS) 70 $(GN_PLUGIN_LDFLAGS)
79 71
@@ -82,30 +74,22 @@ if HAVE_LIBGLPK
82libgnunet_plugin_ats_mlp_la_SOURCES = \ 74libgnunet_plugin_ats_mlp_la_SOURCES = \
83 plugin_ats_mlp.c 75 plugin_ats_mlp.c
84libgnunet_plugin_ats_mlp_la_LIBADD = \ 76libgnunet_plugin_ats_mlp_la_LIBADD = \
85 $(top_builddir)/src/ats/libgnunetats.la \ 77 libgnunetats.la \
86 $(top_builddir)/src/statistics/libgnunetstatistics.la \ 78 $(top_builddir)/src/statistics/libgnunetstatistics.la \
87 $(top_builddir)/src/util/libgnunetutil.la 79 $(top_builddir)/src/util/libgnunetutil.la
88libgnunet_plugin_ats_mlp_la_LDFLAGS = \ 80libgnunet_plugin_ats_mlp_la_LDFLAGS = \
89 $(GN_PLUGIN_LDFLAGS) $(GN_LIBGLPK) 81 $(GN_PLUGIN_LDFLAGS) $(GN_LIBGLPK)
90libgnunet_plugin_ats_mlp_la_DEPENDENCIES = \
91 $(top_builddir)/src/ats/libgnunetats.la \
92 $(top_builddir)/src/statistics/libgnunetstatistics.la \
93 $(top_builddir)/src/util/libgnunetutil.la
94endif 82endif
95 83
96libgnunet_plugin_ats_ril_la_SOURCES = \ 84libgnunet_plugin_ats_ril_la_SOURCES = \
97 plugin_ats_ril.c 85 plugin_ats_ril.c
98libgnunet_plugin_ats_ril_la_LIBADD = \ 86libgnunet_plugin_ats_ril_la_LIBADD = \
99 $(top_builddir)/src/ats/libgnunetats.la \ 87 libgnunetats.la \
100 $(top_builddir)/src/statistics/libgnunetstatistics.la \ 88 $(top_builddir)/src/statistics/libgnunetstatistics.la \
101 $(top_builddir)/src/util/libgnunetutil.la \ 89 $(top_builddir)/src/util/libgnunetutil.la \
102 $(LTLIBINTL) 90 $(LTLIBINTL)
103libgnunet_plugin_ats_ril_la_LDFLAGS = \ 91libgnunet_plugin_ats_ril_la_LDFLAGS = \
104 $(GN_PLUGIN_LDFLAGS) 92 $(GN_PLUGIN_LDFLAGS)
105libgnunet_plugin_ats_ril_la_DEPENDENCIES = \
106 $(top_builddir)/src/ats/libgnunetats.la \
107 $(top_builddir)/src/statistics/libgnunetstatistics.la \
108 $(top_builddir)/src/util/libgnunetutil.la
109 93
110libexec_PROGRAMS = \ 94libexec_PROGRAMS = \
111 gnunet-service-ats 95 gnunet-service-ats
@@ -120,12 +104,8 @@ gnunet_service_ats_SOURCES = \
120gnunet_service_ats_LDADD = \ 104gnunet_service_ats_LDADD = \
121 $(top_builddir)/src/statistics/libgnunetstatistics.la \ 105 $(top_builddir)/src/statistics/libgnunetstatistics.la \
122 $(top_builddir)/src/util/libgnunetutil.la \ 106 $(top_builddir)/src/util/libgnunetutil.la \
123 $(top_builddir)/src/ats/libgnunetats.la \ 107 libgnunetats.la \
124 $(GN_LIBINTL) 108 $(GN_LIBINTL)
125gnunet_service_ats_DEPENDENCIES = \
126 $(top_builddir)/src/statistics/libgnunetstatistics.la \
127 $(top_builddir)/src/util/libgnunetutil.la \
128 $(top_builddir)/src/ats/libgnunetats.la
129 109
130if HAVE_TESTING 110if HAVE_TESTING
131TESTING_TESTS = \ 111TESTING_TESTS = \
@@ -181,7 +161,7 @@ test_ats_api_scheduling_init_SOURCES = \
181test_ats_api_scheduling_init_LDADD = \ 161test_ats_api_scheduling_init_LDADD = \
182 $(top_builddir)/src/util/libgnunetutil.la \ 162 $(top_builddir)/src/util/libgnunetutil.la \
183 $(top_builddir)/src/testing/libgnunettesting.la \ 163 $(top_builddir)/src/testing/libgnunettesting.la \
184 $(top_builddir)/src/ats/libgnunetats.la \ 164 libgnunetats.la \
185 $(top_builddir)/src/statistics/libgnunetstatistics.la 165 $(top_builddir)/src/statistics/libgnunetstatistics.la
186 166
187test_ats_api_scheduling_add_address_SOURCES = \ 167test_ats_api_scheduling_add_address_SOURCES = \
@@ -190,7 +170,7 @@ test_ats_api_scheduling_add_address_SOURCES = \
190test_ats_api_scheduling_add_address_LDADD = \ 170test_ats_api_scheduling_add_address_LDADD = \
191 $(top_builddir)/src/util/libgnunetutil.la \ 171 $(top_builddir)/src/util/libgnunetutil.la \
192 $(top_builddir)/src/testing/libgnunettesting.la \ 172 $(top_builddir)/src/testing/libgnunettesting.la \
193 $(top_builddir)/src/ats/libgnunetats.la \ 173 libgnunetats.la \
194 $(top_builddir)/src/statistics/libgnunetstatistics.la 174 $(top_builddir)/src/statistics/libgnunetstatistics.la
195 175
196test_ats_api_scheduling_add_address_inbound_SOURCES = \ 176test_ats_api_scheduling_add_address_inbound_SOURCES = \
@@ -199,7 +179,7 @@ test_ats_api_scheduling_add_address_inbound_SOURCES = \
199test_ats_api_scheduling_add_address_inbound_LDADD = \ 179test_ats_api_scheduling_add_address_inbound_LDADD = \
200 $(top_builddir)/src/util/libgnunetutil.la \ 180 $(top_builddir)/src/util/libgnunetutil.la \
201 $(top_builddir)/src/testing/libgnunettesting.la \ 181 $(top_builddir)/src/testing/libgnunettesting.la \
202 $(top_builddir)/src/ats/libgnunetats.la \ 182 libgnunetats.la \
203 $(top_builddir)/src/statistics/libgnunetstatistics.la 183 $(top_builddir)/src/statistics/libgnunetstatistics.la
204 184
205test_ats_api_scheduling_add_address_duplicate_SOURCES = \ 185test_ats_api_scheduling_add_address_duplicate_SOURCES = \
@@ -208,7 +188,7 @@ test_ats_api_scheduling_add_address_duplicate_SOURCES = \
208test_ats_api_scheduling_add_address_duplicate_LDADD = \ 188test_ats_api_scheduling_add_address_duplicate_LDADD = \
209 $(top_builddir)/src/util/libgnunetutil.la \ 189 $(top_builddir)/src/util/libgnunetutil.la \
210 $(top_builddir)/src/testing/libgnunettesting.la \ 190 $(top_builddir)/src/testing/libgnunettesting.la \
211 $(top_builddir)/src/ats/libgnunetats.la \ 191 libgnunetats.la \
212 $(top_builddir)/src/statistics/libgnunetstatistics.la 192 $(top_builddir)/src/statistics/libgnunetstatistics.la
213 193
214test_ats_api_scheduling_destroy_address_SOURCES = \ 194test_ats_api_scheduling_destroy_address_SOURCES = \
@@ -217,7 +197,7 @@ test_ats_api_scheduling_destroy_address_SOURCES = \
217test_ats_api_scheduling_destroy_address_LDADD = \ 197test_ats_api_scheduling_destroy_address_LDADD = \
218 $(top_builddir)/src/util/libgnunetutil.la \ 198 $(top_builddir)/src/util/libgnunetutil.la \
219 $(top_builddir)/src/testing/libgnunettesting.la \ 199 $(top_builddir)/src/testing/libgnunettesting.la \
220 $(top_builddir)/src/ats/libgnunetats.la \ 200 libgnunetats.la \
221 $(top_builddir)/src/statistics/libgnunetstatistics.la 201 $(top_builddir)/src/statistics/libgnunetstatistics.la
222 202
223test_ats_api_scheduling_destroy_address_twice_SOURCES = \ 203test_ats_api_scheduling_destroy_address_twice_SOURCES = \
@@ -226,7 +206,7 @@ test_ats_api_scheduling_destroy_address_twice_SOURCES = \
226test_ats_api_scheduling_destroy_address_twice_LDADD = \ 206test_ats_api_scheduling_destroy_address_twice_LDADD = \
227 $(top_builddir)/src/util/libgnunetutil.la \ 207 $(top_builddir)/src/util/libgnunetutil.la \
228 $(top_builddir)/src/testing/libgnunettesting.la \ 208 $(top_builddir)/src/testing/libgnunettesting.la \
229 $(top_builddir)/src/ats/libgnunetats.la \ 209 libgnunetats.la \
230 $(top_builddir)/src/statistics/libgnunetstatistics.la 210 $(top_builddir)/src/statistics/libgnunetstatistics.la
231 211
232test_ats_api_scheduling_add_session_SOURCES = \ 212test_ats_api_scheduling_add_session_SOURCES = \
@@ -234,7 +214,7 @@ test_ats_api_scheduling_add_session_SOURCES = \
234test_ats_api_scheduling_add_session_LDADD = \ 214test_ats_api_scheduling_add_session_LDADD = \
235 $(top_builddir)/src/util/libgnunetutil.la \ 215 $(top_builddir)/src/util/libgnunetutil.la \
236 $(top_builddir)/src/testing/libgnunettesting.la \ 216 $(top_builddir)/src/testing/libgnunettesting.la \
237 $(top_builddir)/src/ats/libgnunetats.la \ 217 libgnunetats.la \
238 $(top_builddir)/src/statistics/libgnunetstatistics.la 218 $(top_builddir)/src/statistics/libgnunetstatistics.la
239 219
240test_ats_api_scheduling_destroy_session_SOURCES = \ 220test_ats_api_scheduling_destroy_session_SOURCES = \
@@ -242,7 +222,7 @@ test_ats_api_scheduling_destroy_session_SOURCES = \
242test_ats_api_scheduling_destroy_session_LDADD = \ 222test_ats_api_scheduling_destroy_session_LDADD = \
243 $(top_builddir)/src/util/libgnunetutil.la \ 223 $(top_builddir)/src/util/libgnunetutil.la \
244 $(top_builddir)/src/testing/libgnunettesting.la \ 224 $(top_builddir)/src/testing/libgnunettesting.la \
245 $(top_builddir)/src/ats/libgnunetats.la \ 225 libgnunetats.la \
246 $(top_builddir)/src/statistics/libgnunetstatistics.la 226 $(top_builddir)/src/statistics/libgnunetstatistics.la
247 227
248# performance API tests 228# performance API tests
@@ -253,7 +233,7 @@ test_ats_api_performance_list_all_addresses_LDADD = \
253 $(top_builddir)/src/util/libgnunetutil.la \ 233 $(top_builddir)/src/util/libgnunetutil.la \
254 $(top_builddir)/src/testing/libgnunettesting.la \ 234 $(top_builddir)/src/testing/libgnunettesting.la \
255 $(top_builddir)/src/hello/libgnunethello.la \ 235 $(top_builddir)/src/hello/libgnunethello.la \
256 $(top_builddir)/src/ats/libgnunetats.la \ 236 libgnunetats.la \
257 $(top_builddir)/src/statistics/libgnunetstatistics.la 237 $(top_builddir)/src/statistics/libgnunetstatistics.la
258 238
259test_ats_api_performance_list_peer_addresses_SOURCES = \ 239test_ats_api_performance_list_peer_addresses_SOURCES = \
@@ -262,7 +242,7 @@ test_ats_api_performance_list_peer_addresses_LDADD = \
262 $(top_builddir)/src/util/libgnunetutil.la \ 242 $(top_builddir)/src/util/libgnunetutil.la \
263 $(top_builddir)/src/testing/libgnunettesting.la \ 243 $(top_builddir)/src/testing/libgnunettesting.la \
264 $(top_builddir)/src/hello/libgnunethello.la \ 244 $(top_builddir)/src/hello/libgnunethello.la \
265 $(top_builddir)/src/ats/libgnunetats.la \ 245 libgnunetats.la \
266 $(top_builddir)/src/statistics/libgnunetstatistics.la 246 $(top_builddir)/src/statistics/libgnunetstatistics.la
267 247
268test_ats_api_performance_list_all_addresses_active_SOURCES = \ 248test_ats_api_performance_list_all_addresses_active_SOURCES = \
@@ -271,7 +251,7 @@ test_ats_api_performance_list_all_addresses_active_LDADD = \
271 $(top_builddir)/src/util/libgnunetutil.la \ 251 $(top_builddir)/src/util/libgnunetutil.la \
272 $(top_builddir)/src/testing/libgnunettesting.la \ 252 $(top_builddir)/src/testing/libgnunettesting.la \
273 $(top_builddir)/src/hello/libgnunethello.la \ 253 $(top_builddir)/src/hello/libgnunethello.la \
274 $(top_builddir)/src/ats/libgnunetats.la \ 254 libgnunetats.la \
275 $(top_builddir)/src/statistics/libgnunetstatistics.la 255 $(top_builddir)/src/statistics/libgnunetstatistics.la
276 256
277test_ats_api_performance_monitor_SOURCES = \ 257test_ats_api_performance_monitor_SOURCES = \
@@ -280,7 +260,7 @@ test_ats_api_performance_monitor_LDADD = \
280 $(top_builddir)/src/util/libgnunetutil.la \ 260 $(top_builddir)/src/util/libgnunetutil.la \
281 $(top_builddir)/src/testing/libgnunettesting.la \ 261 $(top_builddir)/src/testing/libgnunettesting.la \
282 $(top_builddir)/src/hello/libgnunethello.la \ 262 $(top_builddir)/src/hello/libgnunethello.la \
283 $(top_builddir)/src/ats/libgnunetats.la \ 263 libgnunetats.la \
284 $(top_builddir)/src/statistics/libgnunetstatistics.la 264 $(top_builddir)/src/statistics/libgnunetstatistics.la
285 265
286test_ats_api_performance_monitor_initial_callback_SOURCES = \ 266test_ats_api_performance_monitor_initial_callback_SOURCES = \
@@ -289,7 +269,7 @@ test_ats_api_performance_monitor_initial_callback_LDADD = \
289 $(top_builddir)/src/util/libgnunetutil.la \ 269 $(top_builddir)/src/util/libgnunetutil.la \
290 $(top_builddir)/src/testing/libgnunettesting.la \ 270 $(top_builddir)/src/testing/libgnunettesting.la \
291 $(top_builddir)/src/hello/libgnunethello.la \ 271 $(top_builddir)/src/hello/libgnunethello.la \
292 $(top_builddir)/src/ats/libgnunetats.la \ 272 libgnunetats.la \
293 $(top_builddir)/src/statistics/libgnunetstatistics.la 273 $(top_builddir)/src/statistics/libgnunetstatistics.la
294 274
295# solver tests 275# solver tests
@@ -300,7 +280,7 @@ test_ats_solver_add_address_proportional_LDADD = \
300 $(top_builddir)/src/util/libgnunetutil.la \ 280 $(top_builddir)/src/util/libgnunetutil.la \
301 $(top_builddir)/src/testing/libgnunettesting.la \ 281 $(top_builddir)/src/testing/libgnunettesting.la \
302 $(top_builddir)/src/hello/libgnunethello.la \ 282 $(top_builddir)/src/hello/libgnunethello.la \
303 $(top_builddir)/src/ats/libgnunetats.la \ 283 libgnunetats.la \
304 $(top_builddir)/src/statistics/libgnunetstatistics.la 284 $(top_builddir)/src/statistics/libgnunetstatistics.la
305 285
306if HAVE_LIBGLPK 286if HAVE_LIBGLPK
@@ -311,7 +291,7 @@ test_ats_solver_add_address_mlp_LDADD = \
311 $(top_builddir)/src/util/libgnunetutil.la \ 291 $(top_builddir)/src/util/libgnunetutil.la \
312 $(top_builddir)/src/testing/libgnunettesting.la \ 292 $(top_builddir)/src/testing/libgnunettesting.la \
313 $(top_builddir)/src/hello/libgnunethello.la \ 293 $(top_builddir)/src/hello/libgnunethello.la \
314 $(top_builddir)/src/ats/libgnunetats.la \ 294 libgnunetats.la \
315 $(top_builddir)/src/statistics/libgnunetstatistics.la 295 $(top_builddir)/src/statistics/libgnunetstatistics.la
316endif 296endif
317 297
@@ -322,7 +302,7 @@ test_ats_solver_add_address_ril_LDADD = \
322 $(top_builddir)/src/util/libgnunetutil.la \ 302 $(top_builddir)/src/util/libgnunetutil.la \
323 $(top_builddir)/src/testing/libgnunettesting.la \ 303 $(top_builddir)/src/testing/libgnunettesting.la \
324 $(top_builddir)/src/hello/libgnunethello.la \ 304 $(top_builddir)/src/hello/libgnunethello.la \
325 $(top_builddir)/src/ats/libgnunetats.la \ 305 libgnunetats.la \
326 $(top_builddir)/src/statistics/libgnunetstatistics.la 306 $(top_builddir)/src/statistics/libgnunetstatistics.la
327 307
328test_ats_solver_add_address_and_request_proportional_SOURCES = \ 308test_ats_solver_add_address_and_request_proportional_SOURCES = \
@@ -332,7 +312,7 @@ test_ats_solver_add_address_and_request_proportional_LDADD = \
332 $(top_builddir)/src/util/libgnunetutil.la \ 312 $(top_builddir)/src/util/libgnunetutil.la \
333 $(top_builddir)/src/testing/libgnunettesting.la \ 313 $(top_builddir)/src/testing/libgnunettesting.la \
334 $(top_builddir)/src/hello/libgnunethello.la \ 314 $(top_builddir)/src/hello/libgnunethello.la \
335 $(top_builddir)/src/ats/libgnunetats.la \ 315 libgnunetats.la \
336 $(top_builddir)/src/statistics/libgnunetstatistics.la 316 $(top_builddir)/src/statistics/libgnunetstatistics.la
337 317
338if HAVE_LIBGLPK 318if HAVE_LIBGLPK
@@ -343,7 +323,7 @@ test_ats_solver_add_address_and_request_mlp_LDADD = \
343 $(top_builddir)/src/util/libgnunetutil.la \ 323 $(top_builddir)/src/util/libgnunetutil.la \
344 $(top_builddir)/src/testing/libgnunettesting.la \ 324 $(top_builddir)/src/testing/libgnunettesting.la \
345 $(top_builddir)/src/hello/libgnunethello.la \ 325 $(top_builddir)/src/hello/libgnunethello.la \
346 $(top_builddir)/src/ats/libgnunetats.la \ 326 libgnunetats.la \
347 $(top_builddir)/src/statistics/libgnunetstatistics.la 327 $(top_builddir)/src/statistics/libgnunetstatistics.la
348endif 328endif
349 329
@@ -354,7 +334,7 @@ test_ats_solver_add_address_and_request_ril_LDADD = \
354 $(top_builddir)/src/util/libgnunetutil.la \ 334 $(top_builddir)/src/util/libgnunetutil.la \
355 $(top_builddir)/src/testing/libgnunettesting.la \ 335 $(top_builddir)/src/testing/libgnunettesting.la \
356 $(top_builddir)/src/hello/libgnunethello.la \ 336 $(top_builddir)/src/hello/libgnunethello.la \
357 $(top_builddir)/src/ats/libgnunetats.la \ 337 libgnunetats.la \
358 $(top_builddir)/src/statistics/libgnunetstatistics.la 338 $(top_builddir)/src/statistics/libgnunetstatistics.la
359 339
360 340
@@ -365,7 +345,7 @@ test_ats_solver_request_and_add_address_proportional_LDADD = \
365 $(top_builddir)/src/util/libgnunetutil.la \ 345 $(top_builddir)/src/util/libgnunetutil.la \
366 $(top_builddir)/src/testing/libgnunettesting.la \ 346 $(top_builddir)/src/testing/libgnunettesting.la \
367 $(top_builddir)/src/hello/libgnunethello.la \ 347 $(top_builddir)/src/hello/libgnunethello.la \
368 $(top_builddir)/src/ats/libgnunetats.la \ 348 libgnunetats.la \
369 $(top_builddir)/src/statistics/libgnunetstatistics.la 349 $(top_builddir)/src/statistics/libgnunetstatistics.la
370 350
371if HAVE_LIBGLPK 351if HAVE_LIBGLPK
@@ -376,7 +356,7 @@ test_ats_solver_request_and_add_address_mlp_LDADD = \
376 $(top_builddir)/src/util/libgnunetutil.la \ 356 $(top_builddir)/src/util/libgnunetutil.la \
377 $(top_builddir)/src/testing/libgnunettesting.la \ 357 $(top_builddir)/src/testing/libgnunettesting.la \
378 $(top_builddir)/src/hello/libgnunethello.la \ 358 $(top_builddir)/src/hello/libgnunethello.la \
379 $(top_builddir)/src/ats/libgnunetats.la \ 359 libgnunetats.la \
380 $(top_builddir)/src/statistics/libgnunetstatistics.la 360 $(top_builddir)/src/statistics/libgnunetstatistics.la
381endif 361endif
382 362
@@ -387,8 +367,8 @@ test_ats_solver_request_and_add_address_ril_LDADD = \
387 $(top_builddir)/src/util/libgnunetutil.la \ 367 $(top_builddir)/src/util/libgnunetutil.la \
388 $(top_builddir)/src/testing/libgnunettesting.la \ 368 $(top_builddir)/src/testing/libgnunettesting.la \
389 $(top_builddir)/src/hello/libgnunethello.la \ 369 $(top_builddir)/src/hello/libgnunethello.la \
390 $(top_builddir)/src/ats/libgnunetats.la \ 370 libgnunetats.la \
391 $(top_builddir)/src/statistics/libgnunetstatistics.la 371 $(top_builddir)/src/statistics/libgnunetstatistics.la
392 372
393 373
394test_ats_solver_request_and_delete_address_proportional_SOURCES = \ 374test_ats_solver_request_and_delete_address_proportional_SOURCES = \
@@ -398,8 +378,8 @@ test_ats_solver_request_and_delete_address_proportional_LDADD = \
398 $(top_builddir)/src/util/libgnunetutil.la \ 378 $(top_builddir)/src/util/libgnunetutil.la \
399 $(top_builddir)/src/testing/libgnunettesting.la \ 379 $(top_builddir)/src/testing/libgnunettesting.la \
400 $(top_builddir)/src/hello/libgnunethello.la \ 380 $(top_builddir)/src/hello/libgnunethello.la \
401 $(top_builddir)/src/ats/libgnunetats.la \ 381 libgnunetats.la \
402 $(top_builddir)/src/statistics/libgnunetstatistics.la 382 $(top_builddir)/src/statistics/libgnunetstatistics.la
403 383
404if HAVE_LIBGLPK 384if HAVE_LIBGLPK
405test_ats_solver_request_and_delete_address_mlp_SOURCES = \ 385test_ats_solver_request_and_delete_address_mlp_SOURCES = \
@@ -409,8 +389,8 @@ test_ats_solver_request_and_delete_address_mlp_LDADD = \
409 $(top_builddir)/src/util/libgnunetutil.la \ 389 $(top_builddir)/src/util/libgnunetutil.la \
410 $(top_builddir)/src/testing/libgnunettesting.la \ 390 $(top_builddir)/src/testing/libgnunettesting.la \
411 $(top_builddir)/src/hello/libgnunethello.la \ 391 $(top_builddir)/src/hello/libgnunethello.la \
412 $(top_builddir)/src/ats/libgnunetats.la \ 392 libgnunetats.la \
413 $(top_builddir)/src/statistics/libgnunetstatistics.la 393 $(top_builddir)/src/statistics/libgnunetstatistics.la
414endif 394endif
415 395
416test_ats_solver_request_and_delete_address_ril_SOURCES = \ 396test_ats_solver_request_and_delete_address_ril_SOURCES = \
@@ -420,8 +400,8 @@ test_ats_solver_request_and_delete_address_ril_LDADD = \
420 $(top_builddir)/src/util/libgnunetutil.la \ 400 $(top_builddir)/src/util/libgnunetutil.la \
421 $(top_builddir)/src/testing/libgnunettesting.la \ 401 $(top_builddir)/src/testing/libgnunettesting.la \
422 $(top_builddir)/src/hello/libgnunethello.la \ 402 $(top_builddir)/src/hello/libgnunethello.la \
423 $(top_builddir)/src/ats/libgnunetats.la \ 403 libgnunetats.la \
424 $(top_builddir)/src/statistics/libgnunetstatistics.la 404 $(top_builddir)/src/statistics/libgnunetstatistics.la
425 405
426 406
427test_ats_solver_alternative_after_delete_address_proportional_SOURCES = \ 407test_ats_solver_alternative_after_delete_address_proportional_SOURCES = \
@@ -431,8 +411,8 @@ test_ats_solver_alternative_after_delete_address_proportional_LDADD = \
431 $(top_builddir)/src/util/libgnunetutil.la \ 411 $(top_builddir)/src/util/libgnunetutil.la \
432 $(top_builddir)/src/testing/libgnunettesting.la \ 412 $(top_builddir)/src/testing/libgnunettesting.la \
433 $(top_builddir)/src/hello/libgnunethello.la \ 413 $(top_builddir)/src/hello/libgnunethello.la \
434 $(top_builddir)/src/ats/libgnunetats.la \ 414 libgnunetats.la \
435 $(top_builddir)/src/statistics/libgnunetstatistics.la 415 $(top_builddir)/src/statistics/libgnunetstatistics.la
436 416
437test_ats_solver_preferences_proportional_SOURCES = \ 417test_ats_solver_preferences_proportional_SOURCES = \
438 test_ats_solver_preferences.c \ 418 test_ats_solver_preferences.c \
@@ -441,8 +421,8 @@ test_ats_solver_preferences_proportional_LDADD = \
441 $(top_builddir)/src/util/libgnunetutil.la \ 421 $(top_builddir)/src/util/libgnunetutil.la \
442 $(top_builddir)/src/testing/libgnunettesting.la \ 422 $(top_builddir)/src/testing/libgnunettesting.la \
443 $(top_builddir)/src/hello/libgnunethello.la \ 423 $(top_builddir)/src/hello/libgnunethello.la \
444 $(top_builddir)/src/ats/libgnunetats.la \ 424 libgnunetats.la \
445 $(top_builddir)/src/statistics/libgnunetstatistics.la 425 $(top_builddir)/src/statistics/libgnunetstatistics.la
446 426
447if HAVE_LIBGLPK 427if HAVE_LIBGLPK
448test_ats_solver_alternative_after_delete_address_mlp_SOURCES = \ 428test_ats_solver_alternative_after_delete_address_mlp_SOURCES = \
@@ -452,7 +432,7 @@ test_ats_solver_alternative_after_delete_address_mlp_LDADD = \
452 $(top_builddir)/src/util/libgnunetutil.la \ 432 $(top_builddir)/src/util/libgnunetutil.la \
453 $(top_builddir)/src/testing/libgnunettesting.la \ 433 $(top_builddir)/src/testing/libgnunettesting.la \
454 $(top_builddir)/src/hello/libgnunethello.la \ 434 $(top_builddir)/src/hello/libgnunethello.la \
455 $(top_builddir)/src/ats/libgnunetats.la \ 435 libgnunetats.la \
456 $(top_builddir)/src/statistics/libgnunetstatistics.la 436 $(top_builddir)/src/statistics/libgnunetstatistics.la
457 437
458test_ats_solver_preferences_mlp_SOURCES = \ 438test_ats_solver_preferences_mlp_SOURCES = \
@@ -462,7 +442,7 @@ test_ats_solver_preferences_mlp_LDADD = \
462 $(top_builddir)/src/util/libgnunetutil.la \ 442 $(top_builddir)/src/util/libgnunetutil.la \
463 $(top_builddir)/src/testing/libgnunettesting.la \ 443 $(top_builddir)/src/testing/libgnunettesting.la \
464 $(top_builddir)/src/hello/libgnunethello.la \ 444 $(top_builddir)/src/hello/libgnunethello.la \
465 $(top_builddir)/src/ats/libgnunetats.la \ 445 libgnunetats.la \
466 $(top_builddir)/src/statistics/libgnunetstatistics.la 446 $(top_builddir)/src/statistics/libgnunetstatistics.la
467endif 447endif
468 448
@@ -473,7 +453,7 @@ test_ats_solver_alternative_after_delete_address_ril_LDADD = \
473 $(top_builddir)/src/util/libgnunetutil.la \ 453 $(top_builddir)/src/util/libgnunetutil.la \
474 $(top_builddir)/src/testing/libgnunettesting.la \ 454 $(top_builddir)/src/testing/libgnunettesting.la \
475 $(top_builddir)/src/hello/libgnunethello.la \ 455 $(top_builddir)/src/hello/libgnunethello.la \
476 $(top_builddir)/src/ats/libgnunetats.la \ 456 libgnunetats.la \
477 $(top_builddir)/src/statistics/libgnunetstatistics.la 457 $(top_builddir)/src/statistics/libgnunetstatistics.la
478 458
479#perf_ats_mlp_SOURCES = \ 459#perf_ats_mlp_SOURCES = \
@@ -482,7 +462,7 @@ test_ats_solver_alternative_after_delete_address_ril_LDADD = \
482# $(GN_LIBGLPK) \ 462# $(GN_LIBGLPK) \
483# $(top_builddir)/src/util/libgnunetutil.la \ 463# $(top_builddir)/src/util/libgnunetutil.la \
484# $(top_builddir)/src/statistics/libgnunetstatistics.la \ 464# $(top_builddir)/src/statistics/libgnunetstatistics.la \
485# $(top_builddir)/src/ats/libgnunetats.la 465# libgnunetats.la
486 466
487perf_ats_solver_mlp_SOURCES = \ 467perf_ats_solver_mlp_SOURCES = \
488 perf_ats_solver.c test_ats_api_common.c gnunet-service-ats_normalization.c 468 perf_ats_solver.c test_ats_api_common.c gnunet-service-ats_normalization.c
@@ -490,7 +470,7 @@ perf_ats_solver_mlp_LDADD = \
490 $(GN_LIBGLPK) \ 470 $(GN_LIBGLPK) \
491 $(top_builddir)/src/util/libgnunetutil.la \ 471 $(top_builddir)/src/util/libgnunetutil.la \
492 $(top_builddir)/src/statistics/libgnunetstatistics.la \ 472 $(top_builddir)/src/statistics/libgnunetstatistics.la \
493 $(top_builddir)/src/ats/libgnunetats.la 473 libgnunetats.la
494 474
495perf_ats_solver_proportional_SOURCES = \ 475perf_ats_solver_proportional_SOURCES = \
496 perf_ats_solver.c test_ats_api_common.c gnunet-service-ats_normalization.c 476 perf_ats_solver.c test_ats_api_common.c gnunet-service-ats_normalization.c
@@ -498,7 +478,7 @@ perf_ats_solver_proportional_LDADD = \
498 $(GN_LIBGLPK) \ 478 $(GN_LIBGLPK) \
499 $(top_builddir)/src/util/libgnunetutil.la \ 479 $(top_builddir)/src/util/libgnunetutil.la \
500 $(top_builddir)/src/statistics/libgnunetstatistics.la \ 480 $(top_builddir)/src/statistics/libgnunetstatistics.la \
501 $(top_builddir)/src/ats/libgnunetats.la 481 libgnunetats.la
502 482
503perf_ats_solver_ril_SOURCES = \ 483perf_ats_solver_ril_SOURCES = \
504 perf_ats_solver.c test_ats_api_common.c gnunet-service-ats_normalization.c 484 perf_ats_solver.c test_ats_api_common.c gnunet-service-ats_normalization.c
@@ -506,7 +486,7 @@ perf_ats_solver_ril_LDADD = \
506 $(GN_LIBGLPK) \ 486 $(GN_LIBGLPK) \
507 $(top_builddir)/src/util/libgnunetutil.la \ 487 $(top_builddir)/src/util/libgnunetutil.la \
508 $(top_builddir)/src/statistics/libgnunetstatistics.la \ 488 $(top_builddir)/src/statistics/libgnunetstatistics.la \
509 $(top_builddir)/src/ats/libgnunetats.la 489 libgnunetats.la
510 490
511test_ats_solver_preferences_ril_SOURCES = \ 491test_ats_solver_preferences_ril_SOURCES = \
512 test_ats_solver_preferences.c \ 492 test_ats_solver_preferences.c \
@@ -515,7 +495,7 @@ test_ats_solver_preferences_ril_LDADD = \
515 $(top_builddir)/src/util/libgnunetutil.la \ 495 $(top_builddir)/src/util/libgnunetutil.la \
516 $(top_builddir)/src/testing/libgnunettesting.la \ 496 $(top_builddir)/src/testing/libgnunettesting.la \
517 $(top_builddir)/src/hello/libgnunethello.la \ 497 $(top_builddir)/src/hello/libgnunethello.la \
518 $(top_builddir)/src/ats/libgnunetats.la \ 498 libgnunetats.la \
519 $(top_builddir)/src/statistics/libgnunetstatistics.la 499 $(top_builddir)/src/statistics/libgnunetstatistics.la
520 500
521EXTRA_DIST = \ 501EXTRA_DIST = \
diff --git a/src/block/Makefile.am b/src/block/Makefile.am
index b5863f1fa..552543412 100644
--- a/src/block/Makefile.am
+++ b/src/block/Makefile.am
@@ -20,26 +20,20 @@ plugin_LTLIBRARIES = \
20libgnunet_plugin_block_template_la_SOURCES = \ 20libgnunet_plugin_block_template_la_SOURCES = \
21 plugin_block_template.c 21 plugin_block_template.c
22libgnunet_plugin_block_template_la_LIBADD = \ 22libgnunet_plugin_block_template_la_LIBADD = \
23 $(top_builddir)/src/block/libgnunetblock.la \ 23 libgnunetblock.la \
24 $(top_builddir)/src/util/libgnunetutil.la \ 24 $(top_builddir)/src/util/libgnunetutil.la \
25 $(LTLIBINTL) 25 $(LTLIBINTL)
26libgnunet_plugin_block_template_la_LDFLAGS = \ 26libgnunet_plugin_block_template_la_LDFLAGS = \
27 $(GN_PLUGIN_LDFLAGS) 27 $(GN_PLUGIN_LDFLAGS)
28libgnunet_plugin_block_template_la_DEPENDENCIES = \
29 $(top_builddir)/src/block/libgnunetblock.la \
30 $(top_builddir)/src/util/libgnunetutil.la
31 28
32libgnunet_plugin_block_test_la_SOURCES = \ 29libgnunet_plugin_block_test_la_SOURCES = \
33 plugin_block_test.c 30 plugin_block_test.c
34libgnunet_plugin_block_test_la_LIBADD = \ 31libgnunet_plugin_block_test_la_LIBADD = \
35 $(top_builddir)/src/block/libgnunetblock.la \ 32 libgnunetblock.la \
36 $(top_builddir)/src/util/libgnunetutil.la \ 33 $(top_builddir)/src/util/libgnunetutil.la \
37 $(LTLIBINTL) 34 $(LTLIBINTL)
38libgnunet_plugin_block_test_la_LDFLAGS = \ 35libgnunet_plugin_block_test_la_LDFLAGS = \
39 $(GN_PLUGIN_LDFLAGS) 36 $(GN_PLUGIN_LDFLAGS)
40libgnunet_plugin_block_test_la_DEPENDENCIES = \
41 $(top_builddir)/src/block/libgnunetblock.la \
42 $(top_builddir)/src/util/libgnunetutil.la
43 37
44 38
45libgnunetblock_la_SOURCES = \ 39libgnunetblock_la_SOURCES = \
diff --git a/src/cadet/Makefile.am b/src/cadet/Makefile.am
index 86bd439d1..74879c840 100644
--- a/src/cadet/Makefile.am
+++ b/src/cadet/Makefile.am
@@ -42,10 +42,8 @@ libgnunetcadet_la_LDFLAGS = \
42gnunet_cadet_SOURCES = \ 42gnunet_cadet_SOURCES = \
43 gnunet-cadet.c 43 gnunet-cadet.c
44gnunet_cadet_LDADD = \ 44gnunet_cadet_LDADD = \
45 $(top_builddir)/src/cadet/libgnunetcadet.la \ 45 libgnunetcadet.la \
46 $(top_builddir)/src/util/libgnunetutil.la 46 $(top_builddir)/src/util/libgnunetutil.la
47gnunet_cadet_DEPENDENCIES = \
48 libgnunetcadet.la
49 47
50gnunet_service_cadet_SOURCES = \ 48gnunet_service_cadet_SOURCES = \
51 gnunet-service-cadet_tunnel.c gnunet-service-cadet_tunnel.h \ 49 gnunet-service-cadet_tunnel.c gnunet-service-cadet_tunnel.h \
@@ -68,15 +66,6 @@ gnunet_service_cadet_LDADD = \
68 $(top_builddir)/src/peerinfo/libgnunetpeerinfo.la \ 66 $(top_builddir)/src/peerinfo/libgnunetpeerinfo.la \
69 $(top_builddir)/src/hello/libgnunethello.la \ 67 $(top_builddir)/src/hello/libgnunethello.la \
70 $(top_builddir)/src/block/libgnunetblock.la 68 $(top_builddir)/src/block/libgnunetblock.la
71gnunet_service_cadet_DEPENDENCIES = \
72 $(top_builddir)/src/util/libgnunetutil.la \
73 $(top_builddir)/src/transport/libgnunettransport.la \
74 $(top_builddir)/src/core/libgnunetcore.la \
75 $(top_builddir)/src/dht/libgnunetdht.la \
76 $(top_builddir)/src/statistics/libgnunetstatistics.la \
77 $(top_builddir)/src/peerinfo/libgnunetpeerinfo.la \
78 $(top_builddir)/src/hello/libgnunethello.la \
79 $(top_builddir)/src/block/libgnunetblock.la
80if LINUX 69if LINUX
81 gnunet_service_cadet_LDFLAGS = -lrt 70 gnunet_service_cadet_LDFLAGS = -lrt
82endif 71endif
@@ -92,9 +81,7 @@ libgnunetcadettest_a_SOURCES = \
92libgnunetcadettest_a_LIBADD = \ 81libgnunetcadettest_a_LIBADD = \
93 $(top_builddir)/src/util/libgnunetutil.la \ 82 $(top_builddir)/src/util/libgnunetutil.la \
94 $(top_builddir)/src/testbed/libgnunettestbed.la \ 83 $(top_builddir)/src/testbed/libgnunettestbed.la \
95 $(top_builddir)/src/cadet/libgnunetcadet.la 84 libgnunetcadet.la
96libgnunetcadettest_a_DEPENDENCIES = \
97 libgnunetcadet.la
98 85
99if HAVE_TESTING 86if HAVE_TESTING
100check_PROGRAMS = \ 87check_PROGRAMS = \
@@ -121,8 +108,8 @@ endif
121ld_cadet_test_lib = \ 108ld_cadet_test_lib = \
122 $(top_builddir)/src/util/libgnunetutil.la \ 109 $(top_builddir)/src/util/libgnunetutil.la \
123 $(top_builddir)/src/testing/libgnunettesting.la \ 110 $(top_builddir)/src/testing/libgnunettesting.la \
124 $(top_builddir)/src/cadet/libgnunetcadettest.a \ 111 libgnunetcadettest.a \
125 $(top_builddir)/src/cadet/libgnunetcadet.la \ 112 libgnunetcadet.la \
126 $(top_builddir)/src/testbed/libgnunettestbed.la \ 113 $(top_builddir)/src/testbed/libgnunettestbed.la \
127 $(top_builddir)/src/statistics/libgnunetstatistics.la 114 $(top_builddir)/src/statistics/libgnunetstatistics.la
128 115
@@ -135,102 +122,81 @@ dep_cadet_test_lib = \
135gnunet_cadet_profiler_SOURCES = \ 122gnunet_cadet_profiler_SOURCES = \
136 gnunet-cadet-profiler.c 123 gnunet-cadet-profiler.c
137gnunet_cadet_profiler_LDADD = $(ld_cadet_test_lib) 124gnunet_cadet_profiler_LDADD = $(ld_cadet_test_lib)
138gnunet_cadet_profiler_DEPENDENCIES = $(dep_cadet_test_lib)
139 125
140 126
141test_cadet_single_SOURCES = \ 127test_cadet_single_SOURCES = \
142 test_cadet_single.c 128 test_cadet_single.c
143test_cadet_single_LDADD = $(ld_cadet_test_lib) 129test_cadet_single_LDADD = $(ld_cadet_test_lib)
144test_cadet_single_DEPENDENCIES = $(dep_cadet_test_lib)
145 130
146test_cadet_local_SOURCES = \ 131test_cadet_local_SOURCES = \
147 test_cadet_local.c 132 test_cadet_local.c
148test_cadet_local_LDADD = $(ld_cadet_test_lib) 133test_cadet_local_LDADD = $(ld_cadet_test_lib)
149test_cadet_local_DEPENDENCIES = $(dep_cadet_test_lib)
150
151 134
152 135
153test_cadet_2_forward_SOURCES = \ 136test_cadet_2_forward_SOURCES = \
154 test_cadet.c 137 test_cadet.c
155test_cadet_2_forward_LDADD = $(ld_cadet_test_lib) 138test_cadet_2_forward_LDADD = $(ld_cadet_test_lib)
156test_cadet_2_forward_DEPENDENCIES = $(dep_cadet_test_lib)
157 139
158test_cadet_2_signal_SOURCES = \ 140test_cadet_2_signal_SOURCES = \
159 test_cadet.c 141 test_cadet.c
160test_cadet_2_signal_LDADD = $(ld_cadet_test_lib) 142test_cadet_2_signal_LDADD = $(ld_cadet_test_lib)
161test_cadet_2_signal_DEPENDENCIES = $(dep_cadet_test_lib)
162 143
163test_cadet_2_keepalive_SOURCES = \ 144test_cadet_2_keepalive_SOURCES = \
164 test_cadet.c 145 test_cadet.c
165test_cadet_2_keepalive_LDADD = $(ld_cadet_test_lib) 146test_cadet_2_keepalive_LDADD = $(ld_cadet_test_lib)
166test_cadet_2_keepalive_DEPENDENCIES = $(dep_cadet_test_lib)
167 147
168test_cadet_2_speed_SOURCES = \ 148test_cadet_2_speed_SOURCES = \
169 test_cadet.c 149 test_cadet.c
170test_cadet_2_speed_LDADD = $(ld_cadet_test_lib) 150test_cadet_2_speed_LDADD = $(ld_cadet_test_lib)
171test_cadet_2_speed_DEPENDENCIES = $(dep_cadet_test_lib)
172 151
173test_cadet_2_speed_ack_SOURCES = \ 152test_cadet_2_speed_ack_SOURCES = \
174 test_cadet.c 153 test_cadet.c
175test_cadet_2_speed_ack_LDADD = $(ld_cadet_test_lib) 154test_cadet_2_speed_ack_LDADD = $(ld_cadet_test_lib)
176test_cadet_2_speed_ack_DEPENDENCIES = $(dep_cadet_test_lib)
177 155
178test_cadet_2_speed_backwards_SOURCES = \ 156test_cadet_2_speed_backwards_SOURCES = \
179 test_cadet.c 157 test_cadet.c
180test_cadet_2_speed_backwards_LDADD = $(ld_cadet_test_lib) 158test_cadet_2_speed_backwards_LDADD = $(ld_cadet_test_lib)
181test_cadet_2_speed_backwards_DEPENDENCIES = $(dep_cadet_test_lib)
182 159
183test_cadet_2_speed_reliable_SOURCES = \ 160test_cadet_2_speed_reliable_SOURCES = \
184 test_cadet.c 161 test_cadet.c
185test_cadet_2_speed_reliable_LDADD = $(ld_cadet_test_lib) 162test_cadet_2_speed_reliable_LDADD = $(ld_cadet_test_lib)
186test_cadet_2_speed_reliable_DEPENDENCIES = $(dep_cadet_test_lib)
187 163
188test_cadet_2_speed_reliable_backwards_SOURCES = \ 164test_cadet_2_speed_reliable_backwards_SOURCES = \
189 test_cadet.c 165 test_cadet.c
190test_cadet_2_speed_reliable_backwards_LDADD = $(ld_cadet_test_lib) 166test_cadet_2_speed_reliable_backwards_LDADD = $(ld_cadet_test_lib)
191test_cadet_2_speed_reliable_backwards_DEPENDENCIES = $(dep_cadet_test_lib)
192
193 167
194 168
195test_cadet_5_forward_SOURCES = \ 169test_cadet_5_forward_SOURCES = \
196 test_cadet.c 170 test_cadet.c
197test_cadet_5_forward_LDADD = $(ld_cadet_test_lib) 171test_cadet_5_forward_LDADD = $(ld_cadet_test_lib)
198test_cadet_5_forward_DEPENDENCIES = $(dep_cadet_test_lib)
199 172
200test_cadet_5_signal_SOURCES = \ 173test_cadet_5_signal_SOURCES = \
201 test_cadet.c 174 test_cadet.c
202test_cadet_5_signal_LDADD = $(ld_cadet_test_lib) 175test_cadet_5_signal_LDADD = $(ld_cadet_test_lib)
203test_cadet_5_signal_DEPENDENCIES = $(dep_cadet_test_lib)
204 176
205test_cadet_5_keepalive_SOURCES = \ 177test_cadet_5_keepalive_SOURCES = \
206 test_cadet.c 178 test_cadet.c
207test_cadet_5_keepalive_LDADD = $(ld_cadet_test_lib) 179test_cadet_5_keepalive_LDADD = $(ld_cadet_test_lib)
208test_cadet_5_keepalive_DEPENDENCIES = $(dep_cadet_test_lib)
209 180
210test_cadet_5_speed_SOURCES = \ 181test_cadet_5_speed_SOURCES = \
211 test_cadet.c 182 test_cadet.c
212test_cadet_5_speed_LDADD = $(ld_cadet_test_lib) 183test_cadet_5_speed_LDADD = $(ld_cadet_test_lib)
213test_cadet_5_speed_DEPENDENCIES = $(dep_cadet_test_lib)
214 184
215test_cadet_5_speed_ack_SOURCES = \ 185test_cadet_5_speed_ack_SOURCES = \
216 test_cadet.c 186 test_cadet.c
217test_cadet_5_speed_ack_LDADD = $(ld_cadet_test_lib) 187test_cadet_5_speed_ack_LDADD = $(ld_cadet_test_lib)
218test_cadet_5_speed_ack_DEPENDENCIES = $(dep_cadet_test_lib)
219 188
220test_cadet_5_speed_backwards_SOURCES = \ 189test_cadet_5_speed_backwards_SOURCES = \
221 test_cadet.c 190 test_cadet.c
222test_cadet_5_speed_backwards_LDADD = $(ld_cadet_test_lib) 191test_cadet_5_speed_backwards_LDADD = $(ld_cadet_test_lib)
223test_cadet_5_speed_backwards_DEPENDENCIES = $(dep_cadet_test_lib)
224 192
225test_cadet_5_speed_reliable_SOURCES = \ 193test_cadet_5_speed_reliable_SOURCES = \
226 test_cadet.c 194 test_cadet.c
227test_cadet_5_speed_reliable_LDADD = $(ld_cadet_test_lib) 195test_cadet_5_speed_reliable_LDADD = $(ld_cadet_test_lib)
228test_cadet_5_speed_reliable_DEPENDENCIES = $(dep_cadet_test_lib)
229 196
230test_cadet_5_speed_reliable_backwards_SOURCES = \ 197test_cadet_5_speed_reliable_backwards_SOURCES = \
231 test_cadet.c 198 test_cadet.c
232test_cadet_5_speed_reliable_backwards_LDADD = $(ld_cadet_test_lib) 199test_cadet_5_speed_reliable_backwards_LDADD = $(ld_cadet_test_lib)
233test_cadet_5_speed_reliable_backwards_DEPENDENCIES = $(dep_cadet_test_lib)
234 200
235 201
236if ENABLE_TEST_RUN 202if ENABLE_TEST_RUN
diff --git a/src/consensus/Makefile.am b/src/consensus/Makefile.am
index 5d590f467..03b59142b 100644
--- a/src/consensus/Makefile.am
+++ b/src/consensus/Makefile.am
@@ -34,11 +34,9 @@ gnunet_consensus_profiler_SOURCES = \
34 gnunet-consensus-profiler.c 34 gnunet-consensus-profiler.c
35gnunet_consensus_profiler_LDADD = \ 35gnunet_consensus_profiler_LDADD = \
36 $(top_builddir)/src/util/libgnunetutil.la \ 36 $(top_builddir)/src/util/libgnunetutil.la \
37 $(top_builddir)/src/consensus/libgnunetconsensus.la \ 37 libgnunetconsensus.la \
38 $(top_builddir)/src/testbed/libgnunettestbed.la \ 38 $(top_builddir)/src/testbed/libgnunettestbed.la \
39 $(GN_LIBINTL) 39 $(GN_LIBINTL)
40gnunet_consensus_profiler_DEPENDENCIES = \
41 libgnunetconsensus.la
42 40
43gnunet_service_consensus_SOURCES = \ 41gnunet_service_consensus_SOURCES = \
44 gnunet-service-consensus.c 42 gnunet-service-consensus.c
@@ -47,8 +45,6 @@ gnunet_service_consensus_LDADD = \
47 $(top_builddir)/src/core/libgnunetcore.la \ 45 $(top_builddir)/src/core/libgnunetcore.la \
48 $(top_builddir)/src/set/libgnunetset.la \ 46 $(top_builddir)/src/set/libgnunetset.la \
49 $(GN_LIBINTL) 47 $(GN_LIBINTL)
50gnunet_service_consensus_DEPENDENCIES = \
51 $(top_builddir)/src/set/libgnunetset.la
52 48
53gnunet_service_evil_consensus_SOURCES = \ 49gnunet_service_evil_consensus_SOURCES = \
54 gnunet-service-consensus.c \ 50 gnunet-service-consensus.c \
@@ -58,8 +54,6 @@ gnunet_service_evil_consensus_LDADD = \
58 $(top_builddir)/src/core/libgnunetcore.la \ 54 $(top_builddir)/src/core/libgnunetcore.la \
59 $(top_builddir)/src/set/libgnunetset.la \ 55 $(top_builddir)/src/set/libgnunetset.la \
60 $(GN_LIBINTL) 56 $(GN_LIBINTL)
61gnunet_service_evil_consensus_DEPENDENCIES = \
62 $(top_builddir)/src/set/libgnunetset.la
63gnunet_service_evil_consensus_CFLAGS = -DEVIL 57gnunet_service_evil_consensus_CFLAGS = -DEVIL
64 58
65libgnunetconsensus_la_SOURCES = \ 59libgnunetconsensus_la_SOURCES = \
@@ -84,7 +78,7 @@ test_consensus_api_SOURCES = \
84test_consensus_api_LDADD = \ 78test_consensus_api_LDADD = \
85 $(top_builddir)/src/util/libgnunetutil.la \ 79 $(top_builddir)/src/util/libgnunetutil.la \
86 $(top_builddir)/src/testing/libgnunettesting.la \ 80 $(top_builddir)/src/testing/libgnunettesting.la \
87 $(top_builddir)/src/consensus/libgnunetconsensus.la 81 libgnunetconsensus.la
88 82
89EXTRA_DIST = \ 83EXTRA_DIST = \
90 test_consensus.conf 84 test_consensus.conf
diff --git a/src/core/Makefile.am b/src/core/Makefile.am
index 5e046f521..aac1d5fcc 100644
--- a/src/core/Makefile.am
+++ b/src/core/Makefile.am
@@ -54,10 +54,8 @@ gnunet_service_core_LDADD = \
54gnunet_core_SOURCES = \ 54gnunet_core_SOURCES = \
55 gnunet-core.c 55 gnunet-core.c
56gnunet_core_LDADD = \ 56gnunet_core_LDADD = \
57 $(top_builddir)/src/core/libgnunetcore.la \ 57 libgnunetcore.la \
58 $(top_builddir)/src/util/libgnunetutil.la 58 $(top_builddir)/src/util/libgnunetutil.la
59gnunet_core_DEPENDENCIES = \
60 libgnunetcore.la
61 59
62if HAVE_TESTING 60if HAVE_TESTING
63 TESTING_TESTS = test_core_api_send_to_self test_core_api_mq 61 TESTING_TESTS = test_core_api_send_to_self test_core_api_mq
@@ -80,21 +78,21 @@ endif
80test_core_api_SOURCES = \ 78test_core_api_SOURCES = \
81 test_core_api.c 79 test_core_api.c
82test_core_api_LDADD = \ 80test_core_api_LDADD = \
83 $(top_builddir)/src/core/libgnunetcore.la \ 81 libgnunetcore.la \
84 $(top_builddir)/src/transport/libgnunettransport.la \ 82 $(top_builddir)/src/transport/libgnunettransport.la \
85 $(top_builddir)/src/util/libgnunetutil.la 83 $(top_builddir)/src/util/libgnunetutil.la
86 84
87test_core_api_reliability_SOURCES = \ 85test_core_api_reliability_SOURCES = \
88 test_core_api_reliability.c 86 test_core_api_reliability.c
89test_core_api_reliability_LDADD = \ 87test_core_api_reliability_LDADD = \
90 $(top_builddir)/src/core/libgnunetcore.la \ 88 libgnunetcore.la \
91 $(top_builddir)/src/transport/libgnunettransport.la \ 89 $(top_builddir)/src/transport/libgnunettransport.la \
92 $(top_builddir)/src/util/libgnunetutil.la 90 $(top_builddir)/src/util/libgnunetutil.la
93 91
94test_core_api_send_to_self_SOURCES = \ 92test_core_api_send_to_self_SOURCES = \
95 test_core_api_send_to_self.c 93 test_core_api_send_to_self.c
96test_core_api_send_to_self_LDADD = \ 94test_core_api_send_to_self_LDADD = \
97 $(top_builddir)/src/core/libgnunetcore.la \ 95 libgnunetcore.la \
98 $(top_builddir)/src/testing/libgnunettesting.la \ 96 $(top_builddir)/src/testing/libgnunettesting.la \
99 $(top_builddir)/src/transport/libgnunettransport.la \ 97 $(top_builddir)/src/transport/libgnunettransport.la \
100 $(top_builddir)/src/util/libgnunetutil.la 98 $(top_builddir)/src/util/libgnunetutil.la
@@ -102,7 +100,7 @@ test_core_api_send_to_self_LDADD = \
102test_core_api_mq_SOURCES = \ 100test_core_api_mq_SOURCES = \
103 test_core_api_mq.c 101 test_core_api_mq.c
104test_core_api_mq_LDADD = \ 102test_core_api_mq_LDADD = \
105 $(top_builddir)/src/core/libgnunetcore.la \ 103 libgnunetcore.la \
106 $(top_builddir)/src/testing/libgnunettesting.la \ 104 $(top_builddir)/src/testing/libgnunettesting.la \
107 $(top_builddir)/src/transport/libgnunettransport.la \ 105 $(top_builddir)/src/transport/libgnunettransport.la \
108 $(top_builddir)/src/util/libgnunetutil.la 106 $(top_builddir)/src/util/libgnunetutil.la
@@ -111,13 +109,13 @@ test_core_api_start_only_SOURCES = \
111 test_core_api_start_only.c 109 test_core_api_start_only.c
112test_core_api_start_only_LDADD = \ 110test_core_api_start_only_LDADD = \
113 $(top_builddir)/src/testing/libgnunettesting.la \ 111 $(top_builddir)/src/testing/libgnunettesting.la \
114 $(top_builddir)/src/core/libgnunetcore.la \ 112 libgnunetcore.la \
115 $(top_builddir)/src/util/libgnunetutil.la 113 $(top_builddir)/src/util/libgnunetutil.la
116 114
117test_core_quota_compliance_symmetric_SOURCES = \ 115test_core_quota_compliance_symmetric_SOURCES = \
118 test_core_quota_compliance.c 116 test_core_quota_compliance.c
119test_core_quota_compliance_symmetric_LDADD = \ 117test_core_quota_compliance_symmetric_LDADD = \
120 $(top_builddir)/src/core/libgnunetcore.la \ 118 libgnunetcore.la \
121 $(top_builddir)/src/transport/libgnunettransport.la \ 119 $(top_builddir)/src/transport/libgnunettransport.la \
122 $(top_builddir)/src/util/libgnunetutil.la \ 120 $(top_builddir)/src/util/libgnunetutil.la \
123 $(top_builddir)/src/statistics/libgnunetstatistics.la 121 $(top_builddir)/src/statistics/libgnunetstatistics.la
@@ -125,7 +123,7 @@ test_core_quota_compliance_symmetric_LDADD = \
125test_core_quota_compliance_asymmetric_send_limited_SOURCES = \ 123test_core_quota_compliance_asymmetric_send_limited_SOURCES = \
126 test_core_quota_compliance.c 124 test_core_quota_compliance.c
127test_core_quota_compliance_asymmetric_send_limited_LDADD = \ 125test_core_quota_compliance_asymmetric_send_limited_LDADD = \
128 $(top_builddir)/src/core/libgnunetcore.la \ 126 libgnunetcore.la \
129 $(top_builddir)/src/transport/libgnunettransport.la \ 127 $(top_builddir)/src/transport/libgnunettransport.la \
130 $(top_builddir)/src/util/libgnunetutil.la \ 128 $(top_builddir)/src/util/libgnunetutil.la \
131 $(top_builddir)/src/statistics/libgnunetstatistics.la 129 $(top_builddir)/src/statistics/libgnunetstatistics.la
@@ -133,7 +131,7 @@ test_core_quota_compliance_asymmetric_send_limited_LDADD = \
133test_core_quota_compliance_asymmetric_recv_limited_SOURCES = \ 131test_core_quota_compliance_asymmetric_recv_limited_SOURCES = \
134 test_core_quota_compliance.c 132 test_core_quota_compliance.c
135test_core_quota_compliance_asymmetric_recv_limited_LDADD = \ 133test_core_quota_compliance_asymmetric_recv_limited_LDADD = \
136 $(top_builddir)/src/core/libgnunetcore.la \ 134 libgnunetcore.la \
137 $(top_builddir)/src/transport/libgnunettransport.la \ 135 $(top_builddir)/src/transport/libgnunettransport.la \
138 $(top_builddir)/src/util/libgnunetutil.la \ 136 $(top_builddir)/src/util/libgnunetutil.la \
139 $(top_builddir)/src/statistics/libgnunetstatistics.la 137 $(top_builddir)/src/statistics/libgnunetstatistics.la
diff --git a/src/datacache/Makefile.am b/src/datacache/Makefile.am
index 941072396..74b6b74d4 100644
--- a/src/datacache/Makefile.am
+++ b/src/datacache/Makefile.am
@@ -130,63 +130,63 @@ test_datacache_sqlite_SOURCES = \
130 test_datacache.c 130 test_datacache.c
131test_datacache_sqlite_LDADD = \ 131test_datacache_sqlite_LDADD = \
132 $(top_builddir)/src/testing/libgnunettesting.la \ 132 $(top_builddir)/src/testing/libgnunettesting.la \
133 $(top_builddir)/src/datacache/libgnunetdatacache.la \ 133 libgnunetdatacache.la \
134 $(top_builddir)/src/util/libgnunetutil.la 134 $(top_builddir)/src/util/libgnunetutil.la
135 135
136test_datacache_quota_sqlite_SOURCES = \ 136test_datacache_quota_sqlite_SOURCES = \
137 test_datacache_quota.c 137 test_datacache_quota.c
138test_datacache_quota_sqlite_LDADD = \ 138test_datacache_quota_sqlite_LDADD = \
139 $(top_builddir)/src/testing/libgnunettesting.la \ 139 $(top_builddir)/src/testing/libgnunettesting.la \
140 $(top_builddir)/src/datacache/libgnunetdatacache.la \ 140 libgnunetdatacache.la \
141 $(top_builddir)/src/util/libgnunetutil.la 141 $(top_builddir)/src/util/libgnunetutil.la
142 142
143perf_datacache_sqlite_SOURCES = \ 143perf_datacache_sqlite_SOURCES = \
144 perf_datacache.c 144 perf_datacache.c
145perf_datacache_sqlite_LDADD = \ 145perf_datacache_sqlite_LDADD = \
146 $(top_builddir)/src/testing/libgnunettesting.la \ 146 $(top_builddir)/src/testing/libgnunettesting.la \
147 $(top_builddir)/src/datacache/libgnunetdatacache.la \ 147 libgnunetdatacache.la \
148 $(top_builddir)/src/util/libgnunetutil.la 148 $(top_builddir)/src/util/libgnunetutil.la
149 149
150test_datacache_heap_SOURCES = \ 150test_datacache_heap_SOURCES = \
151 test_datacache.c 151 test_datacache.c
152test_datacache_heap_LDADD = \ 152test_datacache_heap_LDADD = \
153 $(top_builddir)/src/testing/libgnunettesting.la \ 153 $(top_builddir)/src/testing/libgnunettesting.la \
154 $(top_builddir)/src/datacache/libgnunetdatacache.la \ 154 libgnunetdatacache.la \
155 $(top_builddir)/src/util/libgnunetutil.la 155 $(top_builddir)/src/util/libgnunetutil.la
156 156
157test_datacache_quota_heap_SOURCES = \ 157test_datacache_quota_heap_SOURCES = \
158 test_datacache_quota.c 158 test_datacache_quota.c
159test_datacache_quota_heap_LDADD = \ 159test_datacache_quota_heap_LDADD = \
160 $(top_builddir)/src/testing/libgnunettesting.la \ 160 $(top_builddir)/src/testing/libgnunettesting.la \
161 $(top_builddir)/src/datacache/libgnunetdatacache.la \ 161 libgnunetdatacache.la \
162 $(top_builddir)/src/util/libgnunetutil.la 162 $(top_builddir)/src/util/libgnunetutil.la
163 163
164perf_datacache_heap_SOURCES = \ 164perf_datacache_heap_SOURCES = \
165 perf_datacache.c 165 perf_datacache.c
166perf_datacache_heap_LDADD = \ 166perf_datacache_heap_LDADD = \
167 $(top_builddir)/src/testing/libgnunettesting.la \ 167 $(top_builddir)/src/testing/libgnunettesting.la \
168 $(top_builddir)/src/datacache/libgnunetdatacache.la \ 168 libgnunetdatacache.la \
169 $(top_builddir)/src/util/libgnunetutil.la 169 $(top_builddir)/src/util/libgnunetutil.la
170 170
171test_datacache_postgres_SOURCES = \ 171test_datacache_postgres_SOURCES = \
172 test_datacache.c 172 test_datacache.c
173test_datacache_postgres_LDADD = \ 173test_datacache_postgres_LDADD = \
174 $(top_builddir)/src/testing/libgnunettesting.la \ 174 $(top_builddir)/src/testing/libgnunettesting.la \
175 $(top_builddir)/src/datacache/libgnunetdatacache.la \ 175 libgnunetdatacache.la \
176 $(top_builddir)/src/util/libgnunetutil.la 176 $(top_builddir)/src/util/libgnunetutil.la
177 177
178test_datacache_quota_postgres_SOURCES = \ 178test_datacache_quota_postgres_SOURCES = \
179 test_datacache_quota.c 179 test_datacache_quota.c
180test_datacache_quota_postgres_LDADD = \ 180test_datacache_quota_postgres_LDADD = \
181 $(top_builddir)/src/testing/libgnunettesting.la \ 181 $(top_builddir)/src/testing/libgnunettesting.la \
182 $(top_builddir)/src/datacache/libgnunetdatacache.la \ 182 libgnunetdatacache.la \
183 $(top_builddir)/src/util/libgnunetutil.la 183 $(top_builddir)/src/util/libgnunetutil.la
184 184
185perf_datacache_postgres_SOURCES = \ 185perf_datacache_postgres_SOURCES = \
186 perf_datacache.c 186 perf_datacache.c
187perf_datacache_postgres_LDADD = \ 187perf_datacache_postgres_LDADD = \
188 $(top_builddir)/src/testing/libgnunettesting.la \ 188 $(top_builddir)/src/testing/libgnunettesting.la \
189 $(top_builddir)/src/datacache/libgnunetdatacache.la \ 189 libgnunetdatacache.la \
190 $(top_builddir)/src/util/libgnunetutil.la 190 $(top_builddir)/src/util/libgnunetutil.la
191 191
192EXTRA_DIST = \ 192EXTRA_DIST = \
diff --git a/src/datastore/Makefile.am b/src/datastore/Makefile.am
index dc06790ae..63f9ad872 100644
--- a/src/datastore/Makefile.am
+++ b/src/datastore/Makefile.am
@@ -48,11 +48,9 @@ gnunet_service_datastore_LDADD = \
48gnunet_datastore_SOURCES = \ 48gnunet_datastore_SOURCES = \
49 gnunet-datastore.c 49 gnunet-datastore.c
50gnunet_datastore_LDADD = \ 50gnunet_datastore_LDADD = \
51 $(top_builddir)/src/datastore/libgnunetdatastore.la \ 51 libgnunetdatastore.la \
52 $(top_builddir)/src/util/libgnunetutil.la \ 52 $(top_builddir)/src/util/libgnunetutil.la \
53 $(GN_LIBINTL) 53 $(GN_LIBINTL)
54gnunet_datastore_DEPENDENCIES = \
55 libgnunetdatastore.la
56 54
57 55
58if HAVE_MYSQL 56if HAVE_MYSQL
@@ -178,21 +176,21 @@ test_datastore_api_heap_SOURCES = \
178 test_datastore_api.c 176 test_datastore_api.c
179test_datastore_api_heap_LDADD = \ 177test_datastore_api_heap_LDADD = \
180 $(top_builddir)/src/testing/libgnunettesting.la \ 178 $(top_builddir)/src/testing/libgnunettesting.la \
181 $(top_builddir)/src/datastore/libgnunetdatastore.la \ 179 libgnunetdatastore.la \
182 $(top_builddir)/src/util/libgnunetutil.la 180 $(top_builddir)/src/util/libgnunetutil.la
183 181
184test_datastore_api_management_heap_SOURCES = \ 182test_datastore_api_management_heap_SOURCES = \
185 test_datastore_api_management.c 183 test_datastore_api_management.c
186test_datastore_api_management_heap_LDADD = \ 184test_datastore_api_management_heap_LDADD = \
187 $(top_builddir)/src/testing/libgnunettesting.la \ 185 $(top_builddir)/src/testing/libgnunettesting.la \
188 $(top_builddir)/src/datastore/libgnunetdatastore.la \ 186 libgnunetdatastore.la \
189 $(top_builddir)/src/util/libgnunetutil.la 187 $(top_builddir)/src/util/libgnunetutil.la
190 188
191perf_datastore_api_heap_SOURCES = \ 189perf_datastore_api_heap_SOURCES = \
192 perf_datastore_api.c 190 perf_datastore_api.c
193perf_datastore_api_heap_LDADD = \ 191perf_datastore_api_heap_LDADD = \
194 $(top_builddir)/src/testing/libgnunettesting.la \ 192 $(top_builddir)/src/testing/libgnunettesting.la \
195 $(top_builddir)/src/datastore/libgnunetdatastore.la \ 193 libgnunetdatastore.la \
196 $(top_builddir)/src/util/libgnunetutil.la 194 $(top_builddir)/src/util/libgnunetutil.la
197 195
198perf_plugin_datastore_heap_SOURCES = \ 196perf_plugin_datastore_heap_SOURCES = \
@@ -212,21 +210,21 @@ test_datastore_api_sqlite_SOURCES = \
212 test_datastore_api.c 210 test_datastore_api.c
213test_datastore_api_sqlite_LDADD = \ 211test_datastore_api_sqlite_LDADD = \
214 $(top_builddir)/src/testing/libgnunettesting.la \ 212 $(top_builddir)/src/testing/libgnunettesting.la \
215 $(top_builddir)/src/datastore/libgnunetdatastore.la \ 213 libgnunetdatastore.la \
216 $(top_builddir)/src/util/libgnunetutil.la 214 $(top_builddir)/src/util/libgnunetutil.la
217 215
218test_datastore_api_management_sqlite_SOURCES = \ 216test_datastore_api_management_sqlite_SOURCES = \
219 test_datastore_api_management.c 217 test_datastore_api_management.c
220test_datastore_api_management_sqlite_LDADD = \ 218test_datastore_api_management_sqlite_LDADD = \
221 $(top_builddir)/src/testing/libgnunettesting.la \ 219 $(top_builddir)/src/testing/libgnunettesting.la \
222 $(top_builddir)/src/datastore/libgnunetdatastore.la \ 220 libgnunetdatastore.la \
223 $(top_builddir)/src/util/libgnunetutil.la 221 $(top_builddir)/src/util/libgnunetutil.la
224 222
225perf_datastore_api_sqlite_SOURCES = \ 223perf_datastore_api_sqlite_SOURCES = \
226 perf_datastore_api.c 224 perf_datastore_api.c
227perf_datastore_api_sqlite_LDADD = \ 225perf_datastore_api_sqlite_LDADD = \
228 $(top_builddir)/src/testing/libgnunettesting.la \ 226 $(top_builddir)/src/testing/libgnunettesting.la \
229 $(top_builddir)/src/datastore/libgnunetdatastore.la \ 227 libgnunetdatastore.la \
230 $(top_builddir)/src/util/libgnunetutil.la 228 $(top_builddir)/src/util/libgnunetutil.la
231 229
232perf_plugin_datastore_sqlite_SOURCES = \ 230perf_plugin_datastore_sqlite_SOURCES = \
@@ -246,21 +244,21 @@ test_datastore_api_mysql_SOURCES = \
246 test_datastore_api.c 244 test_datastore_api.c
247test_datastore_api_mysql_LDADD = \ 245test_datastore_api_mysql_LDADD = \
248 $(top_builddir)/src/testing/libgnunettesting.la \ 246 $(top_builddir)/src/testing/libgnunettesting.la \
249 $(top_builddir)/src/datastore/libgnunetdatastore.la \ 247 libgnunetdatastore.la \
250 $(top_builddir)/src/util/libgnunetutil.la 248 $(top_builddir)/src/util/libgnunetutil.la
251 249
252test_datastore_api_management_mysql_SOURCES = \ 250test_datastore_api_management_mysql_SOURCES = \
253 test_datastore_api_management.c 251 test_datastore_api_management.c
254test_datastore_api_management_mysql_LDADD = \ 252test_datastore_api_management_mysql_LDADD = \
255 $(top_builddir)/src/testing/libgnunettesting.la \ 253 $(top_builddir)/src/testing/libgnunettesting.la \
256 $(top_builddir)/src/datastore/libgnunetdatastore.la \ 254 libgnunetdatastore.la \
257 $(top_builddir)/src/util/libgnunetutil.la 255 $(top_builddir)/src/util/libgnunetutil.la
258 256
259perf_datastore_api_mysql_SOURCES = \ 257perf_datastore_api_mysql_SOURCES = \
260 perf_datastore_api.c 258 perf_datastore_api.c
261perf_datastore_api_mysql_LDADD = \ 259perf_datastore_api_mysql_LDADD = \
262 $(top_builddir)/src/testing/libgnunettesting.la \ 260 $(top_builddir)/src/testing/libgnunettesting.la \
263 $(top_builddir)/src/datastore/libgnunetdatastore.la \ 261 libgnunetdatastore.la \
264 $(top_builddir)/src/util/libgnunetutil.la 262 $(top_builddir)/src/util/libgnunetutil.la
265 263
266test_plugin_datastore_mysql_SOURCES = \ 264test_plugin_datastore_mysql_SOURCES = \
@@ -280,21 +278,21 @@ test_datastore_api_postgres_SOURCES = \
280 test_datastore_api.c 278 test_datastore_api.c
281test_datastore_api_postgres_LDADD = \ 279test_datastore_api_postgres_LDADD = \
282 $(top_builddir)/src/testing/libgnunettesting.la \ 280 $(top_builddir)/src/testing/libgnunettesting.la \
283 $(top_builddir)/src/datastore/libgnunetdatastore.la \ 281 libgnunetdatastore.la \
284 $(top_builddir)/src/util/libgnunetutil.la 282 $(top_builddir)/src/util/libgnunetutil.la
285 283
286test_datastore_api_management_postgres_SOURCES = \ 284test_datastore_api_management_postgres_SOURCES = \
287 test_datastore_api_management.c 285 test_datastore_api_management.c
288test_datastore_api_management_postgres_LDADD = \ 286test_datastore_api_management_postgres_LDADD = \
289 $(top_builddir)/src/testing/libgnunettesting.la \ 287 $(top_builddir)/src/testing/libgnunettesting.la \
290 $(top_builddir)/src/datastore/libgnunetdatastore.la \ 288 libgnunetdatastore.la \
291 $(top_builddir)/src/util/libgnunetutil.la 289 $(top_builddir)/src/util/libgnunetutil.la
292 290
293perf_datastore_api_postgres_SOURCES = \ 291perf_datastore_api_postgres_SOURCES = \
294 perf_datastore_api.c 292 perf_datastore_api.c
295perf_datastore_api_postgres_LDADD = \ 293perf_datastore_api_postgres_LDADD = \
296 $(top_builddir)/src/testing/libgnunettesting.la \ 294 $(top_builddir)/src/testing/libgnunettesting.la \
297 $(top_builddir)/src/datastore/libgnunetdatastore.la \ 295 libgnunetdatastore.la \
298 $(top_builddir)/src/util/libgnunetutil.la 296 $(top_builddir)/src/util/libgnunetutil.la
299 297
300test_plugin_datastore_postgres_SOURCES = \ 298test_plugin_datastore_postgres_SOURCES = \
diff --git a/src/dht/Makefile.am b/src/dht/Makefile.am
index f8918616f..6e59178b1 100644
--- a/src/dht/Makefile.am
+++ b/src/dht/Makefile.am
@@ -43,9 +43,6 @@ libgnunet_plugin_block_dht_la_LIBADD = \
43 $(LTLIBINTL) 43 $(LTLIBINTL)
44libgnunet_plugin_block_dht_la_LDFLAGS = \ 44libgnunet_plugin_block_dht_la_LDFLAGS = \
45 $(GN_PLUGIN_LDFLAGS) 45 $(GN_PLUGIN_LDFLAGS)
46libgnunet_plugin_block_dht_la_DEPENDENCIES = \
47 $(top_builddir)/src/block/libgnunetblock.la
48
49 46
50 47
51libexec_PROGRAMS = \ 48libexec_PROGRAMS = \
@@ -105,39 +102,31 @@ gnunet_service_dht_xvine_LDADD = \
105gnunet_dht_get_SOURCES = \ 102gnunet_dht_get_SOURCES = \
106 gnunet-dht-get.c 103 gnunet-dht-get.c
107gnunet_dht_get_LDADD = \ 104gnunet_dht_get_LDADD = \
108 $(top_builddir)/src/dht/libgnunetdht.la \ 105 libgnunetdht.la \
109 $(top_builddir)/src/core/libgnunetcore.la \ 106 $(top_builddir)/src/core/libgnunetcore.la \
110 $(top_builddir)/src/util/libgnunetutil.la 107 $(top_builddir)/src/util/libgnunetutil.la
111gnunet_dht_get_DEPENDENCIES = \
112 libgnunetdht.la
113 108
114gnunet_dht_put_SOURCES = \ 109gnunet_dht_put_SOURCES = \
115 gnunet-dht-put.c 110 gnunet-dht-put.c
116gnunet_dht_put_LDADD = \ 111gnunet_dht_put_LDADD = \
117 $(top_builddir)/src/dht/libgnunetdht.la \ 112 libgnunetdht.la \
118 $(top_builddir)/src/core/libgnunetcore.la \ 113 $(top_builddir)/src/core/libgnunetcore.la \
119 $(top_builddir)/src/util/libgnunetutil.la 114 $(top_builddir)/src/util/libgnunetutil.la
120gnunet_dht_put_DEPENDENCIES = \
121 libgnunetdht.la
122 115
123gnunet_dht_monitor_SOURCES = \ 116gnunet_dht_monitor_SOURCES = \
124 gnunet-dht-monitor.c 117 gnunet-dht-monitor.c
125gnunet_dht_monitor_LDADD = \ 118gnunet_dht_monitor_LDADD = \
126 $(top_builddir)/src/dht/libgnunetdht.la \ 119 libgnunetdht.la \
127 $(top_builddir)/src/core/libgnunetcore.la \ 120 $(top_builddir)/src/core/libgnunetcore.la \
128 $(top_builddir)/src/util/libgnunetutil.la 121 $(top_builddir)/src/util/libgnunetutil.la
129gnunet_dht_monitor_DEPENDENCIES = \
130 libgnunetdht.la
131 122
132gnunet_dht_profiler_SOURCES = \ 123gnunet_dht_profiler_SOURCES = \
133 gnunet_dht_profiler.c 124 gnunet_dht_profiler.c
134gnunet_dht_profiler_LDADD = \ 125gnunet_dht_profiler_LDADD = \
135 $(top_builddir)/src/dht/libgnunetdht.la \ 126 libgnunetdht.la \
136 $(top_builddir)/src/core/libgnunetcore.la \ 127 $(top_builddir)/src/core/libgnunetcore.la \
137 $(top_builddir)/src/util/libgnunetutil.la \ 128 $(top_builddir)/src/util/libgnunetutil.la \
138 $(top_builddir)/src/testbed/libgnunettestbed.la 129 $(top_builddir)/src/testbed/libgnunettestbed.la
139gnunet_dht_profiler_DEPENDENCIES = \
140 libgnunetdht.la
141 130
142if HAVE_TESTING 131if HAVE_TESTING
143noinst_LIBRARIES = libgnunetdhttest.a 132noinst_LIBRARIES = libgnunetdhttest.a
@@ -148,9 +137,7 @@ libgnunetdhttest_a_SOURCES = \
148libgnunetdhttest_a_LIBADD = \ 137libgnunetdhttest_a_LIBADD = \
149 $(top_builddir)/src/util/libgnunetutil.la \ 138 $(top_builddir)/src/util/libgnunetutil.la \
150 $(top_builddir)/src/testbed/libgnunettestbed.la \ 139 $(top_builddir)/src/testbed/libgnunettestbed.la \
151 $(top_builddir)/src/dht/libgnunetdht.la 140 libgnunetdht.la
152libgnunetdhttest_a_DEPENDENCIES = \
153 libgnunetdht.la
154 141
155if HAVE_TESTING 142if HAVE_TESTING
156check_PROGRAMS = \ 143check_PROGRAMS = \
@@ -183,61 +170,49 @@ test_dht_api_LDADD = \
183 $(top_builddir)/src/util/libgnunetutil.la \ 170 $(top_builddir)/src/util/libgnunetutil.la \
184 $(top_builddir)/src/testing/libgnunettesting.la \ 171 $(top_builddir)/src/testing/libgnunettesting.la \
185 $(top_builddir)/src/hello/libgnunethello.la \ 172 $(top_builddir)/src/hello/libgnunethello.la \
186 $(top_builddir)/src/dht/libgnunetdht.la 173 libgnunetdht.la
187test_dht_api_DEPENDENCIES = \
188 libgnunetdht.la
189 174
190test_dht_twopeer_SOURCES = \ 175test_dht_twopeer_SOURCES = \
191 test_dht_topo.c 176 test_dht_topo.c
192test_dht_twopeer_LDADD = \ 177test_dht_twopeer_LDADD = \
193 $(top_builddir)/src/dht/libgnunetdhttest.a \ 178 libgnunetdhttest.a \
194 $(top_builddir)/src/util/libgnunetutil.la \ 179 $(top_builddir)/src/util/libgnunetutil.la \
195 $(top_builddir)/src/dht/libgnunetdhttest.a \ 180 libgnunetdhttest.a \
196 $(top_builddir)/src/testbed/libgnunettestbed.la \ 181 $(top_builddir)/src/testbed/libgnunettestbed.la \
197 $(top_builddir)/src/dht/libgnunetdht.la 182 libgnunetdht.la
198test_dht_twopeer_DEPENDENCIES = \
199 libgnunetdht.la
200 183
201test_dht_2dtorus_SOURCES = \ 184test_dht_2dtorus_SOURCES = \
202 test_dht_topo.c 185 test_dht_topo.c
203test_dht_2dtorus_LDADD = \ 186test_dht_2dtorus_LDADD = \
204 $(top_builddir)/src/dht/libgnunetdhttest.a \ 187 libgnunetdhttest.a \
205 $(top_builddir)/src/util/libgnunetutil.la \ 188 $(top_builddir)/src/util/libgnunetutil.la \
206 $(top_builddir)/src/testbed/libgnunettestbed.la \ 189 $(top_builddir)/src/testbed/libgnunettestbed.la \
207 $(top_builddir)/src/dht/libgnunetdht.la 190 libgnunetdht.la
208test_dht_2dtorus_DEPENDENCIES = \
209 libgnunetdht.la
210 191
211test_dht_line_SOURCES = \ 192test_dht_line_SOURCES = \
212 test_dht_topo.c 193 test_dht_topo.c
213test_dht_line_LDADD = \ 194test_dht_line_LDADD = \
214 $(top_builddir)/src/dht/libgnunetdhttest.a \ 195 libgnunetdhttest.a \
215 $(top_builddir)/src/util/libgnunetutil.la \ 196 $(top_builddir)/src/util/libgnunetutil.la \
216 $(top_builddir)/src/testbed/libgnunettestbed.la \ 197 $(top_builddir)/src/testbed/libgnunettestbed.la \
217 $(top_builddir)/src/dht/libgnunetdht.la 198 libgnunetdht.la
218test_dht_line_DEPENDENCIES = \
219 libgnunetdht.la
220 199
221test_dht_multipeer_SOURCES = \ 200test_dht_multipeer_SOURCES = \
222 test_dht_topo.c 201 test_dht_topo.c
223test_dht_multipeer_LDADD = \ 202test_dht_multipeer_LDADD = \
224 $(top_builddir)/src/dht/libgnunetdhttest.a \ 203 libgnunetdhttest.a \
225 $(top_builddir)/src/util/libgnunetutil.la \ 204 $(top_builddir)/src/util/libgnunetutil.la \
226 $(top_builddir)/src/statistics/libgnunetstatistics.la \ 205 $(top_builddir)/src/statistics/libgnunetstatistics.la \
227 $(top_builddir)/src/testbed/libgnunettestbed.la \ 206 $(top_builddir)/src/testbed/libgnunettestbed.la \
228 $(top_builddir)/src/dht/libgnunetdht.la 207 libgnunetdht.la
229test_dht_multipeer_DEPENDENCIES = \
230 libgnunetdht.la
231 208
232test_dht_monitor_SOURCES = \ 209test_dht_monitor_SOURCES = \
233 test_dht_monitor.c 210 test_dht_monitor.c
234test_dht_monitor_LDADD = \ 211test_dht_monitor_LDADD = \
235 $(top_builddir)/src/dht/libgnunetdhttest.a \ 212 libgnunetdhttest.a \
236 $(top_builddir)/src/util/libgnunetutil.la \ 213 $(top_builddir)/src/util/libgnunetutil.la \
237 $(top_builddir)/src/testbed/libgnunettestbed.la \ 214 $(top_builddir)/src/testbed/libgnunettestbed.la \
238 $(top_builddir)/src/dht/libgnunetdht.la 215 libgnunetdht.la
239test_dht_monitor_DEPENDENCIES = \
240 libgnunetdht.la
241 216
242EXTRA_DIST = \ 217EXTRA_DIST = \
243 $(check_SCRIPTS) \ 218 $(check_SCRIPTS) \
diff --git a/src/dns/Makefile.am b/src/dns/Makefile.am
index f8645305d..df58cfc8c 100644
--- a/src/dns/Makefile.am
+++ b/src/dns/Makefile.am
@@ -54,35 +54,27 @@ gnunet_helper_dns_SOURCES = \
54gnunet_dns_monitor_SOURCES = \ 54gnunet_dns_monitor_SOURCES = \
55 gnunet-dns-monitor.c 55 gnunet-dns-monitor.c
56gnunet_dns_monitor_LDADD = \ 56gnunet_dns_monitor_LDADD = \
57 $(top_builddir)/src/dns/libgnunetdnsparser.la \ 57 libgnunetdnsparser.la \
58 $(top_builddir)/src/dns/libgnunetdns.la \ 58 libgnunetdns.la \
59 $(top_builddir)/src/util/libgnunetutil.la \ 59 $(top_builddir)/src/util/libgnunetutil.la \
60 $(GN_LIBINTL) 60 $(GN_LIBINTL)
61gnunet_dns_monitor_DEPENDENCIES = \
62 libgnunetdnsparser.la \
63 libgnunetdns.la
64 61
65gnunet_dns_redirector_SOURCES = \ 62gnunet_dns_redirector_SOURCES = \
66 gnunet-dns-redirector.c 63 gnunet-dns-redirector.c
67gnunet_dns_redirector_LDADD = \ 64gnunet_dns_redirector_LDADD = \
68 $(top_builddir)/src/dns/libgnunetdnsparser.la \ 65 libgnunetdnsparser.la \
69 $(top_builddir)/src/dns/libgnunetdns.la \ 66 libgnunetdns.la \
70 $(top_builddir)/src/util/libgnunetutil.la \ 67 $(top_builddir)/src/util/libgnunetutil.la \
71 $(GN_LIBINTL) 68 $(GN_LIBINTL)
72gnunet_dns_redirector_DEPENDENCIES = \
73 libgnunetdnsparser.la \
74 libgnunetdns.la
75 69
76gnunet_service_dns_SOURCES = \ 70gnunet_service_dns_SOURCES = \
77 gnunet-service-dns.c 71 gnunet-service-dns.c
78gnunet_service_dns_LDADD = \ 72gnunet_service_dns_LDADD = \
79 $(top_builddir)/src/dns/libgnunetdnsstub.la \ 73 libgnunetdnsstub.la \
80 $(top_builddir)/src/tun/libgnunettun.la \ 74 $(top_builddir)/src/tun/libgnunettun.la \
81 $(top_builddir)/src/statistics/libgnunetstatistics.la \ 75 $(top_builddir)/src/statistics/libgnunetstatistics.la \
82 $(top_builddir)/src/util/libgnunetutil.la \ 76 $(top_builddir)/src/util/libgnunetutil.la \
83 $(GN_LIBINTL) 77 $(GN_LIBINTL)
84gnunet_service_dns_DEPENDENCIES = \
85 libgnunetdnsstub.la
86 78
87libgnunetdnsparser_la_SOURCES = \ 79libgnunetdnsparser_la_SOURCES = \
88 dnsparser.c 80 dnsparser.c
@@ -131,7 +123,4 @@ test_hexcoder_SOURCES = \
131test_hexcoder_LDADD = \ 123test_hexcoder_LDADD = \
132 libgnunetdnsparser.la \ 124 libgnunetdnsparser.la \
133 $(top_builddir)/src/util/libgnunetutil.la 125 $(top_builddir)/src/util/libgnunetutil.la
134test_hexcoder_DEPENDENCIES = \
135 libgnunetdnsparser.la \
136 $(top_builddir)/src/util/libgnunetutil.la
137 126
diff --git a/src/dv/Makefile.am b/src/dv/Makefile.am
index db4e1f1d5..19bf000d4 100644
--- a/src/dv/Makefile.am
+++ b/src/dv/Makefile.am
@@ -64,10 +64,6 @@ libgnunet_plugin_transport_dv_la_LIBADD = \
64 $(top_builddir)/src/util/libgnunetutil.la 64 $(top_builddir)/src/util/libgnunetutil.la
65libgnunet_plugin_transport_dv_la_LDFLAGS = \ 65libgnunet_plugin_transport_dv_la_LDFLAGS = \
66 $(GN_PLUGIN_LDFLAGS) 66 $(GN_PLUGIN_LDFLAGS)
67libgnunet_plugin_transport_dv_la_DEPENDENCIES = \
68 $(top_builddir)/src/ats/libgnunetats.la \
69 $(top_builddir)/src/hello/libgnunethello.la \
70 libgnunetdv.la
71 67
72if HAVE_TESTING 68if HAVE_TESTING
73check_PROGRAMS = \ 69check_PROGRAMS = \
diff --git a/src/env/Makefile.am b/src/env/Makefile.am
index 3a4c46cc9..68d46d4cf 100644
--- a/src/env/Makefile.am
+++ b/src/env/Makefile.am
@@ -23,8 +23,6 @@ libgnunetenv_la_LIBADD = \
23libgnunetenv_la_LDFLAGS = \ 23libgnunetenv_la_LDFLAGS = \
24 $(GN_LIB_LDFLAGS) $(WINFLAGS) \ 24 $(GN_LIB_LDFLAGS) $(WINFLAGS) \
25 -version-info 0:0:0 25 -version-info 0:0:0
26libgnunetenv_la_DEPENDENCIES = \
27 $(top_builddir)/src/util/libgnunetutil.la
28 26
29if HAVE_TESTING 27if HAVE_TESTING
30check_PROGRAMS = \ 28check_PROGRAMS = \
@@ -42,7 +40,3 @@ test_env_LDADD = \
42 libgnunetenv.la \ 40 libgnunetenv.la \
43 $(top_builddir)/src/testing/libgnunettesting.la \ 41 $(top_builddir)/src/testing/libgnunettesting.la \
44 $(top_builddir)/src/util/libgnunetutil.la 42 $(top_builddir)/src/util/libgnunetutil.la
45test_env_DEPENDENCIES = \
46 libgnunetenv.la \
47 $(top_builddir)/src/testing/libgnunettesting.la \
48 $(top_builddir)/src/util/libgnunetutil.la
diff --git a/src/fragmentation/Makefile.am b/src/fragmentation/Makefile.am
index 2497b5a07..d4d41a70b 100644
--- a/src/fragmentation/Makefile.am
+++ b/src/fragmentation/Makefile.am
@@ -32,7 +32,7 @@ endif
32test_fragmentation_SOURCES = \ 32test_fragmentation_SOURCES = \
33 test_fragmentation.c 33 test_fragmentation.c
34test_fragmentation_LDADD = \ 34test_fragmentation_LDADD = \
35 $(top_builddir)/src/fragmentation/libgnunetfragmentation.la \ 35 libgnunetfragmentation.la \
36 $(top_builddir)/src/util/libgnunetutil.la 36 $(top_builddir)/src/util/libgnunetutil.la
37 37
38EXTRA_DIST = test_fragmentation_data.conf 38EXTRA_DIST = test_fragmentation_data.conf
diff --git a/src/fs/Makefile.am b/src/fs/Makefile.am
index b7c581788..1dd6065f0 100644
--- a/src/fs/Makefile.am
+++ b/src/fs/Makefile.am
@@ -89,13 +89,10 @@ bin_SCRIPTS = \
89gnunet_directory_SOURCES = \ 89gnunet_directory_SOURCES = \
90 gnunet-directory.c 90 gnunet-directory.c
91gnunet_directory_LDADD = \ 91gnunet_directory_LDADD = \
92 $(top_builddir)/src/fs/libgnunetfs.la \ 92 libgnunetfs.la \
93 $(top_builddir)/src/util/libgnunetutil.la \ 93 $(top_builddir)/src/util/libgnunetutil.la \
94 -lextractor \ 94 -lextractor \
95 $(GN_LIBINTL) 95 $(GN_LIBINTL)
96gnunet_directory_DEPENDENCIES = \
97 $(top_builddir)/src/fs/libgnunetfs.la \
98 $(top_builddir)/src/util/libgnunetutil.la
99 96
100gnunet_fs_profiler_SOURCES = \ 97gnunet_fs_profiler_SOURCES = \
101 gnunet-fs-profiler.c 98 gnunet-fs-profiler.c
@@ -103,41 +100,30 @@ gnunet_fs_profiler_LDADD = \
103 $(top_builddir)/src/testbed/libgnunettestbed.la \ 100 $(top_builddir)/src/testbed/libgnunettestbed.la \
104 $(top_builddir)/src/util/libgnunetutil.la \ 101 $(top_builddir)/src/util/libgnunetutil.la \
105 $(GN_LIBINTL) 102 $(GN_LIBINTL)
106gnunet_fs_profiler_DEPENDENCIES = \
107 $(top_builddir)/src/testbed/libgnunettestbed.la \
108 $(top_builddir)/src/util/libgnunetutil.la
109 103
110gnunet_fs_SOURCES = \ 104gnunet_fs_SOURCES = \
111 gnunet-fs.c 105 gnunet-fs.c
112gnunet_fs_LDADD = \ 106gnunet_fs_LDADD = \
113 $(top_builddir)/src/fs/libgnunetfs.la \ 107 libgnunetfs.la \
114 $(top_builddir)/src/util/libgnunetutil.la \ 108 $(top_builddir)/src/util/libgnunetutil.la \
115 -lextractor \ 109 -lextractor \
116 $(GN_LIBINTL) 110 $(GN_LIBINTL)
117gnunet_fs_DEPENDENCIES = \
118 libgnunetfs.la
119 111
120gnunet_download_SOURCES = \ 112gnunet_download_SOURCES = \
121 gnunet-download.c 113 gnunet-download.c
122gnunet_download_LDADD = \ 114gnunet_download_LDADD = \
123 $(top_builddir)/src/fs/libgnunetfs.la \ 115 libgnunetfs.la \
124 $(top_builddir)/src/util/libgnunetutil.la \ 116 $(top_builddir)/src/util/libgnunetutil.la \
125 $(GN_LIBINTL) 117 $(GN_LIBINTL)
126gnunet_download_DEPENDENCIES = \
127 $(top_builddir)/src/fs/libgnunetfs.la \
128 $(top_builddir)/src/util/libgnunetutil.la
129 118
130gnunet_publish_SOURCES = \ 119gnunet_publish_SOURCES = \
131 gnunet-publish.c 120 gnunet-publish.c
132gnunet_publish_LDADD = \ 121gnunet_publish_LDADD = \
133 $(top_builddir)/src/identity/libgnunetidentity.la \ 122 $(top_builddir)/src/identity/libgnunetidentity.la \
134 $(top_builddir)/src/fs/libgnunetfs.la \ 123 libgnunetfs.la \
135 $(top_builddir)/src/util/libgnunetutil.la \ 124 $(top_builddir)/src/util/libgnunetutil.la \
136 -lextractor \ 125 -lextractor \
137 $(GN_LIBINTL) 126 $(GN_LIBINTL)
138gnunet_publish_DEPENDENCIES = \
139 $(top_builddir)/src/fs/libgnunetfs.la \
140 $(top_builddir)/src/util/libgnunetutil.la
141 127
142gnunet_auto_share_SOURCES = \ 128gnunet_auto_share_SOURCES = \
143 gnunet-auto-share.c 129 gnunet-auto-share.c
@@ -145,8 +131,6 @@ gnunet_auto_share_LDADD = \
145 $(top_builddir)/src/util/libgnunetutil.la \ 131 $(top_builddir)/src/util/libgnunetutil.la \
146 -lextractor \ 132 -lextractor \
147 $(GN_LIBINTL) 133 $(GN_LIBINTL)
148gnunet_auto_share_DEPENDENCIES = \
149 $(top_builddir)/src/util/libgnunetutil.la
150 134
151gnunet_helper_fs_publish_SOURCES = \ 135gnunet_helper_fs_publish_SOURCES = \
152 gnunet-helper-fs-publish.c 136 gnunet-helper-fs-publish.c
@@ -154,32 +138,22 @@ gnunet_helper_fs_publish_LDADD = \
154 $(top_builddir)/src/util/libgnunetutil.la \ 138 $(top_builddir)/src/util/libgnunetutil.la \
155 -lextractor \ 139 -lextractor \
156 $(GN_LIBINTL) 140 $(GN_LIBINTL)
157gnunet_helper_fs_publish_DEPENDENCIES = \
158 $(top_builddir)/src/util/libgnunetutil.la
159 141
160gnunet_search_SOURCES = \ 142gnunet_search_SOURCES = \
161 gnunet-search.c 143 gnunet-search.c
162gnunet_search_LDADD = \ 144gnunet_search_LDADD = \
163 $(top_builddir)/src/fs/libgnunetfs.la \ 145 libgnunetfs.la \
164 $(top_builddir)/src/util/libgnunetutil.la \ 146 $(top_builddir)/src/util/libgnunetutil.la \
165 -lextractor \ 147 -lextractor \
166 $(GN_LIBINTL) 148 $(GN_LIBINTL)
167gnunet_search_DEPENDENCIES = \
168 $(top_builddir)/src/fs/libgnunetfs.la \
169 $(top_builddir)/src/util/libgnunetutil.la
170
171 149
172gnunet_daemon_fsprofiler_SOURCES = \ 150gnunet_daemon_fsprofiler_SOURCES = \
173 gnunet-daemon-fsprofiler.c 151 gnunet-daemon-fsprofiler.c
174gnunet_daemon_fsprofiler_LDADD = \ 152gnunet_daemon_fsprofiler_LDADD = \
175 $(top_builddir)/src/fs/libgnunetfs.la \ 153 libgnunetfs.la \
176 $(top_builddir)/src/statistics/libgnunetstatistics.la \ 154 $(top_builddir)/src/statistics/libgnunetstatistics.la \
177 $(top_builddir)/src/util/libgnunetutil.la \ 155 $(top_builddir)/src/util/libgnunetutil.la \
178 $(GN_LIBINTL) 156 $(GN_LIBINTL)
179gnunet_daemon_fsprofiler_DEPENDENCIES = \
180 $(top_builddir)/src/fs/libgnunetfs.la \
181 $(top_builddir)/src/statistics/libgnunetstatistics.la \
182 $(top_builddir)/src/util/libgnunetutil.la
183 157
184gnunet_service_fs_SOURCES = \ 158gnunet_service_fs_SOURCES = \
185 gnunet-service-fs.c gnunet-service-fs.h \ 159 gnunet-service-fs.c gnunet-service-fs.h \
@@ -193,7 +167,7 @@ gnunet_service_fs_SOURCES = \
193 gnunet-service-fs_cadet_client.c gnunet-service-fs_cadet.h \ 167 gnunet-service-fs_cadet_client.c gnunet-service-fs_cadet.h \
194 gnunet-service-fs_cadet_server.c 168 gnunet-service-fs_cadet_server.c
195gnunet_service_fs_LDADD = \ 169gnunet_service_fs_LDADD = \
196 $(top_builddir)/src/fs/libgnunetfs.la \ 170 libgnunetfs.la \
197 $(top_builddir)/src/dht/libgnunetdht.la \ 171 $(top_builddir)/src/dht/libgnunetdht.la \
198 $(top_builddir)/src/block/libgnunetblock.la \ 172 $(top_builddir)/src/block/libgnunetblock.la \
199 $(top_builddir)/src/datastore/libgnunetdatastore.la \ 173 $(top_builddir)/src/datastore/libgnunetdatastore.la \
@@ -204,41 +178,23 @@ gnunet_service_fs_LDADD = \
204 $(top_builddir)/src/util/libgnunetutil.la \ 178 $(top_builddir)/src/util/libgnunetutil.la \
205 $(top_builddir)/src/peerstore/libgnunetpeerstore.la \ 179 $(top_builddir)/src/peerstore/libgnunetpeerstore.la \
206 $(GN_LIBINTL) -lm 180 $(GN_LIBINTL) -lm
207gnunet_service_fs_DEPENDENCIES = \
208 $(top_builddir)/src/fs/libgnunetfs.la \
209 $(top_builddir)/src/dht/libgnunetdht.la \
210 $(top_builddir)/src/block/libgnunetblock.la \
211 $(top_builddir)/src/datastore/libgnunetdatastore.la \
212 $(top_builddir)/src/statistics/libgnunetstatistics.la \
213 $(top_builddir)/src/cadet/libgnunetcadet.la \
214 $(top_builddir)/src/ats/libgnunetats.la \
215 $(top_builddir)/src/core/libgnunetcore.la \
216 $(top_builddir)/src/util/libgnunetutil.la \
217 $(top_builddir)/src/peerstore/libgnunetpeerstore.la
218 181
219gnunet_unindex_SOURCES = \ 182gnunet_unindex_SOURCES = \
220 gnunet-unindex.c 183 gnunet-unindex.c
221gnunet_unindex_LDADD = \ 184gnunet_unindex_LDADD = \
222 $(top_builddir)/src/fs/libgnunetfs.la \ 185 libgnunetfs.la \
223 $(top_builddir)/src/util/libgnunetutil.la \ 186 $(top_builddir)/src/util/libgnunetutil.la \
224 $(GN_LIBINTL) 187 $(GN_LIBINTL)
225gnunet_unindex_DEPENDENCIES = \
226 $(top_builddir)/src/fs/libgnunetfs.la \
227 $(top_builddir)/src/util/libgnunetutil.la
228 188
229libgnunet_plugin_block_fs_la_SOURCES = \ 189libgnunet_plugin_block_fs_la_SOURCES = \
230 plugin_block_fs.c 190 plugin_block_fs.c
231libgnunet_plugin_block_fs_la_LIBADD = \ 191libgnunet_plugin_block_fs_la_LIBADD = \
232 $(top_builddir)/src/block/libgnunetblock.la \ 192 $(top_builddir)/src/block/libgnunetblock.la \
233 $(top_builddir)/src/fs/libgnunetfs.la \ 193 libgnunetfs.la \
234 $(top_builddir)/src/util/libgnunetutil.la \ 194 $(top_builddir)/src/util/libgnunetutil.la \
235 $(LTLIBINTL) 195 $(LTLIBINTL)
236libgnunet_plugin_block_fs_la_LDFLAGS = \ 196libgnunet_plugin_block_fs_la_LDFLAGS = \
237 $(GN_PLUGIN_LDFLAGS) 197 $(GN_PLUGIN_LDFLAGS)
238libgnunet_plugin_block_fs_la_DEPENDENCIES = \
239 $(top_builddir)/src/block/libgnunetblock.la \
240 $(top_builddir)/src/fs/libgnunetfs.la \
241 $(top_builddir)/src/util/libgnunetutil.la
242 198
243if HAVE_BENCHMARKS 199if HAVE_BENCHMARKS
244 FS_BENCHMARKS = \ 200 FS_BENCHMARKS = \
@@ -333,206 +289,206 @@ test_fs_directory_SOURCES = \
333 test_fs_directory.c 289 test_fs_directory.c
334test_fs_directory_LDADD = \ 290test_fs_directory_LDADD = \
335 -lextractor \ 291 -lextractor \
336 $(top_builddir)/src/fs/libgnunetfs.la \ 292 libgnunetfs.la \
337 $(top_builddir)/src/util/libgnunetutil.la 293 $(top_builddir)/src/util/libgnunetutil.la
338 294
339test_fs_download_SOURCES = \ 295test_fs_download_SOURCES = \
340 test_fs_download.c 296 test_fs_download.c
341test_fs_download_LDADD = \ 297test_fs_download_LDADD = \
342 $(top_builddir)/src/testing/libgnunettesting.la \ 298 $(top_builddir)/src/testing/libgnunettesting.la \
343 $(top_builddir)/src/fs/libgnunetfs.la \ 299 libgnunetfs.la \
344 $(top_builddir)/src/util/libgnunetutil.la 300 $(top_builddir)/src/util/libgnunetutil.la
345 301
346test_fs_download_indexed_SOURCES = \ 302test_fs_download_indexed_SOURCES = \
347 test_fs_download.c 303 test_fs_download.c
348test_fs_download_indexed_LDADD = \ 304test_fs_download_indexed_LDADD = \
349 $(top_builddir)/src/testing/libgnunettesting.la \ 305 $(top_builddir)/src/testing/libgnunettesting.la \
350 $(top_builddir)/src/fs/libgnunetfs.la \ 306 libgnunetfs.la \
351 $(top_builddir)/src/util/libgnunetutil.la 307 $(top_builddir)/src/util/libgnunetutil.la
352 308
353test_fs_download_cadet_SOURCES = \ 309test_fs_download_cadet_SOURCES = \
354 test_fs_download.c 310 test_fs_download.c
355test_fs_download_cadet_LDADD = \ 311test_fs_download_cadet_LDADD = \
356 $(top_builddir)/src/testing/libgnunettesting.la \ 312 $(top_builddir)/src/testing/libgnunettesting.la \
357 $(top_builddir)/src/fs/libgnunetfs.la \ 313 libgnunetfs.la \
358 $(top_builddir)/src/util/libgnunetutil.la 314 $(top_builddir)/src/util/libgnunetutil.la
359 315
360test_fs_download_persistence_SOURCES = \ 316test_fs_download_persistence_SOURCES = \
361 test_fs_download_persistence.c 317 test_fs_download_persistence.c
362test_fs_download_persistence_LDADD = \ 318test_fs_download_persistence_LDADD = \
363 $(top_builddir)/src/testing/libgnunettesting.la \ 319 $(top_builddir)/src/testing/libgnunettesting.la \
364 $(top_builddir)/src/fs/libgnunetfs.la \ 320 libgnunetfs.la \
365 $(top_builddir)/src/util/libgnunetutil.la 321 $(top_builddir)/src/util/libgnunetutil.la
366 322
367test_fs_file_information_SOURCES = \ 323test_fs_file_information_SOURCES = \
368 test_fs_file_information.c 324 test_fs_file_information.c
369test_fs_file_information_LDADD = \ 325test_fs_file_information_LDADD = \
370 -lextractor \ 326 -lextractor \
371 $(top_builddir)/src/fs/libgnunetfs.la \ 327 libgnunetfs.la \
372 $(top_builddir)/src/util/libgnunetutil.la 328 $(top_builddir)/src/util/libgnunetutil.la
373 329
374test_fs_getopt_SOURCES = \ 330test_fs_getopt_SOURCES = \
375 test_fs_getopt.c 331 test_fs_getopt.c
376test_fs_getopt_LDADD = \ 332test_fs_getopt_LDADD = \
377 $(top_builddir)/src/fs/libgnunetfs.la \ 333 libgnunetfs.la \
378 $(top_builddir)/src/util/libgnunetutil.la 334 $(top_builddir)/src/util/libgnunetutil.la
379 335
380test_fs_list_indexed_SOURCES = \ 336test_fs_list_indexed_SOURCES = \
381 test_fs_list_indexed.c 337 test_fs_list_indexed.c
382test_fs_list_indexed_LDADD = \ 338test_fs_list_indexed_LDADD = \
383 $(top_builddir)/src/testing/libgnunettesting.la \ 339 $(top_builddir)/src/testing/libgnunettesting.la \
384 $(top_builddir)/src/fs/libgnunetfs.la \ 340 libgnunetfs.la \
385 $(top_builddir)/src/util/libgnunetutil.la 341 $(top_builddir)/src/util/libgnunetutil.la
386 342
387test_fs_namespace_SOURCES = \ 343test_fs_namespace_SOURCES = \
388 test_fs_namespace.c 344 test_fs_namespace.c
389test_fs_namespace_LDADD = \ 345test_fs_namespace_LDADD = \
390 $(top_builddir)/src/testing/libgnunettesting.la \ 346 $(top_builddir)/src/testing/libgnunettesting.la \
391 $(top_builddir)/src/fs/libgnunetfs.la \ 347 libgnunetfs.la \
392 $(top_builddir)/src/util/libgnunetutil.la 348 $(top_builddir)/src/util/libgnunetutil.la
393 349
394test_fs_namespace_list_updateable_SOURCES = \ 350test_fs_namespace_list_updateable_SOURCES = \
395 test_fs_namespace_list_updateable.c 351 test_fs_namespace_list_updateable.c
396test_fs_namespace_list_updateable_LDADD = \ 352test_fs_namespace_list_updateable_LDADD = \
397 $(top_builddir)/src/testing/libgnunettesting.la \ 353 $(top_builddir)/src/testing/libgnunettesting.la \
398 $(top_builddir)/src/fs/libgnunetfs.la \ 354 libgnunetfs.la \
399 $(top_builddir)/src/util/libgnunetutil.la 355 $(top_builddir)/src/util/libgnunetutil.la
400 356
401test_fs_publish_SOURCES = \ 357test_fs_publish_SOURCES = \
402 test_fs_publish.c 358 test_fs_publish.c
403test_fs_publish_LDADD = \ 359test_fs_publish_LDADD = \
404 $(top_builddir)/src/testing/libgnunettesting.la \ 360 $(top_builddir)/src/testing/libgnunettesting.la \
405 $(top_builddir)/src/fs/libgnunetfs.la \ 361 libgnunetfs.la \
406 $(top_builddir)/src/util/libgnunetutil.la 362 $(top_builddir)/src/util/libgnunetutil.la
407 363
408test_fs_publish_persistence_SOURCES = \ 364test_fs_publish_persistence_SOURCES = \
409 test_fs_publish_persistence.c 365 test_fs_publish_persistence.c
410test_fs_publish_persistence_LDADD = \ 366test_fs_publish_persistence_LDADD = \
411 $(top_builddir)/src/testing/libgnunettesting.la \ 367 $(top_builddir)/src/testing/libgnunettesting.la \
412 $(top_builddir)/src/fs/libgnunetfs.la \ 368 libgnunetfs.la \
413 $(top_builddir)/src/util/libgnunetutil.la 369 $(top_builddir)/src/util/libgnunetutil.la
414 370
415test_fs_search_SOURCES = \ 371test_fs_search_SOURCES = \
416 test_fs_search.c 372 test_fs_search.c
417test_fs_search_LDADD = \ 373test_fs_search_LDADD = \
418 $(top_builddir)/src/testing/libgnunettesting.la \ 374 $(top_builddir)/src/testing/libgnunettesting.la \
419 $(top_builddir)/src/fs/libgnunetfs.la \ 375 libgnunetfs.la \
420 $(top_builddir)/src/util/libgnunetutil.la 376 $(top_builddir)/src/util/libgnunetutil.la
421 377
422test_fs_search_with_and_SOURCES = \ 378test_fs_search_with_and_SOURCES = \
423 test_fs_search_with_and.c 379 test_fs_search_with_and.c
424test_fs_search_with_and_LDADD = \ 380test_fs_search_with_and_LDADD = \
425 $(top_builddir)/src/testing/libgnunettesting.la \ 381 $(top_builddir)/src/testing/libgnunettesting.la \
426 $(top_builddir)/src/fs/libgnunetfs.la \ 382 libgnunetfs.la \
427 $(top_builddir)/src/util/libgnunetutil.la 383 $(top_builddir)/src/util/libgnunetutil.la
428 384
429test_fs_search_probes_SOURCES = \ 385test_fs_search_probes_SOURCES = \
430 test_fs_search_probes.c 386 test_fs_search_probes.c
431test_fs_search_probes_LDADD = \ 387test_fs_search_probes_LDADD = \
432 $(top_builddir)/src/testing/libgnunettesting.la \ 388 $(top_builddir)/src/testing/libgnunettesting.la \
433 $(top_builddir)/src/fs/libgnunetfs.la \ 389 libgnunetfs.la \
434 $(top_builddir)/src/util/libgnunetutil.la 390 $(top_builddir)/src/util/libgnunetutil.la
435 391
436test_fs_search_persistence_SOURCES = \ 392test_fs_search_persistence_SOURCES = \
437 test_fs_search_persistence.c 393 test_fs_search_persistence.c
438test_fs_search_persistence_LDADD = \ 394test_fs_search_persistence_LDADD = \
439 $(top_builddir)/src/testing/libgnunettesting.la \ 395 $(top_builddir)/src/testing/libgnunettesting.la \
440 $(top_builddir)/src/fs/libgnunetfs.la \ 396 libgnunetfs.la \
441 $(top_builddir)/src/util/libgnunetutil.la 397 $(top_builddir)/src/util/libgnunetutil.la
442 398
443test_fs_start_stop_SOURCES = \ 399test_fs_start_stop_SOURCES = \
444 test_fs_start_stop.c 400 test_fs_start_stop.c
445test_fs_start_stop_LDADD = \ 401test_fs_start_stop_LDADD = \
446 $(top_builddir)/src/testing/libgnunettesting.la \ 402 $(top_builddir)/src/testing/libgnunettesting.la \
447 $(top_builddir)/src/fs/libgnunetfs.la \ 403 libgnunetfs.la \
448 $(top_builddir)/src/util/libgnunetutil.la 404 $(top_builddir)/src/util/libgnunetutil.la
449 405
450test_fs_unindex_SOURCES = \ 406test_fs_unindex_SOURCES = \
451 test_fs_unindex.c 407 test_fs_unindex.c
452test_fs_unindex_LDADD = \ 408test_fs_unindex_LDADD = \
453 $(top_builddir)/src/testing/libgnunettesting.la \ 409 $(top_builddir)/src/testing/libgnunettesting.la \
454 $(top_builddir)/src/fs/libgnunetfs.la \ 410 libgnunetfs.la \
455 $(top_builddir)/src/util/libgnunetutil.la 411 $(top_builddir)/src/util/libgnunetutil.la
456 412
457test_fs_unindex_persistence_SOURCES = \ 413test_fs_unindex_persistence_SOURCES = \
458 test_fs_unindex_persistence.c 414 test_fs_unindex_persistence.c
459test_fs_unindex_persistence_LDADD = \ 415test_fs_unindex_persistence_LDADD = \
460 $(top_builddir)/src/testing/libgnunettesting.la \ 416 $(top_builddir)/src/testing/libgnunettesting.la \
461 $(top_builddir)/src/fs/libgnunetfs.la \ 417 libgnunetfs.la \
462 $(top_builddir)/src/util/libgnunetutil.la 418 $(top_builddir)/src/util/libgnunetutil.la
463 419
464test_fs_uri_SOURCES = \ 420test_fs_uri_SOURCES = \
465 test_fs_uri.c 421 test_fs_uri.c
466test_fs_uri_LDADD = \ 422test_fs_uri_LDADD = \
467 $(top_builddir)/src/fs/libgnunetfs.la \ 423 libgnunetfs.la \
468 $(top_builddir)/src/util/libgnunetutil.la 424 $(top_builddir)/src/util/libgnunetutil.la
469 425
470test_fs_test_lib_SOURCES = \ 426test_fs_test_lib_SOURCES = \
471 test_fs_test_lib.c 427 test_fs_test_lib.c
472test_fs_test_lib_LDADD = \ 428test_fs_test_lib_LDADD = \
473 $(top_builddir)/src/fs/libgnunetfstest.a \ 429 libgnunetfstest.a \
474 $(top_builddir)/src/testbed/libgnunettestbed.la \ 430 $(top_builddir)/src/testbed/libgnunettestbed.la \
475 $(top_builddir)/src/fs/libgnunetfs.la \ 431 libgnunetfs.la \
476 $(top_builddir)/src/util/libgnunetutil.la 432 $(top_builddir)/src/util/libgnunetutil.la
477 433
478test_gnunet_service_fs_p2p_SOURCES = \ 434test_gnunet_service_fs_p2p_SOURCES = \
479 test_gnunet_service_fs_p2p.c 435 test_gnunet_service_fs_p2p.c
480test_gnunet_service_fs_p2p_LDADD = \ 436test_gnunet_service_fs_p2p_LDADD = \
481 $(top_builddir)/src/fs/libgnunetfstest.a \ 437 libgnunetfstest.a \
482 $(top_builddir)/src/testbed/libgnunettestbed.la \ 438 $(top_builddir)/src/testbed/libgnunettestbed.la \
483 $(top_builddir)/src/fs/libgnunetfs.la \ 439 libgnunetfs.la \
484 $(top_builddir)/src/util/libgnunetutil.la 440 $(top_builddir)/src/util/libgnunetutil.la
485 441
486test_gnunet_service_fs_p2p_cadet_SOURCES = \ 442test_gnunet_service_fs_p2p_cadet_SOURCES = \
487 test_gnunet_service_fs_p2p.c 443 test_gnunet_service_fs_p2p.c
488test_gnunet_service_fs_p2p_cadet_LDADD = \ 444test_gnunet_service_fs_p2p_cadet_LDADD = \
489 $(top_builddir)/src/fs/libgnunetfstest.a \ 445 libgnunetfstest.a \
490 $(top_builddir)/src/testbed/libgnunettestbed.la \ 446 $(top_builddir)/src/testbed/libgnunettestbed.la \
491 $(top_builddir)/src/fs/libgnunetfs.la \ 447 libgnunetfs.la \
492 $(top_builddir)/src/util/libgnunetutil.la 448 $(top_builddir)/src/util/libgnunetutil.la
493 449
494test_gnunet_service_fs_migration_SOURCES = \ 450test_gnunet_service_fs_migration_SOURCES = \
495 test_gnunet_service_fs_migration.c 451 test_gnunet_service_fs_migration.c
496test_gnunet_service_fs_migration_LDADD = \ 452test_gnunet_service_fs_migration_LDADD = \
497 $(top_builddir)/src/fs/libgnunetfstest.a \ 453 libgnunetfstest.a \
498 $(top_builddir)/src/testbed/libgnunettestbed.la \ 454 $(top_builddir)/src/testbed/libgnunettestbed.la \
499 $(top_builddir)/src/fs/libgnunetfs.la \ 455 libgnunetfs.la \
500 $(top_builddir)/src/util/libgnunetutil.la 456 $(top_builddir)/src/util/libgnunetutil.la
501 457
502perf_gnunet_service_fs_p2p_SOURCES = \ 458perf_gnunet_service_fs_p2p_SOURCES = \
503 perf_gnunet_service_fs_p2p.c 459 perf_gnunet_service_fs_p2p.c
504perf_gnunet_service_fs_p2p_LDADD = \ 460perf_gnunet_service_fs_p2p_LDADD = \
505 $(top_builddir)/src/fs/libgnunetfstest.a \ 461 libgnunetfstest.a \
506 $(top_builddir)/src/statistics/libgnunetstatistics.la \ 462 $(top_builddir)/src/statistics/libgnunetstatistics.la \
507 $(top_builddir)/src/testbed/libgnunettestbed.la \ 463 $(top_builddir)/src/testbed/libgnunettestbed.la \
508 $(top_builddir)/src/fs/libgnunetfs.la \ 464 libgnunetfs.la \
509 $(top_builddir)/src/util/libgnunetutil.la 465 $(top_builddir)/src/util/libgnunetutil.la
510 466
511perf_gnunet_service_fs_p2p_index_SOURCES = \ 467perf_gnunet_service_fs_p2p_index_SOURCES = \
512 perf_gnunet_service_fs_p2p.c 468 perf_gnunet_service_fs_p2p.c
513perf_gnunet_service_fs_p2p_index_LDADD = \ 469perf_gnunet_service_fs_p2p_index_LDADD = \
514 $(top_builddir)/src/fs/libgnunetfstest.a \ 470 libgnunetfstest.a \
515 $(top_builddir)/src/statistics/libgnunetstatistics.la \ 471 $(top_builddir)/src/statistics/libgnunetstatistics.la \
516 $(top_builddir)/src/testbed/libgnunettestbed.la \ 472 $(top_builddir)/src/testbed/libgnunettestbed.la \
517 $(top_builddir)/src/fs/libgnunetfs.la \ 473 libgnunetfs.la \
518 $(top_builddir)/src/util/libgnunetutil.la 474 $(top_builddir)/src/util/libgnunetutil.la
519 475
520perf_gnunet_service_fs_p2p_dht_SOURCES = \ 476perf_gnunet_service_fs_p2p_dht_SOURCES = \
521 perf_gnunet_service_fs_p2p.c 477 perf_gnunet_service_fs_p2p.c
522perf_gnunet_service_fs_p2p_dht_LDADD = \ 478perf_gnunet_service_fs_p2p_dht_LDADD = \
523 $(top_builddir)/src/fs/libgnunetfstest.a \ 479 libgnunetfstest.a \
524 $(top_builddir)/src/statistics/libgnunetstatistics.la \ 480 $(top_builddir)/src/statistics/libgnunetstatistics.la \
525 $(top_builddir)/src/testbed/libgnunettestbed.la \ 481 $(top_builddir)/src/testbed/libgnunettestbed.la \
526 $(top_builddir)/src/fs/libgnunetfs.la \ 482 libgnunetfs.la \
527 $(top_builddir)/src/util/libgnunetutil.la 483 $(top_builddir)/src/util/libgnunetutil.la
528 484
529perf_gnunet_service_fs_p2p_respect_SOURCES = \ 485perf_gnunet_service_fs_p2p_respect_SOURCES = \
530 perf_gnunet_service_fs_p2p_respect.c 486 perf_gnunet_service_fs_p2p_respect.c
531perf_gnunet_service_fs_p2p_respect_LDADD = \ 487perf_gnunet_service_fs_p2p_respect_LDADD = \
532 $(top_builddir)/src/fs/libgnunetfstest.a \ 488 libgnunetfstest.a \
533 $(top_builddir)/src/statistics/libgnunetstatistics.la \ 489 $(top_builddir)/src/statistics/libgnunetstatistics.la \
534 $(top_builddir)/src/testbed/libgnunettestbed.la \ 490 $(top_builddir)/src/testbed/libgnunettestbed.la \
535 $(top_builddir)/src/fs/libgnunetfs.la \ 491 libgnunetfs.la \
536 $(top_builddir)/src/util/libgnunetutil.la 492 $(top_builddir)/src/util/libgnunetutil.la
537 493
538 494
diff --git a/src/gns/Makefile.am b/src/gns/Makefile.am
index 61e52ee98..bfb9312db 100644
--- a/src/gns/Makefile.am
+++ b/src/gns/Makefile.am
@@ -105,17 +105,12 @@ libgnunet_plugin_gnsrecord_gns_la_LDFLAGS = \
105gnunet_gns_SOURCES = \ 105gnunet_gns_SOURCES = \
106 gnunet-gns.c 106 gnunet-gns.c
107gnunet_gns_LDADD = \ 107gnunet_gns_LDADD = \
108 $(top_builddir)/src/gns/libgnunetgns.la \ 108 libgnunetgns.la \
109 $(top_builddir)/src/gnsrecord/libgnunetgnsrecord.la \ 109 $(top_builddir)/src/gnsrecord/libgnunetgnsrecord.la \
110 $(top_builddir)/src/namestore/libgnunetnamestore.la \ 110 $(top_builddir)/src/namestore/libgnunetnamestore.la \
111 $(top_builddir)/src/identity/libgnunetidentity.la \ 111 $(top_builddir)/src/identity/libgnunetidentity.la \
112 $(top_builddir)/src/util/libgnunetutil.la \ 112 $(top_builddir)/src/util/libgnunetutil.la \
113 $(GN_LIBINTL) 113 $(GN_LIBINTL)
114gnunet_gns_DEPENDENCIES = \
115 $(top_builddir)/src/namestore/libgnunetnamestore.la \
116 $(top_builddir)/src/identity/libgnunetidentity.la \
117 $(top_builddir)/src/util/libgnunetutil.la \
118 libgnunetgns.la
119 114
120 115
121gnunet_bcd_SOURCES = \ 116gnunet_bcd_SOURCES = \
@@ -123,57 +118,39 @@ gnunet_bcd_SOURCES = \
123gnunet_bcd_LDADD = \ 118gnunet_bcd_LDADD = \
124 $(top_builddir)/src/util/libgnunetutil.la \ 119 $(top_builddir)/src/util/libgnunetutil.la \
125 $(GN_LIBINTL) -lmicrohttpd 120 $(GN_LIBINTL) -lmicrohttpd
126gnunet_bcd_DEPENDENCIES = \
127 $(top_builddir)/src/util/libgnunetutil.la
128 121
129 122
130gnunet_dns2gns_SOURCES = \ 123gnunet_dns2gns_SOURCES = \
131 gnunet-dns2gns.c 124 gnunet-dns2gns.c
132gnunet_dns2gns_LDADD = \ 125gnunet_dns2gns_LDADD = \
133 $(top_builddir)/src/gnsrecord/libgnunetgnsrecord.la \ 126 $(top_builddir)/src/gnsrecord/libgnunetgnsrecord.la \
134 $(top_builddir)/src/gns/libgnunetgns.la \ 127 libgnunetgns.la \
135 $(top_builddir)/src/util/libgnunetutil.la \ 128 $(top_builddir)/src/util/libgnunetutil.la \
136 $(top_builddir)/src/identity/libgnunetidentity.la \ 129 $(top_builddir)/src/identity/libgnunetidentity.la \
137 $(top_builddir)/src/namestore/libgnunetnamestore.la \ 130 $(top_builddir)/src/namestore/libgnunetnamestore.la \
138 $(top_builddir)/src/dns/libgnunetdnsparser.la \ 131 $(top_builddir)/src/dns/libgnunetdnsparser.la \
139 $(top_builddir)/src/dns/libgnunetdnsstub.la \ 132 $(top_builddir)/src/dns/libgnunetdnsstub.la \
140 $(GN_LIBINTL) 133 $(GN_LIBINTL)
141gnunet_dns2gns_DEPENDENCIES = \
142 $(top_builddir)/src/gnsrecord/libgnunetgnsrecord.la \
143 $(top_builddir)/src/util/libgnunetutil.la \
144 $(top_builddir)/src/identity/libgnunetidentity.la \
145 $(top_builddir)/src/namestore/libgnunetnamestore.la \
146 $(top_builddir)/src/dns/libgnunetdnsparser.la \
147 $(top_builddir)/src/dns/libgnunetdnsstub.la \
148 libgnunetgns.la
149 134
150gnunet_gns_proxy_SOURCES = \ 135gnunet_gns_proxy_SOURCES = \
151 gnunet-gns-proxy.c 136 gnunet-gns-proxy.c
152gnunet_gns_proxy_CPPFLAGS = $(AM_CPPFLAGS) $(CPP_GNURL) 137gnunet_gns_proxy_CPPFLAGS = $(AM_CPPFLAGS) $(CPP_GNURL)
153gnunet_gns_proxy_LDADD = -lmicrohttpd $(LIB_GNURL) -lgnutls \ 138gnunet_gns_proxy_LDADD = -lmicrohttpd $(LIB_GNURL) -lgnutls \
154 $(top_builddir)/src/gns/libgnunetgns.la \ 139 libgnunetgns.la \
155 $(top_builddir)/src/identity/libgnunetidentity.la \ 140 $(top_builddir)/src/identity/libgnunetidentity.la \
156 $(top_builddir)/src/util/libgnunetutil.la \ 141 $(top_builddir)/src/util/libgnunetutil.la \
157 $(GN_LIBINTL) 142 $(GN_LIBINTL)
158if HAVE_GNUTLS_DANE 143if HAVE_GNUTLS_DANE
159gnunet_gns_proxy_LDADD += -lgnutls-dane 144gnunet_gns_proxy_LDADD += -lgnutls-dane
160endif 145endif
161gnunet_gns_proxy_DEPENDENCIES = \
162 $(top_builddir)/src/identity/libgnunetidentity.la \
163 $(top_builddir)/src/util/libgnunetutil.la \
164 libgnunetgns.la
165 146
166gnunet_gns_helper_service_w32_SOURCES = \ 147gnunet_gns_helper_service_w32_SOURCES = \
167 gnunet-gns-helper-service-w32.c 148 gnunet-gns-helper-service-w32.c
168gnunet_gns_helper_service_w32_LDADD = \ 149gnunet_gns_helper_service_w32_LDADD = \
169 $(top_builddir)/src/gns/libgnunetgns.la \ 150 libgnunetgns.la \
170 $(top_builddir)/src/identity/libgnunetidentity.la \ 151 $(top_builddir)/src/identity/libgnunetidentity.la \
171 $(top_builddir)/src/util/libgnunetutil.la \ 152 $(top_builddir)/src/util/libgnunetutil.la \
172 $(GN_LIBINTL) 153 $(GN_LIBINTL)
173gnunet_gns_helper_service_w32_DEPENDENCIES = \
174 $(top_builddir)/src/util/libgnunetutil.la \
175 $(top_builddir)/src/identity/libgnunetidentity.la \
176 libgnunetgns.la
177 154
178gnunet_gns_import_SOURCES = \ 155gnunet_gns_import_SOURCES = \
179 gnunet-gns-import.c 156 gnunet-gns-import.c
@@ -183,11 +160,7 @@ gnunet_gns_import_LDADD = \
183 $(top_builddir)/src/gnsrecord/libgnunetgnsrecord.la \ 160 $(top_builddir)/src/gnsrecord/libgnunetgnsrecord.la \
184 $(top_builddir)/src/util/libgnunetutil.la \ 161 $(top_builddir)/src/util/libgnunetutil.la \
185 $(GN_LIBINTL) 162 $(GN_LIBINTL)
186gnunet_gns_import_DEPENDENCIES = \ 163
187 $(top_builddir)/src/util/libgnunetutil.la \
188 $(top_builddir)/src/namestore/libgnunetnamestore.la \
189 $(top_builddir)/src/gnsrecord/libgnunetgnsrecord.la \
190 $(top_builddir)/src/identity/libgnunetidentity.la
191 164
192w32nsp_install_SOURCES = \ 165w32nsp_install_SOURCES = \
193 w32nsp-install.c 166 w32nsp-install.c
@@ -221,18 +194,6 @@ gnunet_service_gns_LDADD = \
221 $(top_builddir)/src/namestore/libgnunetnamestore.la \ 194 $(top_builddir)/src/namestore/libgnunetnamestore.la \
222 $(USE_VPN) \ 195 $(USE_VPN) \
223 $(GN_LIBINTL) 196 $(GN_LIBINTL)
224gnunet_service_gns_DEPENDENCIES = \
225 $(top_builddir)/src/gnsrecord/libgnunetgnsrecord.la \
226 $(top_builddir)/src/revocation/libgnunetrevocation.la \
227 $(top_builddir)/src/statistics/libgnunetstatistics.la \
228 $(top_builddir)/src/util/libgnunetutil.la \
229 $(top_builddir)/src/tun/libgnunettun.la \
230 $(top_builddir)/src/dns/libgnunetdns.la \
231 $(top_builddir)/src/dns/libgnunetdnsparser.la \
232 $(top_builddir)/src/dht/libgnunetdht.la \
233 $(top_builddir)/src/namestore/libgnunetnamestore.la \
234 $(USE_VPN)
235
236 197
237 198
238libw32nsp_la_SOURCES = \ 199libw32nsp_la_SOURCES = \
@@ -250,9 +211,6 @@ libgnunetgns_la_LIBADD = \
250 $(top_builddir)/src/gnsrecord/libgnunetgnsrecord.la 211 $(top_builddir)/src/gnsrecord/libgnunetgnsrecord.la
251libgnunetgns_la_LDFLAGS = \ 212libgnunetgns_la_LDFLAGS = \
252 $(GN_LIB_LDFLAGS) 213 $(GN_LIB_LDFLAGS)
253libgnunetgns_la_DEPENDENCIES = \
254 $(top_builddir)/src/util/libgnunetutil.la \
255 $(top_builddir)/src/gnsrecord/libgnunetgnsrecord.la
256 214
257 215
258libgnunet_plugin_block_gns_la_SOURCES = \ 216libgnunet_plugin_block_gns_la_SOURCES = \
@@ -263,10 +221,6 @@ libgnunet_plugin_block_gns_la_LIBADD = \
263 $(top_builddir)/src/gnsrecord/libgnunetgnsrecord.la 221 $(top_builddir)/src/gnsrecord/libgnunetgnsrecord.la
264libgnunet_plugin_block_gns_la_LDFLAGS = \ 222libgnunet_plugin_block_gns_la_LDFLAGS = \
265 $(GN_PLUGIN_LDFLAGS) 223 $(GN_PLUGIN_LDFLAGS)
266libgnunet_plugin_block_gns_la_DEPENDENCIES = \
267 $(top_builddir)/src/util/libgnunetutil.la \
268 $(top_builddir)/src/block/libgnunetblock.la \
269 $(top_builddir)/src/gnsrecord/libgnunetgnsrecord.la
270 224
271 225
272check_SCRIPTS = \ 226check_SCRIPTS = \
diff --git a/src/gnsrecord/Makefile.am b/src/gnsrecord/Makefile.am
index 2ac330ae0..88c7fab21 100644
--- a/src/gnsrecord/Makefile.am
+++ b/src/gnsrecord/Makefile.am
@@ -66,14 +66,14 @@ test_gnsrecord_serialization_SOURCES = \
66 test_gnsrecord_serialization.c 66 test_gnsrecord_serialization.c
67test_gnsrecord_serialization_LDADD = \ 67test_gnsrecord_serialization_LDADD = \
68 $(top_builddir)/src/testing/libgnunettesting.la \ 68 $(top_builddir)/src/testing/libgnunettesting.la \
69 $(top_builddir)/src/gnsrecord/libgnunetgnsrecord.la \ 69 libgnunetgnsrecord.la \
70 $(top_builddir)/src/util/libgnunetutil.la 70 $(top_builddir)/src/util/libgnunetutil.la
71 71
72test_gnsrecord_block_expiration_SOURCES = \ 72test_gnsrecord_block_expiration_SOURCES = \
73 test_gnsrecord_block_expiration.c 73 test_gnsrecord_block_expiration.c
74test_gnsrecord_block_expiration_LDADD = \ 74test_gnsrecord_block_expiration_LDADD = \
75 $(top_builddir)/src/testing/libgnunettesting.la \ 75 $(top_builddir)/src/testing/libgnunettesting.la \
76 $(top_builddir)/src/gnsrecord/libgnunetgnsrecord.la \ 76 libgnunetgnsrecord.la \
77 $(top_builddir)/src/util/libgnunetutil.la 77 $(top_builddir)/src/util/libgnunetutil.la
78 78
79 79
@@ -81,6 +81,6 @@ test_gnsrecord_crypto_SOURCES = \
81 test_gnsrecord_crypto.c 81 test_gnsrecord_crypto.c
82test_gnsrecord_crypto_LDADD = \ 82test_gnsrecord_crypto_LDADD = \
83 $(top_builddir)/src/testing/libgnunettesting.la \ 83 $(top_builddir)/src/testing/libgnunettesting.la \
84 $(top_builddir)/src/gnsrecord/libgnunetgnsrecord.la \ 84 libgnunetgnsrecord.la \
85 $(top_builddir)/src/util/libgnunetutil.la 85 $(top_builddir)/src/util/libgnunetutil.la
86 86
diff --git a/src/hello/Makefile.am b/src/hello/Makefile.am
index 7e5b9c451..6ce036e14 100644
--- a/src/hello/Makefile.am
+++ b/src/hello/Makefile.am
@@ -35,21 +35,18 @@ endif
35test_hello_SOURCES = \ 35test_hello_SOURCES = \
36 test_hello.c 36 test_hello.c
37test_hello_LDADD = \ 37test_hello_LDADD = \
38 $(top_builddir)/src/hello/libgnunethello.la \ 38 libgnunethello.la \
39 $(top_builddir)/src/util/libgnunetutil.la 39 $(top_builddir)/src/util/libgnunetutil.la
40 40
41test_friend_hello_SOURCES = \ 41test_friend_hello_SOURCES = \
42 test_friend_hello.c 42 test_friend_hello.c
43test_friend_hello_LDADD = \ 43test_friend_hello_LDADD = \
44 $(top_builddir)/src/hello/libgnunethello.la \ 44 libgnunethello.la \
45 $(top_builddir)/src/util/libgnunetutil.la 45 $(top_builddir)/src/util/libgnunetutil.la
46 46
47gnunet_hello_SOURCES = \ 47gnunet_hello_SOURCES = \
48 gnunet-hello.c 48 gnunet-hello.c
49gnunet_hello_LDADD = \ 49gnunet_hello_LDADD = \
50 $(top_builddir)/src/hello/libgnunethello.la \
51 $(top_builddir)/src/util/libgnunetutil.la
52gnunet_hello_DEPENDENCIES = \
53 libgnunethello.la \ 50 libgnunethello.la \
54 $(top_builddir)/src/util/libgnunetutil.la 51 $(top_builddir)/src/util/libgnunetutil.la
55 52
diff --git a/src/identity/Makefile.am b/src/identity/Makefile.am
index b55817899..4bc234b15 100644
--- a/src/identity/Makefile.am
+++ b/src/identity/Makefile.am
@@ -29,8 +29,6 @@ libgnunetidentity_la_LIBADD = \
29libgnunetidentity_la_LDFLAGS = \ 29libgnunetidentity_la_LDFLAGS = \
30 $(GN_LIB_LDFLAGS) $(WINFLAGS) \ 30 $(GN_LIB_LDFLAGS) $(WINFLAGS) \
31 -version-info 0:0:0 31 -version-info 0:0:0
32libgnunetidentity_la_DEPENDENCIES = \
33 $(top_builddir)/src/util/libgnunetutil.la
34 32
35bin_PROGRAMS = \ 33bin_PROGRAMS = \
36 gnunet-identity 34 gnunet-identity
@@ -44,9 +42,6 @@ gnunet_service_identity_LDADD = \
44 $(top_builddir)/src/statistics/libgnunetstatistics.la \ 42 $(top_builddir)/src/statistics/libgnunetstatistics.la \
45 $(top_builddir)/src/util/libgnunetutil.la \ 43 $(top_builddir)/src/util/libgnunetutil.la \
46 $(GN_LIBINTL) 44 $(GN_LIBINTL)
47gnunet_service_identity_DEPENDENCIES = \
48 $(top_builddir)/src/statistics/libgnunetstatistics.la \
49 $(top_builddir)/src/util/libgnunetutil.la
50 45
51gnunet_identity_SOURCES = \ 46gnunet_identity_SOURCES = \
52 gnunet-identity.c 47 gnunet-identity.c
@@ -55,10 +50,6 @@ gnunet_identity_LDADD = \
55 $(top_builddir)/src/statistics/libgnunetstatistics.la \ 50 $(top_builddir)/src/statistics/libgnunetstatistics.la \
56 $(top_builddir)/src/util/libgnunetutil.la \ 51 $(top_builddir)/src/util/libgnunetutil.la \
57 $(GN_LIBINTL) 52 $(GN_LIBINTL)
58gnunet_identity_DEPENDENCIES = \
59 $(top_builddir)/src/statistics/libgnunetstatistics.la \
60 libgnunetidentity.la \
61 $(top_builddir)/src/util/libgnunetutil.la
62 53
63 54
64if HAVE_TESTING 55if HAVE_TESTING
@@ -78,10 +69,6 @@ test_identity_LDADD = \
78 libgnunetidentity.la \ 69 libgnunetidentity.la \
79 $(top_builddir)/src/testing/libgnunettesting.la \ 70 $(top_builddir)/src/testing/libgnunettesting.la \
80 $(top_builddir)/src/util/libgnunetutil.la 71 $(top_builddir)/src/util/libgnunetutil.la
81test_identity_DEPENDENCIES = \
82 libgnunetidentity.la \
83 $(top_builddir)/src/testing/libgnunettesting.la \
84 $(top_builddir)/src/util/libgnunetutil.la
85 72
86test_identity_defaults_SOURCES = \ 73test_identity_defaults_SOURCES = \
87 test_identity_defaults.c 74 test_identity_defaults.c
@@ -89,10 +76,6 @@ test_identity_defaults_LDADD = \
89 libgnunetidentity.la \ 76 libgnunetidentity.la \
90 $(top_builddir)/src/testing/libgnunettesting.la \ 77 $(top_builddir)/src/testing/libgnunettesting.la \
91 $(top_builddir)/src/util/libgnunetutil.la 78 $(top_builddir)/src/util/libgnunetutil.la
92test_identity_defaults_DEPENDENCIES = \
93 libgnunetidentity.la \
94 $(top_builddir)/src/testing/libgnunettesting.la \
95 $(top_builddir)/src/util/libgnunetutil.la
96 79
97EXTRA_DIST = \ 80EXTRA_DIST = \
98 test_identity.conf 81 test_identity.conf
diff --git a/src/multicast/Makefile.am b/src/multicast/Makefile.am
index b6ae92f0f..9376a5d1a 100644
--- a/src/multicast/Makefile.am
+++ b/src/multicast/Makefile.am
@@ -39,8 +39,6 @@ gnunet_multicast_SOURCES = \
39gnunet_multicast_LDADD = \ 39gnunet_multicast_LDADD = \
40 $(top_builddir)/src/util/libgnunetutil.la \ 40 $(top_builddir)/src/util/libgnunetutil.la \
41 $(GN_LIBINTL) 41 $(GN_LIBINTL)
42gnunet_multicast_DEPENDENCIES = \
43 $(top_builddir)/src/util/libgnunetutil.la
44 42
45gnunet_service_multicast_SOURCES = \ 43gnunet_service_multicast_SOURCES = \
46 gnunet-service-multicast.c 44 gnunet-service-multicast.c
@@ -50,11 +48,6 @@ gnunet_service_multicast_LDADD = \
50 $(top_builddir)/src/cadet/libgnunetcadet.la \ 48 $(top_builddir)/src/cadet/libgnunetcadet.la \
51 $(top_builddir)/src/statistics/libgnunetstatistics.la \ 49 $(top_builddir)/src/statistics/libgnunetstatistics.la \
52 $(GN_LIBINTL) 50 $(GN_LIBINTL)
53gnunet_service_multicast_DEPENDENCIES = \
54 $(top_builddir)/src/util/libgnunetutil.la \
55 $(top_builddir)/src/core/libgnunetcore.la \
56 $(top_builddir)/src/cadet/libgnunetcadet.la \
57 $(top_builddir)/src/statistics/libgnunetstatistics.la
58 51
59 52
60check_PROGRAMS = \ 53check_PROGRAMS = \
@@ -71,7 +64,4 @@ test_multicast_LDADD = \
71 libgnunetmulticast.la \ 64 libgnunetmulticast.la \
72 $(top_builddir)/src/testing/libgnunettesting.la \ 65 $(top_builddir)/src/testing/libgnunettesting.la \
73 $(top_builddir)/src/util/libgnunetutil.la 66 $(top_builddir)/src/util/libgnunetutil.la
74test_multicast_DEPENDENCIES = \ 67
75 libgnunetmulticast.la \
76 $(top_builddir)/src/testing/libgnunettesting.la \
77 $(top_builddir)/src/util/libgnunetutil.la
diff --git a/src/namecache/Makefile.am b/src/namecache/Makefile.am
index 16015e39f..81367c3c6 100644
--- a/src/namecache/Makefile.am
+++ b/src/namecache/Makefile.am
@@ -79,12 +79,8 @@ gnunet_namecache_SOURCES = \
79gnunet_namecache_LDADD = \ 79gnunet_namecache_LDADD = \
80 $(top_builddir)/src/gnsrecord/libgnunetgnsrecord.la \ 80 $(top_builddir)/src/gnsrecord/libgnunetgnsrecord.la \
81 $(top_builddir)/src/util/libgnunetutil.la \ 81 $(top_builddir)/src/util/libgnunetutil.la \
82 $(top_builddir)/src/namecache/libgnunetnamecache.la \ 82 libgnunetnamecache.la \
83 $(GN_LIBINTL) 83 $(GN_LIBINTL)
84gnunet_namecache_DEPENDENCIES = \
85 $(top_builddir)/src/identity/libgnunetidentity.la \
86 $(top_builddir)/src/util/libgnunetutil.la \
87 $(top_builddir)/src/namecache/libgnunetnamecache.la
88 84
89gnunet_service_namecache_SOURCES = \ 85gnunet_service_namecache_SOURCES = \
90 gnunet-service-namecache.c 86 gnunet-service-namecache.c
@@ -93,12 +89,8 @@ gnunet_service_namecache_LDADD = \
93 $(top_builddir)/src/gnsrecord/libgnunetgnsrecord.la \ 89 $(top_builddir)/src/gnsrecord/libgnunetgnsrecord.la \
94 $(top_builddir)/src/statistics/libgnunetstatistics.la \ 90 $(top_builddir)/src/statistics/libgnunetstatistics.la \
95 $(top_builddir)/src/util/libgnunetutil.la \ 91 $(top_builddir)/src/util/libgnunetutil.la \
96 $(top_builddir)/src/namecache/libgnunetnamecache.la \ 92 libgnunetnamecache.la \
97 $(GN_LIBINTL) 93 $(GN_LIBINTL)
98gnunet_service_namecache_DEPENDENCIES = \
99 $(top_builddir)/src/statistics/libgnunetstatistics.la \
100 $(top_builddir)/src/util/libgnunetutil.la \
101 $(top_builddir)/src/namecache/libgnunetnamecache.la
102 94
103 95
104plugin_LTLIBRARIES = \ 96plugin_LTLIBRARIES = \
@@ -108,39 +100,30 @@ plugin_LTLIBRARIES = \
108libgnunet_plugin_namecache_sqlite_la_SOURCES = \ 100libgnunet_plugin_namecache_sqlite_la_SOURCES = \
109 plugin_namecache_sqlite.c 101 plugin_namecache_sqlite.c
110libgnunet_plugin_namecache_sqlite_la_LIBADD = \ 102libgnunet_plugin_namecache_sqlite_la_LIBADD = \
111 $(top_builddir)/src/namecache/libgnunetnamecache.la \ 103 libgnunetnamecache.la \
112 $(top_builddir)/src/statistics/libgnunetstatistics.la \ 104 $(top_builddir)/src/statistics/libgnunetstatistics.la \
113 $(top_builddir)/src/util/libgnunetutil.la $(XLIBS) -lsqlite3 \ 105 $(top_builddir)/src/util/libgnunetutil.la $(XLIBS) -lsqlite3 \
114 $(LTLIBINTL) 106 $(LTLIBINTL)
115libgnunet_plugin_namecache_sqlite_la_LDFLAGS = \ 107libgnunet_plugin_namecache_sqlite_la_LDFLAGS = \
116 $(GN_PLUGIN_LDFLAGS) 108 $(GN_PLUGIN_LDFLAGS)
117libgnunet_plugin_namecache_sqlite_la_DEPENDENCIES = \
118 $(top_builddir)/src/statistics/libgnunetstatistics.la \
119 $(top_builddir)/src/util/libgnunetutil.la \
120 $(top_builddir)/src/namecache/libgnunetnamecache.la
121 109
122 110
123libgnunet_plugin_namecache_postgres_la_SOURCES = \ 111libgnunet_plugin_namecache_postgres_la_SOURCES = \
124 plugin_namecache_postgres.c 112 plugin_namecache_postgres.c
125libgnunet_plugin_namecache_postgres_la_LIBADD = \ 113libgnunet_plugin_namecache_postgres_la_LIBADD = \
126 $(top_builddir)/src/namecache/libgnunetnamecache.la \ 114 libgnunetnamecache.la \
127 $(top_builddir)/src/postgres/libgnunetpostgres.la \ 115 $(top_builddir)/src/postgres/libgnunetpostgres.la \
128 $(top_builddir)/src/statistics/libgnunetstatistics.la \ 116 $(top_builddir)/src/statistics/libgnunetstatistics.la \
129 $(top_builddir)/src/util/libgnunetutil.la $(XLIBS) -lpq \ 117 $(top_builddir)/src/util/libgnunetutil.la $(XLIBS) -lpq \
130 $(LTLIBINTL) 118 $(LTLIBINTL)
131libgnunet_plugin_namecache_postgres_la_LDFLAGS = \ 119libgnunet_plugin_namecache_postgres_la_LDFLAGS = \
132 $(GN_PLUGIN_LDFLAGS) $(POSTGRESQL_LDFLAGS) 120 $(GN_PLUGIN_LDFLAGS) $(POSTGRESQL_LDFLAGS)
133libgnunet_plugin_namecache_postgres_la_DEPENDENCIES = \
134 $(top_builddir)/src/postgres/libgnunetpostgres.la \
135 $(top_builddir)/src/statistics/libgnunetstatistics.la \
136 $(top_builddir)/src/util/libgnunetutil.la \
137 $(top_builddir)/src/namecache/libgnunetnamecache.la
138 121
139test_namecache_api_cache_block_SOURCES = \ 122test_namecache_api_cache_block_SOURCES = \
140 test_namecache_api_cache_block.c 123 test_namecache_api_cache_block.c
141test_namecache_api_cache_block_LDADD = \ 124test_namecache_api_cache_block_LDADD = \
142 $(top_builddir)/src/gnsrecord/libgnunetgnsrecord.la \ 125 $(top_builddir)/src/gnsrecord/libgnunetgnsrecord.la \
143 $(top_builddir)/src/namecache/libgnunetnamecache.la \ 126 libgnunetnamecache.la \
144 $(top_builddir)/src/testing/libgnunettesting.la \ 127 $(top_builddir)/src/testing/libgnunettesting.la \
145 $(top_builddir)/src/util/libgnunetutil.la 128 $(top_builddir)/src/util/libgnunetutil.la
146 129
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)
108gnunet_namestore_DEPENDENCIES = \
109 $(top_builddir)/src/identity/libgnunetidentity.la \
110 $(top_builddir)/src/util/libgnunetutil.la \
111 libgnunetnamestore.la
112 108
113 109
114gnunet_namestore_fcfsd_SOURCES = \ 110gnunet_namestore_fcfsd_SOURCES = \
@@ -116,12 +112,9 @@ gnunet_namestore_fcfsd_SOURCES = \
116gnunet_namestore_fcfsd_LDADD = -lmicrohttpd \ 112gnunet_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)
122gnunet_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)
138gnunet_service_namestore_DEPENDENCIES = \
139 $(top_builddir)/src/statistics/libgnunetstatistics.la \
140 $(top_builddir)/src/util/libgnunetutil.la \
141 libgnunetnamestore.la
142 131
143 132
144plugin_LTLIBRARIES = \ 133plugin_LTLIBRARIES = \
@@ -154,11 +143,6 @@ libgnunet_plugin_namestore_sqlite_la_LIBADD = \
154 $(LTLIBINTL) 143 $(LTLIBINTL)
155libgnunet_plugin_namestore_sqlite_la_LDFLAGS = \ 144libgnunet_plugin_namestore_sqlite_la_LDFLAGS = \
156 $(GN_PLUGIN_LDFLAGS) 145 $(GN_PLUGIN_LDFLAGS)
157libgnunet_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
163libgnunet_plugin_namestore_postgres_la_SOURCES = \ 147libgnunet_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)
171libgnunet_plugin_namestore_postgres_la_LDFLAGS = \ 155libgnunet_plugin_namestore_postgres_la_LDFLAGS = \
172 $(GN_PLUGIN_LDFLAGS) $(POSTGRESQL_LDFLAGS) 156 $(GN_PLUGIN_LDFLAGS) $(POSTGRESQL_LDFLAGS)
173libgnunet_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
179test_namestore_api_store_SOURCES = \ 158test_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
187test_namestore_api_store_update_SOURCES = \ 166test_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
196test_namestore_api_lookup_public_SOURCES = \ 175test_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
205test_namestore_api_lookup_nick_SOURCES = \ 184test_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
214test_namestore_api_lookup_private_SOURCES = \ 193test_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
223test_namestore_api_lookup_shadow_SOURCES = \ 202test_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
232test_namestore_api_lookup_shadow_filter_SOURCES = \ 211test_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
241test_namestore_api_remove_SOURCES = \ 220test_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
249test_namestore_api_remove_not_existing_record_SOURCES = \ 228test_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
264test_namestore_api_monitoring_SOURCES = \ 243test_namestore_api_monitoring_SOURCES = \
265 test_namestore_api_monitoring.c 244 test_namestore_api_monitoring.c
266test_namestore_api_monitoring_LDADD = \ 245test_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
274test_namestore_api_monitoring_existing_LDADD = \ 253test_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
288test_namestore_api_zone_iteration_nick_SOURCES = \ 267test_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
297test_namestore_api_zone_iteration_specific_zone_SOURCES = \ 276test_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
305test_namestore_api_zone_iteration_stop_SOURCES = \ 284test_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
313test_plugin_namestore_sqlite_SOURCES = \ 292test_plugin_namestore_sqlite_SOURCES = \
314 test_plugin_namestore.c 293 test_plugin_namestore.c
diff --git a/src/nat/Makefile.am b/src/nat/Makefile.am
index 7d772ab31..b762c74f4 100644
--- a/src/nat/Makefile.am
+++ b/src/nat/Makefile.am
@@ -41,10 +41,8 @@ libexec_PROGRAMS = \
41gnunet_nat_server_SOURCES = \ 41gnunet_nat_server_SOURCES = \
42 gnunet-nat-server.c nat.h 42 gnunet-nat-server.c nat.h
43gnunet_nat_server_LDADD = \ 43gnunet_nat_server_LDADD = \
44 $(top_builddir)/src/nat/libgnunetnat.la \ 44 libgnunetnat.la \
45 $(top_builddir)/src/util/libgnunetutil.la 45 $(top_builddir)/src/util/libgnunetutil.la
46gnunet_nat_server_DEPENDENCIES = \
47 libgnunetnat.la
48 46
49gnunet_helper_nat_server_SOURCES = \ 47gnunet_helper_nat_server_SOURCES = \
50 $(NATSERVER) 48 $(NATSERVER)
@@ -87,20 +85,20 @@ endif
87test_nat_SOURCES = \ 85test_nat_SOURCES = \
88 test_nat.c 86 test_nat.c
89test_nat_LDADD = \ 87test_nat_LDADD = \
90 $(top_builddir)/src/nat/libgnunetnat.la \ 88 libgnunetnat.la \
91 $(top_builddir)/src/util/libgnunetutil.la 89 $(top_builddir)/src/util/libgnunetutil.la
92 90
93test_nat_mini_SOURCES = \ 91test_nat_mini_SOURCES = \
94 test_nat_mini.c 92 test_nat_mini.c
95test_nat_mini_LDADD = \ 93test_nat_mini_LDADD = \
96 $(top_builddir)/src/nat/libgnunetnat.la \ 94 libgnunetnat.la \
97 $(top_builddir)/src/util/libgnunetutil.la 95 $(top_builddir)/src/util/libgnunetutil.la
98 96
99 97
100test_nat_test_SOURCES = \ 98test_nat_test_SOURCES = \
101 test_nat_test.c 99 test_nat_test.c
102test_nat_test_LDADD = \ 100test_nat_test_LDADD = \
103 $(top_builddir)/src/nat/libgnunetnat.la \ 101 libgnunetnat.la \
104 $(top_builddir)/src/util/libgnunetutil.la 102 $(top_builddir)/src/util/libgnunetutil.la
105 103
106 104
diff --git a/src/nse/Makefile.am b/src/nse/Makefile.am
index 460498d79..18bbbfd5a 100644
--- a/src/nse/Makefile.am
+++ b/src/nse/Makefile.am
@@ -19,13 +19,10 @@ pkgcfg_DATA = \
19bin_PROGRAMS = gnunet-nse 19bin_PROGRAMS = gnunet-nse
20 20
21gnunet_nse_SOURCES = gnunet-nse.c 21gnunet_nse_SOURCES = gnunet-nse.c
22gnunet_nse_LDFLAGS = \ 22gnunet_nse_LDADD = \
23 libgnunetnse.la \ 23 libgnunetnse.la \
24 $(top_builddir)/src/util/libgnunetutil.la \ 24 $(top_builddir)/src/util/libgnunetutil.la \
25 $(XLIB) $(GN_LIBINTL) 25 $(XLIB) $(GN_LIBINTL)
26gnunet_nse_DEPENDENCIES = \
27 libgnunetnse.la \
28 $(top_builddir)/src/util/libgnunetutil.la
29 26
30lib_LTLIBRARIES = libgnunetnse.la 27lib_LTLIBRARIES = libgnunetnse.la
31 28
@@ -50,31 +47,25 @@ endif
50gnunet_nse_profiler_SOURCES = \ 47gnunet_nse_profiler_SOURCES = \
51 gnunet-nse-profiler.c 48 gnunet-nse-profiler.c
52gnunet_nse_profiler_LDADD = -lm \ 49gnunet_nse_profiler_LDADD = -lm \
53 $(top_builddir)/src/nse/libgnunetnse.la \ 50 libgnunetnse.la \
54 $(top_builddir)/src/util/libgnunetutil.la \ 51 $(top_builddir)/src/util/libgnunetutil.la \
55 $(top_builddir)/src/statistics/libgnunetstatistics.la \ 52 $(top_builddir)/src/statistics/libgnunetstatistics.la \
56 $(top_builddir)/src/testbed/libgnunettestbed.la \ 53 $(top_builddir)/src/testbed/libgnunettestbed.la \
57 $(GN_LIBINTL) 54 $(GN_LIBINTL)
58gnunet_nse_profiler_DEPENDENCIES = \
59 libgnunetnse.la
60 55
61gnunet_service_nse_SOURCES = \ 56gnunet_service_nse_SOURCES = \
62 gnunet-service-nse.c 57 gnunet-service-nse.c
63gnunet_service_nse_LDADD = \ 58gnunet_service_nse_LDADD = \
64 $(top_builddir)/src/nse/libgnunetnse.la \ 59 libgnunetnse.la \
65 $(top_builddir)/src/util/libgnunetutil.la \ 60 $(top_builddir)/src/util/libgnunetutil.la \
66 $(top_builddir)/src/core/libgnunetcore.la \ 61 $(top_builddir)/src/core/libgnunetcore.la \
67 $(top_builddir)/src/statistics/libgnunetstatistics.la \ 62 $(top_builddir)/src/statistics/libgnunetstatistics.la \
68 $(LIBGCRYPT_LIBS) \ 63 $(LIBGCRYPT_LIBS) \
69 -lm -lgcrypt \ 64 -lm -lgcrypt \
70 $(GN_LIBINTL) 65 $(GN_LIBINTL)
71gnunet_service_nse_DEPENDENCIES = \
72 libgnunetnse.la
73if ENABLE_NSE_HISTOGRAM 66if ENABLE_NSE_HISTOGRAM
74 gnunet_service_nse_LDADD += \ 67 gnunet_service_nse_LDADD += \
75 $(top_builddir)/src/testbed/libgnunettestbedlogger.la 68 $(top_builddir)/src/testbed/libgnunettestbedlogger.la
76 gnunet_service_nse_DEPENDENCIES += \
77 $(top_builddir)/src/testbed/libgnunettestbedlogger.la
78endif 69endif
79 70
80 71
@@ -97,14 +88,14 @@ endif
97test_nse_api_SOURCES = \ 88test_nse_api_SOURCES = \
98 test_nse_api.c 89 test_nse_api.c
99test_nse_api_LDADD = \ 90test_nse_api_LDADD = \
100 $(top_builddir)/src/nse/libgnunetnse.la \ 91 libgnunetnse.la \
101 $(top_builddir)/src/testing/libgnunettesting.la \ 92 $(top_builddir)/src/testing/libgnunettesting.la \
102 $(top_builddir)/src/util/libgnunetutil.la 93 $(top_builddir)/src/util/libgnunetutil.la
103 94
104test_nse_multipeer_SOURCES = \ 95test_nse_multipeer_SOURCES = \
105 test_nse_multipeer.c 96 test_nse_multipeer.c
106test_nse_multipeer_LDADD = \ 97test_nse_multipeer_LDADD = \
107 $(top_builddir)/src/nse/libgnunetnse.la \ 98 libgnunetnse.la \
108 $(top_builddir)/src/util/libgnunetutil.la \ 99 $(top_builddir)/src/util/libgnunetutil.la \
109 $(top_builddir)/src/testbed/libgnunettestbed.la \ 100 $(top_builddir)/src/testbed/libgnunettestbed.la \
110 -lm 101 -lm
diff --git a/src/peerinfo/Makefile.am b/src/peerinfo/Makefile.am
index f4e820253..2c2483d1b 100644
--- a/src/peerinfo/Makefile.am
+++ b/src/peerinfo/Makefile.am
@@ -65,7 +65,7 @@ test_peerinfo_shipped_hellos_SOURCES = \
65 test_peerinfo_shipped_hellos.c 65 test_peerinfo_shipped_hellos.c
66test_peerinfo_shipped_hellos_LDADD = \ 66test_peerinfo_shipped_hellos_LDADD = \
67 $(top_builddir)/src/hello/libgnunethello.la \ 67 $(top_builddir)/src/hello/libgnunethello.la \
68 $(top_builddir)/src/peerinfo/libgnunetpeerinfo.la \ 68 libgnunetpeerinfo.la \
69 $(top_builddir)/src/testing/libgnunettesting.la \ 69 $(top_builddir)/src/testing/libgnunettesting.la \
70 $(top_builddir)/src/util/libgnunetutil.la 70 $(top_builddir)/src/util/libgnunetutil.la
71 71
@@ -73,7 +73,7 @@ test_peerinfo_api_SOURCES = \
73 test_peerinfo_api.c 73 test_peerinfo_api.c
74test_peerinfo_api_LDADD = \ 74test_peerinfo_api_LDADD = \
75 $(top_builddir)/src/hello/libgnunethello.la \ 75 $(top_builddir)/src/hello/libgnunethello.la \
76 $(top_builddir)/src/peerinfo/libgnunetpeerinfo.la \ 76 libgnunetpeerinfo.la \
77 $(top_builddir)/src/testing/libgnunettesting.la \ 77 $(top_builddir)/src/testing/libgnunettesting.la \
78 $(top_builddir)/src/util/libgnunetutil.la 78 $(top_builddir)/src/util/libgnunetutil.la
79 79
@@ -81,7 +81,7 @@ test_peerinfo_api_friend_only_SOURCES = \
81 test_peerinfo_api_friend_only.c 81 test_peerinfo_api_friend_only.c
82test_peerinfo_api_friend_only_LDADD = \ 82test_peerinfo_api_friend_only_LDADD = \
83 $(top_builddir)/src/hello/libgnunethello.la \ 83 $(top_builddir)/src/hello/libgnunethello.la \
84 $(top_builddir)/src/peerinfo/libgnunetpeerinfo.la \ 84 libgnunetpeerinfo.la \
85 $(top_builddir)/src/testing/libgnunettesting.la \ 85 $(top_builddir)/src/testing/libgnunettesting.la \
86 $(top_builddir)/src/util/libgnunetutil.la 86 $(top_builddir)/src/util/libgnunetutil.la
87 87
@@ -89,7 +89,7 @@ test_peerinfo_api_notify_friend_only_SOURCES = \
89 test_peerinfo_api_notify_friend_only.c 89 test_peerinfo_api_notify_friend_only.c
90test_peerinfo_api_notify_friend_only_LDADD = \ 90test_peerinfo_api_notify_friend_only_LDADD = \
91 $(top_builddir)/src/hello/libgnunethello.la \ 91 $(top_builddir)/src/hello/libgnunethello.la \
92 $(top_builddir)/src/peerinfo/libgnunetpeerinfo.la \ 92 libgnunetpeerinfo.la \
93 $(top_builddir)/src/testing/libgnunettesting.la \ 93 $(top_builddir)/src/testing/libgnunettesting.la \
94 $(top_builddir)/src/util/libgnunetutil.la 94 $(top_builddir)/src/util/libgnunetutil.la
95 95
@@ -97,7 +97,7 @@ perf_peerinfo_api_SOURCES = \
97 perf_peerinfo_api.c 97 perf_peerinfo_api.c
98perf_peerinfo_api_LDADD = \ 98perf_peerinfo_api_LDADD = \
99 $(top_builddir)/src/hello/libgnunethello.la \ 99 $(top_builddir)/src/hello/libgnunethello.la \
100 $(top_builddir)/src/peerinfo/libgnunetpeerinfo.la \ 100 libgnunetpeerinfo.la \
101 $(top_builddir)/src/testing/libgnunettesting.la \ 101 $(top_builddir)/src/testing/libgnunettesting.la \
102 $(top_builddir)/src/util/libgnunetutil.la 102 $(top_builddir)/src/util/libgnunetutil.la
103 103
diff --git a/src/peerstore/Makefile.am b/src/peerstore/Makefile.am
index 46f126063..2c96d7268 100644
--- a/src/peerstore/Makefile.am
+++ b/src/peerstore/Makefile.am
@@ -51,18 +51,15 @@ libgnunetpeerstore_la_LDFLAGS = \
51 51
52plugin_LTLIBRARIES = \ 52plugin_LTLIBRARIES = \
53 libgnunet_plugin_peerstore_sqlite.la 53 libgnunet_plugin_peerstore_sqlite.la
54 54
55libgnunet_plugin_peerstore_sqlite_la_SOURCES = \ 55libgnunet_plugin_peerstore_sqlite_la_SOURCES = \
56 plugin_peerstore_sqlite.c 56 plugin_peerstore_sqlite.c
57libgnunet_plugin_peerstore_sqlite_la_LIBADD = \ 57libgnunet_plugin_peerstore_sqlite_la_LIBADD = \
58 $(top_builddir)/src/peerstore/libgnunetpeerstore.la \ 58 libgnunetpeerstore.la \
59 $(top_builddir)/src/util/libgnunetutil.la $(XLIBS) -lsqlite3 \ 59 $(top_builddir)/src/util/libgnunetutil.la $(XLIBS) -lsqlite3 \
60 $(LTLIBINTL) 60 $(LTLIBINTL)
61libgnunet_plugin_peerstore_sqlite_la_LDFLAGS = \ 61libgnunet_plugin_peerstore_sqlite_la_LDFLAGS = \
62 $(GN_PLUGIN_LDFLAGS) 62 $(GN_PLUGIN_LDFLAGS)
63libgnunet_plugin_peerstore_sqlite_la_DEPENDENCIES = \
64 $(top_builddir)/src/util/libgnunetutil.la \
65 libgnunetpeerstore.la
66 63
67check_PROGRAMS = \ 64check_PROGRAMS = \
68 test_peerstore_api_store \ 65 test_peerstore_api_store \
@@ -70,7 +67,7 @@ check_PROGRAMS = \
70 test_peerstore_api_watch \ 67 test_peerstore_api_watch \
71 test_peerstore_api_sync \ 68 test_peerstore_api_sync \
72 perf_peerstore_store 69 perf_peerstore_store
73 70
74if ENABLE_TEST_RUN 71if ENABLE_TEST_RUN
75AM_TESTS_ENVIRONMENT=export GNUNET_PREFIX=$${GNUNET_PREFIX:-@libdir@};export PATH=$${GNUNET_PREFIX:-@prefix@}/bin:$$PATH; 72AM_TESTS_ENVIRONMENT=export GNUNET_PREFIX=$${GNUNET_PREFIX:-@libdir@};export PATH=$${GNUNET_PREFIX:-@prefix@}/bin:$$PATH;
76TESTS = $(check_PROGRAMS) 73TESTS = $(check_PROGRAMS)
@@ -79,34 +76,34 @@ endif
79test_peerstore_api_store_SOURCES = \ 76test_peerstore_api_store_SOURCES = \
80 test_peerstore_api_store.c 77 test_peerstore_api_store.c
81test_peerstore_api_store_LDADD = \ 78test_peerstore_api_store_LDADD = \
82 $(top_builddir)/src/peerstore/libgnunetpeerstore.la \ 79 libgnunetpeerstore.la \
83 $(top_builddir)/src/testing/libgnunettesting.la \ 80 $(top_builddir)/src/testing/libgnunettesting.la \
84 $(top_builddir)/src/util/libgnunetutil.la 81 $(top_builddir)/src/util/libgnunetutil.la
85 82
86test_peerstore_api_iterate_SOURCES = \ 83test_peerstore_api_iterate_SOURCES = \
87 test_peerstore_api_iterate.c 84 test_peerstore_api_iterate.c
88test_peerstore_api_iterate_LDADD = \ 85test_peerstore_api_iterate_LDADD = \
89 $(top_builddir)/src/peerstore/libgnunetpeerstore.la \ 86 libgnunetpeerstore.la \
90 $(top_builddir)/src/testing/libgnunettesting.la \ 87 $(top_builddir)/src/testing/libgnunettesting.la \
91 $(top_builddir)/src/util/libgnunetutil.la 88 $(top_builddir)/src/util/libgnunetutil.la
92 89
93test_peerstore_api_watch_SOURCES = \ 90test_peerstore_api_watch_SOURCES = \
94 test_peerstore_api_watch.c 91 test_peerstore_api_watch.c
95test_peerstore_api_watch_LDADD = \ 92test_peerstore_api_watch_LDADD = \
96 $(top_builddir)/src/peerstore/libgnunetpeerstore.la \ 93 libgnunetpeerstore.la \
97 $(top_builddir)/src/testing/libgnunettesting.la \ 94 $(top_builddir)/src/testing/libgnunettesting.la \
98 $(top_builddir)/src/util/libgnunetutil.la 95 $(top_builddir)/src/util/libgnunetutil.la
99 96
100test_peerstore_api_sync_SOURCES = \ 97test_peerstore_api_sync_SOURCES = \
101 test_peerstore_api_sync.c 98 test_peerstore_api_sync.c
102test_peerstore_api_sync_LDADD = \ 99test_peerstore_api_sync_LDADD = \
103 $(top_builddir)/src/peerstore/libgnunetpeerstore.la \ 100 libgnunetpeerstore.la \
104 $(top_builddir)/src/testing/libgnunettesting.la \ 101 $(top_builddir)/src/testing/libgnunettesting.la \
105 $(top_builddir)/src/util/libgnunetutil.la 102 $(top_builddir)/src/util/libgnunetutil.la
106 103
107perf_peerstore_store_SOURCES = \ 104perf_peerstore_store_SOURCES = \
108 perf_peerstore_store.c 105 perf_peerstore_store.c
109perf_peerstore_store_LDADD = \ 106perf_peerstore_store_LDADD = \
110 $(top_builddir)/src/peerstore/libgnunetpeerstore.la \ 107 libgnunetpeerstore.la \
111 $(top_builddir)/src/testing/libgnunettesting.la \ 108 $(top_builddir)/src/testing/libgnunettesting.la \
112 $(top_builddir)/src/util/libgnunetutil.la 109 $(top_builddir)/src/util/libgnunetutil.la
diff --git a/src/psyc/Makefile.am b/src/psyc/Makefile.am
index 3f17d2d1e..453227e79 100644
--- a/src/psyc/Makefile.am
+++ b/src/psyc/Makefile.am
@@ -28,9 +28,6 @@ libgnunetpsycutil_la_LIBADD = \
28libgnunetpsycutil_la_LDFLAGS = \ 28libgnunetpsycutil_la_LDFLAGS = \
29 $(GN_LIB_LDFLAGS) $(WINFLAGS) \ 29 $(GN_LIB_LDFLAGS) $(WINFLAGS) \
30 -version-info 0:0:0 30 -version-info 0:0:0
31libgnunetpsycutil_la_DEPENDENCIES = \
32 $(top_builddir)/src/util/libgnunetutil.la \
33 $(top_builddir)/src/env/libgnunetenv.la
34 31
35libgnunetpsyc_la_SOURCES = \ 32libgnunetpsyc_la_SOURCES = \
36 psyc_api.c psyc.h 33 psyc_api.c psyc.h
@@ -42,10 +39,6 @@ libgnunetpsyc_la_LIBADD = \
42libgnunetpsyc_la_LDFLAGS = \ 39libgnunetpsyc_la_LDFLAGS = \
43 $(GN_LIB_LDFLAGS) $(WINFLAGS) \ 40 $(GN_LIB_LDFLAGS) $(WINFLAGS) \
44 -version-info 0:0:0 41 -version-info 0:0:0
45libgnunetpsyc_la_DEPENDENCIES = \
46 $(top_builddir)/src/util/libgnunetutil.la \
47 $(top_builddir)/src/env/libgnunetenv.la \
48 libgnunetpsycutil.la
49 42
50bin_PROGRAMS = 43bin_PROGRAMS =
51 44
@@ -61,12 +54,6 @@ gnunet_service_psyc_LDADD = \
61 $(top_builddir)/src/psycstore/libgnunetpsycstore.la \ 54 $(top_builddir)/src/psycstore/libgnunetpsycstore.la \
62 libgnunetpsycutil.la \ 55 libgnunetpsycutil.la \
63 $(GN_LIBINTL) 56 $(GN_LIBINTL)
64gnunet_service_psyc_DEPENDENCIES = \
65 $(top_builddir)/src/util/libgnunetutil.la \
66 $(top_builddir)/src/statistics/libgnunetstatistics.la \
67 $(top_builddir)/src/multicast/libgnunetmulticast.la \
68 $(top_builddir)/src/psycstore/libgnunetpsycstore.la \
69 libgnunetpsycutil.la
70gnunet_service_psyc_CFLAGS = $(AM_CFLAGS) 57gnunet_service_psyc_CFLAGS = $(AM_CFLAGS)
71 58
72 59
@@ -89,13 +76,6 @@ test_psyc_LDADD = \
89 $(top_builddir)/src/core/libgnunetcore.la \ 76 $(top_builddir)/src/core/libgnunetcore.la \
90 $(top_builddir)/src/env/libgnunetenv.la \ 77 $(top_builddir)/src/env/libgnunetenv.la \
91 $(top_builddir)/src/util/libgnunetutil.la 78 $(top_builddir)/src/util/libgnunetutil.la
92test_psyc_DEPENDENCIES = \
93 libgnunetpsyc.la \
94 libgnunetpsycutil.la \
95 $(top_builddir)/src/testing/libgnunettesting.la \
96 $(top_builddir)/src/core/libgnunetcore.la \
97 $(top_builddir)/src/env/libgnunetenv.la \
98 $(top_builddir)/src/util/libgnunetutil.la
99 79
100EXTRA_DIST = \ 80EXTRA_DIST = \
101 test_psyc.conf 81 test_psyc.conf
diff --git a/src/psycstore/Makefile.am b/src/psycstore/Makefile.am
index e27113b81..8dbd5f053 100644
--- a/src/psycstore/Makefile.am
+++ b/src/psycstore/Makefile.am
@@ -37,8 +37,6 @@ libgnunetpsycstore_la_LIBADD = \
37libgnunetpsycstore_la_LDFLAGS = \ 37libgnunetpsycstore_la_LDFLAGS = \
38 $(GN_LIB_LDFLAGS) $(WINFLAGS) \ 38 $(GN_LIB_LDFLAGS) $(WINFLAGS) \
39 -version-info 0:0:0 39 -version-info 0:0:0
40libgnunetpsycstore_la_DEPENDENCIES = \
41 $(top_builddir)/src/util/libgnunetutil.la
42 40
43bin_PROGRAMS = 41bin_PROGRAMS =
44 42
@@ -51,10 +49,6 @@ gnunet_service_psycstore_LDADD = \
51 $(top_builddir)/src/statistics/libgnunetstatistics.la \ 49 $(top_builddir)/src/statistics/libgnunetstatistics.la \
52 $(top_builddir)/src/util/libgnunetutil.la \ 50 $(top_builddir)/src/util/libgnunetutil.la \
53 $(GN_LIBINTL) 51 $(GN_LIBINTL)
54gnunet_service_psycstore_DEPENDENCIES = \
55 $(top_builddir)/src/statistics/libgnunetstatistics.la \
56 $(top_builddir)/src/util/libgnunetutil.la
57
58 52
59plugin_LTLIBRARIES = \ 53plugin_LTLIBRARIES = \
60 $(SQLITE_PLUGIN) 54 $(SQLITE_PLUGIN)
@@ -62,16 +56,12 @@ plugin_LTLIBRARIES = \
62libgnunet_plugin_psycstore_sqlite_la_SOURCES = \ 56libgnunet_plugin_psycstore_sqlite_la_SOURCES = \
63 plugin_psycstore_sqlite.c 57 plugin_psycstore_sqlite.c
64libgnunet_plugin_psycstore_sqlite_la_LIBADD = \ 58libgnunet_plugin_psycstore_sqlite_la_LIBADD = \
65 $(top_builddir)/src/psycstore/libgnunetpsycstore.la \ 59 libgnunetpsycstore.la \
66 $(top_builddir)/src/statistics/libgnunetstatistics.la \ 60 $(top_builddir)/src/statistics/libgnunetstatistics.la \
67 $(top_builddir)/src/util/libgnunetutil.la $(XLIBS) -lsqlite3 \ 61 $(top_builddir)/src/util/libgnunetutil.la $(XLIBS) -lsqlite3 \
68 $(LTLIBINTL) 62 $(LTLIBINTL)
69libgnunet_plugin_psycstore_sqlite_la_LDFLAGS = \ 63libgnunet_plugin_psycstore_sqlite_la_LDFLAGS = \
70 $(GN_PLUGIN_LDFLAGS) 64 $(GN_PLUGIN_LDFLAGS)
71libgnunet_plugin_psycstore_sqlite_la_DEPENDENCIES = \
72 $(top_builddir)/src/statistics/libgnunetstatistics.la \
73 $(top_builddir)/src/util/libgnunetutil.la \
74 libgnunetpsycstore.la
75 65
76 66
77if HAVE_TESTING 67if HAVE_TESTING
@@ -91,10 +81,6 @@ test_psycstore_LDADD = \
91 libgnunetpsycstore.la \ 81 libgnunetpsycstore.la \
92 $(top_builddir)/src/testing/libgnunettesting.la \ 82 $(top_builddir)/src/testing/libgnunettesting.la \
93 $(top_builddir)/src/util/libgnunetutil.la 83 $(top_builddir)/src/util/libgnunetutil.la
94test_psycstore_DEPENDENCIES = \
95 libgnunetpsycstore.la \
96 $(top_builddir)/src/testing/libgnunettesting.la \
97 $(top_builddir)/src/util/libgnunetutil.la
98 84
99EXTRA_DIST = \ 85EXTRA_DIST = \
100 test_psycstore.conf 86 test_psycstore.conf
@@ -103,5 +89,5 @@ EXTRA_DIST = \
103test_plugin_psycstore_sqlite_SOURCES = \ 89test_plugin_psycstore_sqlite_SOURCES = \
104 test_plugin_psycstore.c 90 test_plugin_psycstore.c
105test_plugin_psycstore_sqlite_LDADD = \ 91test_plugin_psycstore_sqlite_LDADD = \
106 $(top_builddir)/src/testing/libgnunettesting.la \ 92 $(top_builddir)/src/testing/libgnunettesting.la \
107 $(top_builddir)/src/util/libgnunetutil.la 93 $(top_builddir)/src/util/libgnunetutil.la
diff --git a/src/regex/Makefile.am b/src/regex/Makefile.am
index 428dccda2..82212ee40 100644
--- a/src/regex/Makefile.am
+++ b/src/regex/Makefile.am
@@ -25,14 +25,12 @@ libexec_PROGRAMS = \
25gnunet_service_regex_SOURCES = \ 25gnunet_service_regex_SOURCES = \
26 gnunet-service-regex.c 26 gnunet-service-regex.c
27gnunet_service_regex_LDADD = -lm \ 27gnunet_service_regex_LDADD = -lm \
28 $(top_builddir)/src/regex/libgnunetregex_internal.a \ 28 libgnunetregex_internal.a \
29 $(top_builddir)/src/regex/libgnunetregexblock.la \ 29 libgnunetregexblock.la \
30 $(top_builddir)/src/dht/libgnunetdht.la \ 30 $(top_builddir)/src/dht/libgnunetdht.la \
31 $(top_builddir)/src/statistics/libgnunetstatistics.la \ 31 $(top_builddir)/src/statistics/libgnunetstatistics.la \
32 $(top_builddir)/src/util/libgnunetutil.la \ 32 $(top_builddir)/src/util/libgnunetutil.la \
33 $(GN_LIBINTL) 33 $(GN_LIBINTL)
34gnunet_service_regex_DEPENDENCIES = \
35 libgnunetregex_internal.a
36 34
37noinst_LIBRARIES = \ 35noinst_LIBRARIES = \
38 libgnunetregex_internal.a \ 36 libgnunetregex_internal.a \
@@ -77,15 +75,11 @@ plugin_LTLIBRARIES = \
77libgnunet_plugin_block_regex_la_SOURCES = \ 75libgnunet_plugin_block_regex_la_SOURCES = \
78 plugin_block_regex.c 76 plugin_block_regex.c
79libgnunet_plugin_block_regex_la_LIBADD = \ 77libgnunet_plugin_block_regex_la_LIBADD = \
80 $(top_builddir)/src/regex/libgnunetregexblock.la \ 78 libgnunetregexblock.la \
81 $(top_builddir)/src/block/libgnunetblock.la \ 79 $(top_builddir)/src/block/libgnunetblock.la \
82 $(top_builddir)/src/util/libgnunetutil.la 80 $(top_builddir)/src/util/libgnunetutil.la
83libgnunet_plugin_block_regex_la_LDFLAGS = \ 81libgnunet_plugin_block_regex_la_LDFLAGS = \
84 $(GN_PLUGIN_LDFLAGS) 82 $(GN_PLUGIN_LDFLAGS)
85libgnunet_plugin_block_regex_la_DEPENDENCIES = \
86 $(top_builddir)/src/regex/libgnunetregexblock.la \
87 $(top_builddir)/src/block/libgnunetblock.la \
88 $(top_builddir)/src/util/libgnunetutil.la
89 83
90if HAVE_MYSQL 84if HAVE_MYSQL
91noinst_mysql_progs = \ 85noinst_mysql_progs = \
@@ -95,12 +89,7 @@ gnunet_regex_simulation_profiler_SOURCES = \
95 gnunet-regex-simulation-profiler.c 89 gnunet-regex-simulation-profiler.c
96gnunet_regex_simulation_profiler_LDADD = \ 90gnunet_regex_simulation_profiler_LDADD = \
97 $(top_builddir)/src/util/libgnunetutil.la \ 91 $(top_builddir)/src/util/libgnunetutil.la \
98 $(top_builddir)/src/regex/libgnunetregex_internal.a \ 92 libgnunetregex_internal.a \
99 $(top_builddir)/src/dht/libgnunetdht.la \
100 $(top_builddir)/src/mysql/libgnunetmysql.la
101gnunet_regex_simulation_profiler_DEPENDENCIES = \
102 $(top_builddir)/src/util/libgnunetutil.la \
103 $(top_builddir)/src/regex/libgnunetregex_internal.a \
104 $(top_builddir)/src/dht/libgnunetdht.la \ 93 $(top_builddir)/src/dht/libgnunetdht.la \
105 $(top_builddir)/src/mysql/libgnunetmysql.la 94 $(top_builddir)/src/mysql/libgnunetmysql.la
106endif 95endif
@@ -111,10 +100,7 @@ libgnunetregextest_a_SOURCES = \
111 regex_test_random.c 100 regex_test_random.c
112libgnunetregextest_a_LIBADD = \ 101libgnunetregextest_a_LIBADD = \
113 $(top_builddir)/src/util/libgnunetutil.la \ 102 $(top_builddir)/src/util/libgnunetutil.la \
114 $(top_builddir)/src/regex/libgnunetregex_internal.a 103 libgnunetregex_internal.a
115libgnunetregextest_a_DEPENDENCIES = \
116 $(top_builddir)/src/util/libgnunetutil.la \
117 libgnunetregex_internal.a
118 104
119if HAVE_TESTING 105if HAVE_TESTING
120noinst_PROGRAMS = $(noinst_mysql_progs) \ 106noinst_PROGRAMS = $(noinst_mysql_progs) \
@@ -125,16 +111,10 @@ endif
125perf_regex_SOURCES = \ 111perf_regex_SOURCES = \
126 perf-regex.c 112 perf-regex.c
127perf_regex_LDADD = -lm \ 113perf_regex_LDADD = -lm \
128 $(top_builddir)/src/regex/libgnunetregex_internal.a \ 114 libgnunetregex_internal.a \
129 $(top_builddir)/src/dht/libgnunetdht.la \
130 $(top_builddir)/src/regex/libgnunetregexblock.la \
131 $(top_builddir)/src/regex/libgnunetregextest.a \
132 $(top_builddir)/src/util/libgnunetutil.la
133perf_regex_DEPENDENCIES = \
134 $(top_builddir)/src/regex/libgnunetregex_internal.a \
135 $(top_builddir)/src/dht/libgnunetdht.la \ 115 $(top_builddir)/src/dht/libgnunetdht.la \
136 $(top_builddir)/src/regex/libgnunetregexblock.la \ 116 libgnunetregexblock.la \
137 $(top_builddir)/src/regex/libgnunetregextest.a \ 117 libgnunetregextest.a \
138 $(top_builddir)/src/util/libgnunetutil.la 118 $(top_builddir)/src/util/libgnunetutil.la
139 119
140gnunet_regex_profiler_SOURCES = \ 120gnunet_regex_profiler_SOURCES = \
@@ -142,36 +122,20 @@ gnunet_regex_profiler_SOURCES = \
142gnunet_regex_profiler_LDADD = -lm \ 122gnunet_regex_profiler_LDADD = -lm \
143 $(top_builddir)/src/arm/libgnunetarm.la \ 123 $(top_builddir)/src/arm/libgnunetarm.la \
144 $(top_builddir)/src/testbed/libgnunettestbed.la \ 124 $(top_builddir)/src/testbed/libgnunettestbed.la \
145 $(top_builddir)/src/regex/libgnunetregex_internal.a \ 125 libgnunetregex_internal.a \
146 $(top_builddir)/src/dht/libgnunetdht.la \
147 $(top_builddir)/src/regex/libgnunetregexblock.la \
148 $(top_builddir)/src/regex/libgnunetregextest.a \
149 $(top_builddir)/src/statistics/libgnunetstatistics.la \
150 $(top_builddir)/src/util/libgnunetutil.la
151gnunet_regex_profiler_DEPENDENCIES = \
152 $(top_builddir)/src/arm/libgnunetarm.la \
153 $(top_builddir)/src/testbed/libgnunettestbed.la \
154 $(top_builddir)/src/regex/libgnunetregex_internal.a \
155 $(top_builddir)/src/dht/libgnunetdht.la \ 126 $(top_builddir)/src/dht/libgnunetdht.la \
156 $(top_builddir)/src/regex/libgnunetregexblock.la \ 127 libgnunetregexblock.la \
157 $(top_builddir)/src/regex/libgnunetregextest.a \ 128 libgnunetregextest.a \
158 $(top_builddir)/src/statistics/libgnunetstatistics.la \ 129 $(top_builddir)/src/statistics/libgnunetstatistics.la \
159 $(top_builddir)/src/util/libgnunetutil.la 130 $(top_builddir)/src/util/libgnunetutil.la
160 131
161gnunet_daemon_regexprofiler_SOURCES = \ 132gnunet_daemon_regexprofiler_SOURCES = \
162 gnunet-daemon-regexprofiler.c 133 gnunet-daemon-regexprofiler.c
163gnunet_daemon_regexprofiler_LDADD = -lm \ 134gnunet_daemon_regexprofiler_LDADD = -lm \
164 $(top_builddir)/src/regex/libgnunetregex_internal.a \ 135 libgnunetregex_internal.a \
165 $(top_builddir)/src/dht/libgnunetdht.la \
166 $(top_builddir)/src/regex/libgnunetregexblock.la \
167 $(top_builddir)/src/regex/libgnunetregextest.a \
168 $(top_builddir)/src/statistics/libgnunetstatistics.la \
169 $(top_builddir)/src/util/libgnunetutil.la
170gnunet_daemon_regexprofiler_DEPENDENCIES = \
171 $(top_builddir)/src/regex/libgnunetregex_internal.a \
172 $(top_builddir)/src/dht/libgnunetdht.la \ 136 $(top_builddir)/src/dht/libgnunetdht.la \
173 $(top_builddir)/src/regex/libgnunetregexblock.la \ 137 libgnunetregexblock.la \
174 $(top_builddir)/src/regex/libgnunetregextest.a \ 138 libgnunetregextest.a \
175 $(top_builddir)/src/statistics/libgnunetstatistics.la \ 139 $(top_builddir)/src/statistics/libgnunetstatistics.la \
176 $(top_builddir)/src/util/libgnunetutil.la 140 $(top_builddir)/src/util/libgnunetutil.la
177 141
@@ -190,43 +154,43 @@ endif
190test_regex_eval_api_SOURCES = \ 154test_regex_eval_api_SOURCES = \
191 test_regex_eval_api.c 155 test_regex_eval_api.c
192test_regex_eval_api_LDADD = -lm \ 156test_regex_eval_api_LDADD = -lm \
193 $(top_builddir)/src/regex/libgnunetregex_internal.a \ 157 libgnunetregex_internal.a \
194 $(top_builddir)/src/dht/libgnunetdht.la \ 158 $(top_builddir)/src/dht/libgnunetdht.la \
195 $(top_builddir)/src/regex/libgnunetregextest.a \ 159 libgnunetregextest.a \
196 $(top_builddir)/src/regex/libgnunetregexblock.la \ 160 libgnunetregexblock.la \
197 $(top_builddir)/src/util/libgnunetutil.la 161 $(top_builddir)/src/util/libgnunetutil.la
198 162
199test_regex_api_SOURCES = \ 163test_regex_api_SOURCES = \
200 test_regex_api.c 164 test_regex_api.c
201test_regex_api_LDADD = -lm \ 165test_regex_api_LDADD = -lm \
202 $(top_builddir)/src/regex/libgnunetregex.la \ 166 libgnunetregex.la \
203 $(top_builddir)/src/testing/libgnunettesting.la \ 167 $(top_builddir)/src/testing/libgnunettesting.la \
204 $(top_builddir)/src/util/libgnunetutil.la 168 $(top_builddir)/src/util/libgnunetutil.la
205 169
206test_regex_iterate_api_SOURCES = \ 170test_regex_iterate_api_SOURCES = \
207 test_regex_iterate_api.c 171 test_regex_iterate_api.c
208test_regex_iterate_api_LDADD = -lm \ 172test_regex_iterate_api_LDADD = -lm \
209 $(top_builddir)/src/regex/libgnunetregex_internal.a \ 173 libgnunetregex_internal.a \
210 $(top_builddir)/src/regex/libgnunetregexblock.la \ 174 libgnunetregexblock.la \
211 $(top_builddir)/src/dht/libgnunetdht.la \ 175 $(top_builddir)/src/dht/libgnunetdht.la \
212 $(top_builddir)/src/util/libgnunetutil.la 176 $(top_builddir)/src/util/libgnunetutil.la
213 177
214test_regex_proofs_SOURCES = \ 178test_regex_proofs_SOURCES = \
215 test_regex_proofs.c 179 test_regex_proofs.c
216test_regex_proofs_LDADD = -lm \ 180test_regex_proofs_LDADD = -lm \
217 $(top_builddir)/src/regex/libgnunetregex_internal.a \ 181 libgnunetregex_internal.a \
218 $(top_builddir)/src/dht/libgnunetdht.la \ 182 $(top_builddir)/src/dht/libgnunetdht.la \
219 $(top_builddir)/src/regex/libgnunetregextest.a \ 183 libgnunetregextest.a \
220 $(top_builddir)/src/regex/libgnunetregexblock.la \ 184 libgnunetregexblock.la \
221 $(top_builddir)/src/util/libgnunetutil.la 185 $(top_builddir)/src/util/libgnunetutil.la
222 186
223test_regex_graph_api_SOURCES = \ 187test_regex_graph_api_SOURCES = \
224 test_regex_graph_api.c 188 test_regex_graph_api.c
225test_regex_graph_api_LDADD = -lm \ 189test_regex_graph_api_LDADD = -lm \
226 $(top_builddir)/src/regex/libgnunetregex_internal.a \ 190 libgnunetregex_internal.a \
227 $(top_builddir)/src/dht/libgnunetdht.la \ 191 $(top_builddir)/src/dht/libgnunetdht.la \
228 $(top_builddir)/src/regex/libgnunetregextest.a \ 192 libgnunetregextest.a \
229 $(top_builddir)/src/regex/libgnunetregexblock.la \ 193 libgnunetregexblock.la \
230 $(top_builddir)/src/util/libgnunetutil.la 194 $(top_builddir)/src/util/libgnunetutil.la
231 195
232 196
diff --git a/src/revocation/Makefile.am b/src/revocation/Makefile.am
index a6d584006..a83850fd0 100644
--- a/src/revocation/Makefile.am
+++ b/src/revocation/Makefile.am
@@ -47,21 +47,19 @@ libexec_PROGRAMS = \
47gnunet_service_revocation_SOURCES = \ 47gnunet_service_revocation_SOURCES = \
48 gnunet-service-revocation.c 48 gnunet-service-revocation.c
49gnunet_service_revocation_LDADD = \ 49gnunet_service_revocation_LDADD = \
50 $(top_builddir)/src/revocation/libgnunetrevocation.la \ 50 libgnunetrevocation.la \
51 $(top_builddir)/src/core/libgnunetcore.la \ 51 $(top_builddir)/src/core/libgnunetcore.la \
52 $(top_builddir)/src/set/libgnunetset.la \ 52 $(top_builddir)/src/set/libgnunetset.la \
53 $(top_builddir)/src/statistics/libgnunetstatistics.la \ 53 $(top_builddir)/src/statistics/libgnunetstatistics.la \
54 $(top_builddir)/src/util/libgnunetutil.la \ 54 $(top_builddir)/src/util/libgnunetutil.la \
55 -lm \ 55 -lm \
56 $(GN_LIBINTL) 56 $(GN_LIBINTL)
57gnunet_service_revocation_DEPENDENCIES = \
58 libgnunetrevocation.la
59 57
60test_revocation_SOURCES = \ 58test_revocation_SOURCES = \
61 test_revocation.c 59 test_revocation.c
62test_revocation_LDADD = \ 60test_revocation_LDADD = \
63 $(top_builddir)/src/identity/libgnunetidentity.la \ 61 $(top_builddir)/src/identity/libgnunetidentity.la \
64 $(top_builddir)/src/revocation/libgnunetrevocation.la \ 62 libgnunetrevocation.la \
65 $(top_builddir)/src//core/libgnunetcore.la \ 63 $(top_builddir)/src//core/libgnunetcore.la \
66 $(top_builddir)/src/util/libgnunetutil.la \ 64 $(top_builddir)/src/util/libgnunetutil.la \
67 $(top_builddir)/src/testbed/libgnunettestbed.la 65 $(top_builddir)/src/testbed/libgnunettestbed.la
diff --git a/src/scalarproduct/Makefile.am b/src/scalarproduct/Makefile.am
index a92e684f4..071720812 100644
--- a/src/scalarproduct/Makefile.am
+++ b/src/scalarproduct/Makefile.am
@@ -28,12 +28,10 @@ gnunet_scalarproduct_SOURCES = \
28 gnunet-scalarproduct.c 28 gnunet-scalarproduct.c
29gnunet_scalarproduct_LDADD = \ 29gnunet_scalarproduct_LDADD = \
30 $(top_builddir)/src/util/libgnunetutil.la \ 30 $(top_builddir)/src/util/libgnunetutil.la \
31 $(top_builddir)/src/scalarproduct/libgnunetscalarproduct.la \ 31 libgnunetscalarproduct.la \
32 $(LIBGCRYPT_LIBS) \ 32 $(LIBGCRYPT_LIBS) \
33 -lgcrypt \ 33 -lgcrypt \
34 $(GN_LIBINTL) 34 $(GN_LIBINTL)
35gnunet_scalarproduct_DEPENDENCIES = \
36 libgnunetscalarproduct.la
37 35
38gnunet_service_scalarproduct_SOURCES = \ 36gnunet_service_scalarproduct_SOURCES = \
39 gnunet-service-scalarproduct.c 37 gnunet-service-scalarproduct.c
diff --git a/src/secretsharing/Makefile.am b/src/secretsharing/Makefile.am
index 0b4d5bf7b..45805f99c 100644
--- a/src/secretsharing/Makefile.am
+++ b/src/secretsharing/Makefile.am
@@ -30,11 +30,9 @@ gnunet_secretsharing_profiler_SOURCES = \
30 gnunet-secretsharing-profiler.c 30 gnunet-secretsharing-profiler.c
31gnunet_secretsharing_profiler_LDADD = \ 31gnunet_secretsharing_profiler_LDADD = \
32 $(top_builddir)/src/util/libgnunetutil.la \ 32 $(top_builddir)/src/util/libgnunetutil.la \
33 $(top_builddir)/src/secretsharing/libgnunetsecretsharing.la \ 33 libgnunetsecretsharing.la \
34 $(top_builddir)/src/testbed/libgnunettestbed.la \ 34 $(top_builddir)/src/testbed/libgnunettestbed.la \
35 $(GN_LIBINTL) 35 $(GN_LIBINTL)
36gnunet_secretsharing_profiler_DEPENDENCIES = \
37 libgnunetsecretsharing.la
38 36
39gnunet_service_secretsharing_SOURCES = \ 37gnunet_service_secretsharing_SOURCES = \
40 gnunet-service-secretsharing.c \ 38 gnunet-service-secretsharing.c \
@@ -46,8 +44,6 @@ gnunet_service_secretsharing_LDADD = \
46 $(top_builddir)/src/consensus/libgnunetconsensus.la \ 44 $(top_builddir)/src/consensus/libgnunetconsensus.la \
47 $(LIBGCRYPT_LIBS) \ 45 $(LIBGCRYPT_LIBS) \
48 $(GN_LIBINTL) 46 $(GN_LIBINTL)
49gnunet_service_secretsharing_DEPENDENCIES = \
50 $(top_builddir)/src/consensus/libgnunetconsensus.la
51 47
52libgnunetsecretsharing_la_SOURCES = \ 48libgnunetsecretsharing_la_SOURCES = \
53 secretsharing_api.c \ 49 secretsharing_api.c \
@@ -72,7 +68,7 @@ test_secretsharing_api_SOURCES = \
72test_secretsharing_api_LDADD = \ 68test_secretsharing_api_LDADD = \
73 $(top_builddir)/src/util/libgnunetutil.la \ 69 $(top_builddir)/src/util/libgnunetutil.la \
74 $(top_builddir)/src/testing/libgnunettesting.la \ 70 $(top_builddir)/src/testing/libgnunettesting.la \
75 $(top_builddir)/src/secretsharing/libgnunetsecretsharing.la 71 libgnunetsecretsharing.la
76 72
77EXTRA_DIST = \ 73EXTRA_DIST = \
78 test_secretsharing.conf 74 test_secretsharing.conf
diff --git a/src/sensor/Makefile.am b/src/sensor/Makefile.am
index af8293cca..9739b6743 100644
--- a/src/sensor/Makefile.am
+++ b/src/sensor/Makefile.am
@@ -65,24 +65,18 @@ libgnunetsensorutil_la_LIBADD = \
65 $(top_builddir)/src/statistics/libgnunetstatistics.la 65 $(top_builddir)/src/statistics/libgnunetstatistics.la
66libgnunetsensorutil_la_LDFLAGS = \ 66libgnunetsensorutil_la_LDFLAGS = \
67 $(GN_LIB_LDFLAGS) 67 $(GN_LIB_LDFLAGS)
68libgnunetsensorutil_la_DEPENDENCIES = \
69 $(top_builddir)/src/util/libgnunetutil.la \
70 $(top_builddir)/src/statistics/libgnunetstatistics.la
71 68
72plugin_LTLIBRARIES = \ 69plugin_LTLIBRARIES = \
73 libgnunet_plugin_sensor_model_gaussian.la 70 libgnunet_plugin_sensor_model_gaussian.la
74 71
75libgnunet_plugin_sensor_model_gaussian_la_SOURCES = \ 72libgnunet_plugin_sensor_model_gaussian_la_SOURCES = \
76 plugin_sensor_model_gaussian.c 73 plugin_sensor_model_gaussian.c
77libgnunet_plugin_sensor_model_gaussian_la_LIBADD = \ 74libgnunet_plugin_sensor_model_gaussian_la_LIBADD = \
78 $(top_builddir)/src/sensor/libgnunetsensor.la \ 75 libgnunetsensor.la \
79 $(top_builddir)/src/util/libgnunetutil.la $(XLIBS) \ 76 $(top_builddir)/src/util/libgnunetutil.la $(XLIBS) \
80 $(LTLIBINTL) 77 $(LTLIBINTL)
81libgnunet_plugin_sensor_model_gaussian_la_LDFLAGS = \ 78libgnunet_plugin_sensor_model_gaussian_la_LDFLAGS = \
82 $(GN_PLUGIN_LDFLAGS) 79 $(GN_PLUGIN_LDFLAGS)
83libgnunet_plugin_sensor_model_gaussian_la_DEPENDENCIES = \
84 $(top_builddir)/src/util/libgnunetutil.la \
85 libgnunetsensor.la
86 80
87check_PROGRAMS = \ 81check_PROGRAMS = \
88 test_sensor_api \ 82 test_sensor_api \
diff --git a/src/set/Makefile.am b/src/set/Makefile.am
index 7dc269446..8aaea88f2 100644
--- a/src/set/Makefile.am
+++ b/src/set/Makefile.am
@@ -28,11 +28,9 @@ gnunet_set_profiler_SOURCES = \
28 gnunet-set-profiler.c 28 gnunet-set-profiler.c
29gnunet_set_profiler_LDADD = \ 29gnunet_set_profiler_LDADD = \
30 $(top_builddir)/src/util/libgnunetutil.la \ 30 $(top_builddir)/src/util/libgnunetutil.la \
31 $(top_builddir)/src/set/libgnunetset.la \ 31 libgnunetset.la \
32 $(top_builddir)/src/testing/libgnunettesting.la \ 32 $(top_builddir)/src/testing/libgnunettesting.la \
33 $(GN_LIBINTL) 33 $(GN_LIBINTL)
34gnunet_set_profiler_DEPENDENCIES = \
35 libgnunetset.la
36 34
37 35
38gnunet_set_ibf_profiler_SOURCES = \ 36gnunet_set_ibf_profiler_SOURCES = \
@@ -79,8 +77,6 @@ test_set_api_SOURCES = \
79test_set_api_LDADD = \ 77test_set_api_LDADD = \
80 $(top_builddir)/src/util/libgnunetutil.la \ 78 $(top_builddir)/src/util/libgnunetutil.la \
81 $(top_builddir)/src/testing/libgnunettesting.la \ 79 $(top_builddir)/src/testing/libgnunettesting.la \
82 $(top_builddir)/src/set/libgnunetset.la
83test_set_api_DEPENDENCIES = \
84 libgnunetset.la 80 libgnunetset.la
85 81
86test_set_union_result_full_SOURCES = \ 82test_set_union_result_full_SOURCES = \
@@ -88,8 +84,6 @@ test_set_union_result_full_SOURCES = \
88test_set_union_result_full_LDADD = \ 84test_set_union_result_full_LDADD = \
89 $(top_builddir)/src/util/libgnunetutil.la \ 85 $(top_builddir)/src/util/libgnunetutil.la \
90 $(top_builddir)/src/testing/libgnunettesting.la \ 86 $(top_builddir)/src/testing/libgnunettesting.la \
91 $(top_builddir)/src/set/libgnunetset.la
92test_set_union_result_full_DEPENDENCIES = \
93 libgnunetset.la 87 libgnunetset.la
94 88
95test_set_intersection_result_full_SOURCES = \ 89test_set_intersection_result_full_SOURCES = \
@@ -97,8 +91,6 @@ test_set_intersection_result_full_SOURCES = \
97test_set_intersection_result_full_LDADD = \ 91test_set_intersection_result_full_LDADD = \
98 $(top_builddir)/src/util/libgnunetutil.la \ 92 $(top_builddir)/src/util/libgnunetutil.la \
99 $(top_builddir)/src/testing/libgnunettesting.la \ 93 $(top_builddir)/src/testing/libgnunettesting.la \
100 $(top_builddir)/src/set/libgnunetset.la
101test_set_intersection_result_full_DEPENDENCIES = \
102 libgnunetset.la 94 libgnunetset.la
103 95
104EXTRA_DIST = \ 96EXTRA_DIST = \
diff --git a/src/social/Makefile.am b/src/social/Makefile.am
index a1dff3c58..a336542b9 100644
--- a/src/social/Makefile.am
+++ b/src/social/Makefile.am
@@ -33,14 +33,6 @@ libgnunetsocial_la_LIBADD = \
33libgnunetsocial_la_LDFLAGS = \ 33libgnunetsocial_la_LDFLAGS = \
34 $(GN_LIB_LDFLAGS) $(WINFLAGS) \ 34 $(GN_LIB_LDFLAGS) $(WINFLAGS) \
35 -version-info 0:0:0 35 -version-info 0:0:0
36libgnunetsocial_la_DEPENDENCIES = \
37 $(top_builddir)/src/util/libgnunetutil.la \
38 $(top_builddir)/src/env/libgnunetenv.la \
39 $(top_builddir)/src/psyc/libgnunetpsycutil.la \
40 $(top_builddir)/src/core/libgnunetcore.la \
41 $(top_builddir)/src/identity/libgnunetidentity.la \
42 $(top_builddir)/src/gns/libgnunetgns.la \
43 $(top_builddir)/src/namestore/libgnunetnamestore.la
44 36
45bin_PROGRAMS = 37bin_PROGRAMS =
46 38
@@ -55,12 +47,6 @@ gnunet_service_social_LDADD = \
55 $(top_builddir)/src/psyc/libgnunetpsyc.la \ 47 $(top_builddir)/src/psyc/libgnunetpsyc.la \
56 $(top_builddir)/src/psyc/libgnunetpsycutil.la \ 48 $(top_builddir)/src/psyc/libgnunetpsycutil.la \
57 $(GN_LIBINTL) 49 $(GN_LIBINTL)
58gnunet_service_social_DEPENDENCIES = \
59 $(top_builddir)/src/util/libgnunetutil.la \
60 $(top_builddir)/src/statistics/libgnunetstatistics.la \
61 $(top_builddir)/src/psyc/libgnunetpsyc.la \
62 $(top_builddir)/src/psyc/libgnunetpsycutil.la
63gnunet_service_social_CFLAGS = $(AM_CFLAGS)
64 50
65 51
66if HAVE_TESTING 52if HAVE_TESTING
@@ -83,14 +69,6 @@ test_social_LDADD = \
83 $(top_builddir)/src/psyc/libgnunetpsycutil.la \ 69 $(top_builddir)/src/psyc/libgnunetpsycutil.la \
84 $(top_builddir)/src/core/libgnunetcore.la \ 70 $(top_builddir)/src/core/libgnunetcore.la \
85 $(top_builddir)/src/identity/libgnunetidentity.la 71 $(top_builddir)/src/identity/libgnunetidentity.la
86test_social_DEPENDENCIES = \
87 libgnunetsocial.la \
88 $(top_builddir)/src/testing/libgnunettesting.la \
89 $(top_builddir)/src/util/libgnunetutil.la \
90 $(top_builddir)/src/env/libgnunetenv.la \
91 $(top_builddir)/src/psyc/libgnunetpsycutil.la \
92 $(top_builddir)/src/core/libgnunetcore.la \
93 $(top_builddir)/src/identity/libgnunetidentity.la
94 72
95EXTRA_DIST = \ 73EXTRA_DIST = \
96 test_social.conf 74 test_social.conf
diff --git a/src/statistics/Makefile.am b/src/statistics/Makefile.am
index ceccc3dde..5800fbd0a 100644
--- a/src/statistics/Makefile.am
+++ b/src/statistics/Makefile.am
@@ -36,20 +36,16 @@ bin_PROGRAMS = \
36gnunet_statistics_SOURCES = \ 36gnunet_statistics_SOURCES = \
37 gnunet-statistics.c 37 gnunet-statistics.c
38gnunet_statistics_LDADD = \ 38gnunet_statistics_LDADD = \
39 $(top_builddir)/src/statistics/libgnunetstatistics.la \ 39 libgnunetstatistics.la \
40 $(top_builddir)/src/util/libgnunetutil.la \ 40 $(top_builddir)/src/util/libgnunetutil.la \
41 $(GN_LIBINTL) 41 $(GN_LIBINTL)
42gnunet_statistics_DEPENDENCIES = \
43 libgnunetstatistics.la
44 42
45gnunet_service_statistics_SOURCES = \ 43gnunet_service_statistics_SOURCES = \
46 gnunet-service-statistics.c 44 gnunet-service-statistics.c
47gnunet_service_statistics_LDADD = \ 45gnunet_service_statistics_LDADD = \
48 $(top_builddir)/src/statistics/libgnunetstatistics.la \ 46 libgnunetstatistics.la \
49 $(top_builddir)/src/util/libgnunetutil.la \ 47 $(top_builddir)/src/util/libgnunetutil.la \
50 $(GN_LIBINTL) 48 $(GN_LIBINTL)
51gnunet_service_statistics_DEPENDENCIES = \
52 libgnunetstatistics.la
53 49
54check_PROGRAMS = \ 50check_PROGRAMS = \
55 test_statistics_api \ 51 test_statistics_api \
@@ -65,25 +61,25 @@ endif
65test_statistics_api_SOURCES = \ 61test_statistics_api_SOURCES = \
66 test_statistics_api.c 62 test_statistics_api.c
67test_statistics_api_LDADD = \ 63test_statistics_api_LDADD = \
68 $(top_builddir)/src/statistics/libgnunetstatistics.la \ 64 libgnunetstatistics.la \
69 $(top_builddir)/src/util/libgnunetutil.la 65 $(top_builddir)/src/util/libgnunetutil.la
70 66
71test_statistics_api_loop_SOURCES = \ 67test_statistics_api_loop_SOURCES = \
72 test_statistics_api_loop.c 68 test_statistics_api_loop.c
73test_statistics_api_loop_LDADD = \ 69test_statistics_api_loop_LDADD = \
74 $(top_builddir)/src/statistics/libgnunetstatistics.la \ 70 libgnunetstatistics.la \
75 $(top_builddir)/src/util/libgnunetutil.la 71 $(top_builddir)/src/util/libgnunetutil.la
76 72
77test_statistics_api_watch_SOURCES = \ 73test_statistics_api_watch_SOURCES = \
78 test_statistics_api_watch.c 74 test_statistics_api_watch.c
79test_statistics_api_watch_LDADD = \ 75test_statistics_api_watch_LDADD = \
80 $(top_builddir)/src/statistics/libgnunetstatistics.la \ 76 libgnunetstatistics.la \
81 $(top_builddir)/src/util/libgnunetutil.la 77 $(top_builddir)/src/util/libgnunetutil.la
82 78
83test_statistics_api_watch_zero_value_SOURCES = \ 79test_statistics_api_watch_zero_value_SOURCES = \
84 test_statistics_api_watch_zero_value.c 80 test_statistics_api_watch_zero_value.c
85test_statistics_api_watch_zero_value_LDADD = \ 81test_statistics_api_watch_zero_value_LDADD = \
86 $(top_builddir)/src/statistics/libgnunetstatistics.la \ 82 libgnunetstatistics.la \
87 $(top_builddir)/src/util/libgnunetutil.la 83 $(top_builddir)/src/util/libgnunetutil.la
88 84
89if HAVE_PYTHON 85if HAVE_PYTHON
diff --git a/src/testbed/Makefile.am b/src/testbed/Makefile.am
index a87ff5817..1428106a5 100644
--- a/src/testbed/Makefile.am
+++ b/src/testbed/Makefile.am
@@ -53,26 +53,19 @@ gnunet_service_testbed_LDADD = $(XLIB) \
53 $(top_builddir)/src/hello/libgnunethello.la \ 53 $(top_builddir)/src/hello/libgnunethello.la \
54 $(top_builddir)/src/transport/libgnunettransport.la \ 54 $(top_builddir)/src/transport/libgnunettransport.la \
55 $(top_builddir)/src/testing/libgnunettesting.la \ 55 $(top_builddir)/src/testing/libgnunettesting.la \
56 $(top_builddir)/src/testbed/libgnunettestbed.la \ 56 libgnunettestbed.la \
57 $(top_builddir)/src/arm/libgnunetarm.la \ 57 $(top_builddir)/src/arm/libgnunetarm.la \
58 $(LTLIBINTL) $(Z_LIBS) 58 $(LTLIBINTL) $(Z_LIBS)
59gnunet_service_testbed_DEPENDENCIES = \
60 libgnunettestbed.la
61 59
62gnunet_service_testbed_logger_SOURCES = \ 60gnunet_service_testbed_logger_SOURCES = \
63 gnunet-service-testbed-logger.c 61 gnunet-service-testbed-logger.c
64gnunet_service_testbed_logger_LDADD = \ 62gnunet_service_testbed_logger_LDADD = \
65 $(top_builddir)/src/util/libgnunetutil.la 63 $(top_builddir)/src/util/libgnunetutil.la
66gnunet_service_testbed_logger_DEPENDENCIES = \
67 $(top_builddir)/src/util/libgnunetutil.la
68 64
69gnunet_testbed_profiler_SOURCES = \ 65gnunet_testbed_profiler_SOURCES = \
70 gnunet-testbed-profiler.c 66 gnunet-testbed-profiler.c
71gnunet_testbed_profiler_LDADD = $(XLIB) \ 67gnunet_testbed_profiler_LDADD = $(XLIB) \
72 $(top_builddir)/src/util/libgnunetutil.la \ 68 $(top_builddir)/src/util/libgnunetutil.la \
73 $(top_builddir)/src/testbed/libgnunettestbed.la
74gnunet_testbed_profiler_DEPENDENCIES = \
75 $(top_builddir)/src/util/libgnunetutil.la \
76 libgnunettestbed.la 69 libgnunettestbed.la
77 70
78gnunet_helper_testbed_SOURCES = \ 71gnunet_helper_testbed_SOURCES = \
@@ -82,36 +75,24 @@ gnunet_helper_testbed_LDADD = $(XLIB) \
82 $(top_builddir)/src/testing/libgnunettesting.la \ 75 $(top_builddir)/src/testing/libgnunettesting.la \
83 libgnunettestbed.la \ 76 libgnunettestbed.la \
84 $(LTLIBINTL) $(Z_LIBS) 77 $(LTLIBINTL) $(Z_LIBS)
85gnunet_helper_testbed_DEPENDENCIES = \
86 gnunet-service-testbed.$(OBJEXT) \
87 libgnunettestbed.la
88 78
89gnunet_daemon_testbed_blacklist_SOURCES = gnunet-daemon-testbed-blacklist.c 79gnunet_daemon_testbed_blacklist_SOURCES = gnunet-daemon-testbed-blacklist.c
90gnunet_daemon_testbed_blacklist_LDADD = $(XLIB) \ 80gnunet_daemon_testbed_blacklist_LDADD = $(XLIB) \
91 $(top_builddir)/src/transport/libgnunettransport.la \ 81 $(top_builddir)/src/transport/libgnunettransport.la \
92 $(top_builddir)/src/util/libgnunetutil.la \ 82 $(top_builddir)/src/util/libgnunetutil.la \
93 $(LTLIBINTL) 83 $(LTLIBINTL)
94gnunet_daemon_testbed_blacklist_DEPENDENCIES = \
95 $(top_builddir)/src/transport/libgnunettransport.la \
96 $(top_builddir)/src/util/libgnunetutil.la
97 84
98gnunet_daemon_testbed_underlay_SOURCES = gnunet-daemon-testbed-underlay.c 85gnunet_daemon_testbed_underlay_SOURCES = gnunet-daemon-testbed-underlay.c
99gnunet_daemon_testbed_underlay_LDADD = $(XLIB) \ 86gnunet_daemon_testbed_underlay_LDADD = $(XLIB) \
100 $(top_builddir)/src/transport/libgnunettransport.la \ 87 $(top_builddir)/src/transport/libgnunettransport.la \
101 $(top_builddir)/src/util/libgnunetutil.la \ 88 $(top_builddir)/src/util/libgnunetutil.la \
102 $(LTLIBINTL) -lsqlite3 89 $(LTLIBINTL) -lsqlite3
103gnunet_daemon_testbed_underlay_DEPENDENCIES = \
104 $(top_builddir)/src/transport/libgnunettransport.la \
105 $(top_builddir)/src/util/libgnunetutil.la
106 90
107gnunet_daemon_latency_logger_SOURCES = gnunet-daemon-latency-logger.c 91gnunet_daemon_latency_logger_SOURCES = gnunet-daemon-latency-logger.c
108gnunet_daemon_latency_logger_LDADD = $(XLIB) \ 92gnunet_daemon_latency_logger_LDADD = $(XLIB) \
109 $(top_builddir)/src/ats/libgnunetats.la \ 93 $(top_builddir)/src/ats/libgnunetats.la \
110 $(top_builddir)/src/util/libgnunetutil.la \ 94 $(top_builddir)/src/util/libgnunetutil.la \
111 $(LTLIBINTL) -lsqlite3 95 $(LTLIBINTL) -lsqlite3
112gnunet_daemon_latency_logger_DEPENDENCIES = \
113 $(top_builddir)/src/ats/libgnunetats.la \
114 $(top_builddir)/src/util/libgnunetutil.la
115 96
116lib_LTLIBRARIES = \ 97lib_LTLIBRARIES = \
117 libgnunettestbed.la \ 98 libgnunettestbed.la \
@@ -154,11 +135,8 @@ libgnunettestbedlogger_la_LDFLAGS = \
154generate_underlay_topology_SOURCES = generate-underlay-topology.c 135generate_underlay_topology_SOURCES = generate-underlay-topology.c
155generate_underlay_topology_LDADD = $(XLIB) \ 136generate_underlay_topology_LDADD = $(XLIB) \
156 $(top_builddir)/src/util/libgnunetutil.la \ 137 $(top_builddir)/src/util/libgnunetutil.la \
157 $(top_builddir)/src/testbed/libgnunettestbed.la \ 138 libgnunettestbed.la \
158 $(LTLIBINTL) -lsqlite3 139 $(LTLIBINTL) -lsqlite3
159generate_underlay_topology_DEPENDENCIES = \
160 $(top_builddir)/src/util/libgnunetutil.la \
161 libgnunettestbed.la
162 140
163check_PROGRAMS = \ 141check_PROGRAMS = \
164 test_testbed_api_hosts \ 142 test_testbed_api_hosts \
@@ -399,8 +377,6 @@ test_testbed_api_barriers_SOURCES = \
399test_testbed_api_barriers_LDADD = \ 377test_testbed_api_barriers_LDADD = \
400 $(top_builddir)/src/util/libgnunetutil.la \ 378 $(top_builddir)/src/util/libgnunetutil.la \
401 libgnunettestbed.la 379 libgnunettestbed.la
402test_testbed_api_barriers_DEPENDENCIES = \
403 gnunet-service-test-barriers$(EXEEXT)
404 380
405gnunet_service_test_barriers_SOURCES = \ 381gnunet_service_test_barriers_SOURCES = \
406 gnunet-service-test-barriers.c \ 382 gnunet-service-test-barriers.c \
diff --git a/src/testing/Makefile.am b/src/testing/Makefile.am
index 899708102..86c3c7d9a 100644
--- a/src/testing/Makefile.am
+++ b/src/testing/Makefile.am
@@ -36,11 +36,9 @@ noinst_PROGRAMS = \
36gnunet_testing_SOURCES = \ 36gnunet_testing_SOURCES = \
37 gnunet-testing.c 37 gnunet-testing.c
38gnunet_testing_LDADD = \ 38gnunet_testing_LDADD = \
39 $(top_builddir)/src/testing/libgnunettesting.la \ 39 libgnunettesting.la \
40 $(top_builddir)/src/util/libgnunetutil.la \ 40 $(top_builddir)/src/util/libgnunetutil.la \
41 $(GN_LIBINTL) 41 $(GN_LIBINTL)
42gnunet_testing_DEPENDENCIES = \
43 libgnunettesting.la
44 42
45list_keys_SOURCES = \ 43list_keys_SOURCES = \
46 list-keys.c 44 list-keys.c
@@ -68,31 +66,31 @@ endif
68test_testing_portreservation_SOURCES = \ 66test_testing_portreservation_SOURCES = \
69 test_testing_portreservation.c 67 test_testing_portreservation.c
70test_testing_portreservation_LDADD = \ 68test_testing_portreservation_LDADD = \
71 $(top_builddir)/src/testing/libgnunettesting.la \ 69 libgnunettesting.la \
72 $(top_builddir)/src/util/libgnunetutil.la 70 $(top_builddir)/src/util/libgnunetutil.la
73 71
74test_testing_peerstartup_SOURCES = \ 72test_testing_peerstartup_SOURCES = \
75 test_testing_peerstartup.c 73 test_testing_peerstartup.c
76test_testing_peerstartup_LDADD = \ 74test_testing_peerstartup_LDADD = \
77 $(top_builddir)/src/testing/libgnunettesting.la \ 75 libgnunettesting.la \
78 $(top_builddir)/src/util/libgnunetutil.la 76 $(top_builddir)/src/util/libgnunetutil.la
79 77
80test_testing_peerstartup2_SOURCES = \ 78test_testing_peerstartup2_SOURCES = \
81 test_testing_peerstartup2.c 79 test_testing_peerstartup2.c
82test_testing_peerstartup2_LDADD = \ 80test_testing_peerstartup2_LDADD = \
83 $(top_builddir)/src/testing/libgnunettesting.la \ 81 libgnunettesting.la \
84 $(top_builddir)/src/util/libgnunetutil.la 82 $(top_builddir)/src/util/libgnunetutil.la
85 83
86test_testing_servicestartup_SOURCES = \ 84test_testing_servicestartup_SOURCES = \
87 test_testing_servicestartup.c 85 test_testing_servicestartup.c
88test_testing_servicestartup_LDADD = \ 86test_testing_servicestartup_LDADD = \
89 $(top_builddir)/src/testing/libgnunettesting.la \ 87 libgnunettesting.la \
90 $(top_builddir)/src/util/libgnunetutil.la 88 $(top_builddir)/src/util/libgnunetutil.la
91 89
92test_testing_sharedservices_SOURCES = \ 90test_testing_sharedservices_SOURCES = \
93 test_testing_sharedservices.c 91 test_testing_sharedservices.c
94test_testing_sharedservices_LDADD = \ 92test_testing_sharedservices_LDADD = \
95 $(top_builddir)/src/testing/libgnunettesting.la \ 93 libgnunettesting.la \
96 $(top_builddir)/src/util/libgnunetutil.la 94 $(top_builddir)/src/util/libgnunetutil.la
97 95
98EXTRA_DIST = \ 96EXTRA_DIST = \
diff --git a/src/transport/Makefile.am b/src/transport/Makefile.am
index dd7bedbae..83e820012 100644
--- a/src/transport/Makefile.am
+++ b/src/transport/Makefile.am
@@ -151,13 +151,11 @@ lib_LTLIBRARIES = \
151libgnunettransporttesting_la_SOURCES = \ 151libgnunettransporttesting_la_SOURCES = \
152 transport-testing.c transport-testing.h 152 transport-testing.c transport-testing.h
153libgnunettransporttesting_la_LIBADD = \ 153libgnunettransporttesting_la_LIBADD = \
154 $(top_builddir)/src/transport/libgnunettransport.la \ 154 libgnunettransport.la \
155 $(top_builddir)/src/hello/libgnunethello.la \ 155 $(top_builddir)/src/hello/libgnunethello.la \
156 $(top_builddir)/src/util/libgnunetutil.la \ 156 $(top_builddir)/src/util/libgnunetutil.la \
157 $(top_builddir)/src/testing/libgnunettesting.la \ 157 $(top_builddir)/src/testing/libgnunettesting.la \
158 $(GN_LIBINTL) 158 $(GN_LIBINTL)
159libgnunettransporttesting_la_DEPENDENCIES = \
160 libgnunettransport.la
161libgnunettransporttesting_la_LDFLAGS = \ 159libgnunettransporttesting_la_LDFLAGS = \
162 $(GN_LIB_LDFLAGS) 160 $(GN_LIB_LDFLAGS)
163 161
@@ -224,24 +222,20 @@ endif
224gnunet_transport_profiler_SOURCES = \ 222gnunet_transport_profiler_SOURCES = \
225 gnunet-transport-profiler.c 223 gnunet-transport-profiler.c
226gnunet_transport_profiler_LDADD = \ 224gnunet_transport_profiler_LDADD = \
227 $(top_builddir)/src/transport/libgnunettransport.la \ 225 libgnunettransport.la \
228 $(top_builddir)/src/nat/libgnunetnat.la \ 226 $(top_builddir)/src/nat/libgnunetnat.la \
229 $(top_builddir)/src/hello/libgnunethello.la \ 227 $(top_builddir)/src/hello/libgnunethello.la \
230 $(top_builddir)/src/util/libgnunetutil.la \ 228 $(top_builddir)/src/util/libgnunetutil.la \
231 $(GN_LIBINTL) 229 $(GN_LIBINTL)
232gnunet_transport_profiler_DEPENDENCIES = \
233 libgnunettransport.la
234 230
235gnunet_transport_SOURCES = \ 231gnunet_transport_SOURCES = \
236 gnunet-transport.c 232 gnunet-transport.c
237gnunet_transport_LDADD = \ 233gnunet_transport_LDADD = \
238 $(top_builddir)/src/transport/libgnunettransport.la \ 234 libgnunettransport.la \
239 $(top_builddir)/src/nat/libgnunetnat.la \ 235 $(top_builddir)/src/nat/libgnunetnat.la \
240 $(top_builddir)/src/hello/libgnunethello.la \ 236 $(top_builddir)/src/hello/libgnunethello.la \
241 $(top_builddir)/src/util/libgnunetutil.la \ 237 $(top_builddir)/src/util/libgnunetutil.la \
242 $(GN_LIBINTL) 238 $(GN_LIBINTL)
243gnunet_transport_DEPENDENCIES = \
244 libgnunettransport.la
245 239
246gnunet_service_transport_SOURCES = \ 240gnunet_service_transport_SOURCES = \
247 gnunet-service-transport.c gnunet-service-transport.h \ 241 gnunet-service-transport.c gnunet-service-transport.h \
@@ -258,7 +252,7 @@ gnunet_service_transport_SOURCES = \
258# a crash on unloading of a plugin unless the service links against 252# a crash on unloading of a plugin unless the service links against
259# that library as well. 253# that library as well.
260gnunet_service_transport_LDADD = \ 254gnunet_service_transport_LDADD = \
261 $(top_builddir)/src/transport/libgnunettransport.la \ 255 libgnunettransport.la \
262 $(top_builddir)/src/ats/libgnunetats.la \ 256 $(top_builddir)/src/ats/libgnunetats.la \
263 $(top_builddir)/src/hello/libgnunethello.la \ 257 $(top_builddir)/src/hello/libgnunethello.la \
264 $(top_builddir)/src/peerinfo/libgnunetpeerinfo.la \ 258 $(top_builddir)/src/peerinfo/libgnunetpeerinfo.la \
@@ -267,8 +261,6 @@ gnunet_service_transport_LDADD = \
267 $(top_builddir)/src/util/libgnunetutil.la \ 261 $(top_builddir)/src/util/libgnunetutil.la \
268 $(GN_GLPK) \ 262 $(GN_GLPK) \
269 $(GN_LIBINTL) 263 $(GN_LIBINTL)
270gnunet_service_transport_DEPENDENCIES = \
271 libgnunettransport.la
272gnunet_service_transport_CFLAGS = \ 264gnunet_service_transport_CFLAGS = \
273 $(CFLAGS) 265 $(CFLAGS)
274# -DANALYZE 266# -DANALYZE
@@ -569,507 +561,507 @@ test_transport_testing_startstop_SOURCES = \
569 test_transport_testing_startstop.c 561 test_transport_testing_startstop.c
570test_transport_testing_startstop_LDADD = \ 562test_transport_testing_startstop_LDADD = \
571 $(top_builddir)/src/util/libgnunetutil.la \ 563 $(top_builddir)/src/util/libgnunetutil.la \
572 $(top_builddir)/src/transport/libgnunettransport.la \ 564 libgnunettransport.la \
573 $(top_builddir)/src/hello/libgnunethello.la \ 565 $(top_builddir)/src/hello/libgnunethello.la \
574 $(top_builddir)/src/transport/libgnunettransporttesting.la 566 libgnunettransporttesting.la
575 567
576test_transport_testing_restart_SOURCES = \ 568test_transport_testing_restart_SOURCES = \
577 test_transport_testing_restart.c 569 test_transport_testing_restart.c
578test_transport_testing_restart_LDADD = \ 570test_transport_testing_restart_LDADD = \
579 $(top_builddir)/src/util/libgnunetutil.la \ 571 $(top_builddir)/src/util/libgnunetutil.la \
580 $(top_builddir)/src/transport/libgnunettransport.la \ 572 libgnunettransport.la \
581 $(top_builddir)/src/hello/libgnunethello.la \ 573 $(top_builddir)/src/hello/libgnunethello.la \
582 $(top_builddir)/src/transport/libgnunettransporttesting.la 574 libgnunettransporttesting.la
583 575
584test_transport_testing_SOURCES = \ 576test_transport_testing_SOURCES = \
585 test_transport_testing.c 577 test_transport_testing.c
586test_transport_testing_LDADD = \ 578test_transport_testing_LDADD = \
587 $(top_builddir)/src/util/libgnunetutil.la \ 579 $(top_builddir)/src/util/libgnunetutil.la \
588 $(top_builddir)/src/transport/libgnunettransport.la \ 580 libgnunettransport.la \
589 $(top_builddir)/src/hello/libgnunethello.la \ 581 $(top_builddir)/src/hello/libgnunethello.la \
590 $(top_builddir)/src/transport/libgnunettransporttesting.la 582 libgnunettransporttesting.la
591 583
592test_transport_api_blacklisting_SOURCES = \ 584test_transport_api_blacklisting_SOURCES = \
593 test_transport_api_blacklisting.c 585 test_transport_api_blacklisting.c
594test_transport_api_blacklisting_LDADD = \ 586test_transport_api_blacklisting_LDADD = \
595 $(top_builddir)/src/transport/libgnunettransport.la \ 587 libgnunettransport.la \
596 $(top_builddir)/src/hello/libgnunethello.la \ 588 $(top_builddir)/src/hello/libgnunethello.la \
597 $(top_builddir)/src/statistics/libgnunetstatistics.la \ 589 $(top_builddir)/src/statistics/libgnunetstatistics.la \
598 $(top_builddir)/src/util/libgnunetutil.la \ 590 $(top_builddir)/src/util/libgnunetutil.la \
599 $(top_builddir)/src/transport/libgnunettransporttesting.la 591 libgnunettransporttesting.la
600 592
601test_transport_blacklisting_no_bl_SOURCES = \ 593test_transport_blacklisting_no_bl_SOURCES = \
602 test_transport_blacklisting.c 594 test_transport_blacklisting.c
603test_transport_blacklisting_no_bl_LDADD = \ 595test_transport_blacklisting_no_bl_LDADD = \
604 $(top_builddir)/src/transport/libgnunettransport.la \ 596 libgnunettransport.la \
605 $(top_builddir)/src/hello/libgnunethello.la \ 597 $(top_builddir)/src/hello/libgnunethello.la \
606 $(top_builddir)/src/statistics/libgnunetstatistics.la \ 598 $(top_builddir)/src/statistics/libgnunetstatistics.la \
607 $(top_builddir)/src/util/libgnunetutil.la \ 599 $(top_builddir)/src/util/libgnunetutil.la \
608 $(top_builddir)/src/transport/libgnunettransporttesting.la 600 libgnunettransporttesting.la
609 601
610test_transport_blacklisting_outbound_bl_full_SOURCES = \ 602test_transport_blacklisting_outbound_bl_full_SOURCES = \
611 test_transport_blacklisting.c 603 test_transport_blacklisting.c
612test_transport_blacklisting_outbound_bl_full_LDADD = \ 604test_transport_blacklisting_outbound_bl_full_LDADD = \
613 $(top_builddir)/src/transport/libgnunettransport.la \ 605 libgnunettransport.la \
614 $(top_builddir)/src/hello/libgnunethello.la \ 606 $(top_builddir)/src/hello/libgnunethello.la \
615 $(top_builddir)/src/statistics/libgnunetstatistics.la \ 607 $(top_builddir)/src/statistics/libgnunetstatistics.la \
616 $(top_builddir)/src/util/libgnunetutil.la \ 608 $(top_builddir)/src/util/libgnunetutil.la \
617 $(top_builddir)/src/transport/libgnunettransporttesting.la 609 libgnunettransporttesting.la
618 610
619test_transport_blacklisting_outbound_bl_plugin_SOURCES = \ 611test_transport_blacklisting_outbound_bl_plugin_SOURCES = \
620 test_transport_blacklisting.c 612 test_transport_blacklisting.c
621test_transport_blacklisting_outbound_bl_plugin_LDADD = \ 613test_transport_blacklisting_outbound_bl_plugin_LDADD = \
622 $(top_builddir)/src/transport/libgnunettransport.la \ 614 libgnunettransport.la \
623 $(top_builddir)/src/hello/libgnunethello.la \ 615 $(top_builddir)/src/hello/libgnunethello.la \
624 $(top_builddir)/src/statistics/libgnunetstatistics.la \ 616 $(top_builddir)/src/statistics/libgnunetstatistics.la \
625 $(top_builddir)/src/util/libgnunetutil.la \ 617 $(top_builddir)/src/util/libgnunetutil.la \
626 $(top_builddir)/src/transport/libgnunettransporttesting.la 618 libgnunettransporttesting.la
627 619
628test_transport_blacklisting_inbound_bl_full_SOURCES = \ 620test_transport_blacklisting_inbound_bl_full_SOURCES = \
629 test_transport_blacklisting.c 621 test_transport_blacklisting.c
630test_transport_blacklisting_inbound_bl_full_LDADD = \ 622test_transport_blacklisting_inbound_bl_full_LDADD = \
631 $(top_builddir)/src/transport/libgnunettransport.la \ 623 libgnunettransport.la \
632 $(top_builddir)/src/hello/libgnunethello.la \ 624 $(top_builddir)/src/hello/libgnunethello.la \
633 $(top_builddir)/src/statistics/libgnunetstatistics.la \ 625 $(top_builddir)/src/statistics/libgnunetstatistics.la \
634 $(top_builddir)/src/util/libgnunetutil.la \ 626 $(top_builddir)/src/util/libgnunetutil.la \
635 $(top_builddir)/src/transport/libgnunettransporttesting.la 627 libgnunettransporttesting.la
636 628
637test_transport_blacklisting_inbound_bl_plugin_SOURCES = \ 629test_transport_blacklisting_inbound_bl_plugin_SOURCES = \
638 test_transport_blacklisting.c 630 test_transport_blacklisting.c
639test_transport_blacklisting_inbound_bl_plugin_LDADD = \ 631test_transport_blacklisting_inbound_bl_plugin_LDADD = \
640 $(top_builddir)/src/transport/libgnunettransport.la \ 632 libgnunettransport.la \
641 $(top_builddir)/src/hello/libgnunethello.la \ 633 $(top_builddir)/src/hello/libgnunethello.la \
642 $(top_builddir)/src/statistics/libgnunetstatistics.la \ 634 $(top_builddir)/src/statistics/libgnunetstatistics.la \
643 $(top_builddir)/src/util/libgnunetutil.la \ 635 $(top_builddir)/src/util/libgnunetutil.la \
644 $(top_builddir)/src/transport/libgnunettransporttesting.la 636 libgnunettransporttesting.la
645 637
646test_transport_blacklisting_multiple_plugins_SOURCES = \ 638test_transport_blacklisting_multiple_plugins_SOURCES = \
647 test_transport_blacklisting.c 639 test_transport_blacklisting.c
648test_transport_blacklisting_multiple_plugins_LDADD = \ 640test_transport_blacklisting_multiple_plugins_LDADD = \
649 $(top_builddir)/src/transport/libgnunettransport.la \ 641 libgnunettransport.la \
650 $(top_builddir)/src/hello/libgnunethello.la \ 642 $(top_builddir)/src/hello/libgnunethello.la \
651 $(top_builddir)/src/statistics/libgnunetstatistics.la \ 643 $(top_builddir)/src/statistics/libgnunetstatistics.la \
652 $(top_builddir)/src/util/libgnunetutil.la \ 644 $(top_builddir)/src/util/libgnunetutil.la \
653 $(top_builddir)/src/transport/libgnunettransporttesting.la 645 libgnunettransporttesting.la
654 646
655 647
656test_transport_api_disconnect_tcp_SOURCES = \ 648test_transport_api_disconnect_tcp_SOURCES = \
657 test_transport_api_disconnect.c 649 test_transport_api_disconnect.c
658test_transport_api_disconnect_tcp_LDADD = \ 650test_transport_api_disconnect_tcp_LDADD = \
659 $(top_builddir)/src/transport/libgnunettransport.la \ 651 libgnunettransport.la \
660 $(top_builddir)/src/hello/libgnunethello.la \ 652 $(top_builddir)/src/hello/libgnunethello.la \
661 $(top_builddir)/src/statistics/libgnunetstatistics.la \ 653 $(top_builddir)/src/statistics/libgnunetstatistics.la \
662 $(top_builddir)/src/util/libgnunetutil.la \ 654 $(top_builddir)/src/util/libgnunetutil.la \
663 $(top_builddir)/src/transport/libgnunettransporttesting.la 655 libgnunettransporttesting.la
664 656
665test_transport_startonly_SOURCES = \ 657test_transport_startonly_SOURCES = \
666 test_transport_startonly.c 658 test_transport_startonly.c
667test_transport_startonly_LDADD = \ 659test_transport_startonly_LDADD = \
668 $(top_builddir)/src/transport/libgnunettransport.la \ 660 libgnunettransport.la \
669 $(top_builddir)/src/hello/libgnunethello.la \ 661 $(top_builddir)/src/hello/libgnunethello.la \
670 $(top_builddir)/src/statistics/libgnunetstatistics.la \ 662 $(top_builddir)/src/statistics/libgnunetstatistics.la \
671 $(top_builddir)/src/util/libgnunetutil.la \ 663 $(top_builddir)/src/util/libgnunetutil.la \
672 $(top_builddir)/src/transport/libgnunettransporttesting.la 664 libgnunettransporttesting.la
673 665
674test_plugin_tcp_SOURCES = \ 666test_plugin_tcp_SOURCES = \
675 test_plugin_transport.c 667 test_plugin_transport.c
676test_plugin_tcp_LDADD = \ 668test_plugin_tcp_LDADD = \
677 $(top_builddir)/src/transport/libgnunettransport.la \ 669 libgnunettransport.la \
678 $(top_builddir)/src/statistics/libgnunetstatistics.la \ 670 $(top_builddir)/src/statistics/libgnunetstatistics.la \
679 $(top_builddir)/src/hello/libgnunethello.la \ 671 $(top_builddir)/src/hello/libgnunethello.la \
680 $(top_builddir)/src/util/libgnunetutil.la \ 672 $(top_builddir)/src/util/libgnunetutil.la \
681 $(top_builddir)/src/transport/libgnunettransporttesting.la 673 libgnunettransporttesting.la
682 674
683test_plugin_udp_SOURCES = \ 675test_plugin_udp_SOURCES = \
684 test_plugin_transport.c 676 test_plugin_transport.c
685test_plugin_udp_LDADD = \ 677test_plugin_udp_LDADD = \
686 $(top_builddir)/src/transport/libgnunettransport.la \ 678 libgnunettransport.la \
687 $(top_builddir)/src/statistics/libgnunetstatistics.la \ 679 $(top_builddir)/src/statistics/libgnunetstatistics.la \
688 $(top_builddir)/src/hello/libgnunethello.la \ 680 $(top_builddir)/src/hello/libgnunethello.la \
689 $(top_builddir)/src/util/libgnunetutil.la \ 681 $(top_builddir)/src/util/libgnunetutil.la \
690 $(top_builddir)/src/transport/libgnunettransporttesting.la 682 libgnunettransporttesting.la
691 683
692test_plugin_unix_SOURCES = \ 684test_plugin_unix_SOURCES = \
693 test_plugin_transport.c 685 test_plugin_transport.c
694test_plugin_unix_LDADD = \ 686test_plugin_unix_LDADD = \
695 $(top_builddir)/src/transport/libgnunettransport.la \ 687 libgnunettransport.la \
696 $(top_builddir)/src/statistics/libgnunetstatistics.la \ 688 $(top_builddir)/src/statistics/libgnunetstatistics.la \
697 $(top_builddir)/src/hello/libgnunethello.la \ 689 $(top_builddir)/src/hello/libgnunethello.la \
698 $(top_builddir)/src/util/libgnunetutil.la \ 690 $(top_builddir)/src/util/libgnunetutil.la \
699 $(top_builddir)/src/transport/libgnunettransporttesting.la 691 libgnunettransporttesting.la
700 692
701test_plugin_wlan_SOURCES = \ 693test_plugin_wlan_SOURCES = \
702 test_plugin_transport.c 694 test_plugin_transport.c
703test_plugin_wlan_LDADD = \ 695test_plugin_wlan_LDADD = \
704 $(top_builddir)/src/transport/libgnunettransport.la \ 696 libgnunettransport.la \
705 $(top_builddir)/src/statistics/libgnunetstatistics.la \ 697 $(top_builddir)/src/statistics/libgnunetstatistics.la \
706 $(top_builddir)/src/hello/libgnunethello.la \ 698 $(top_builddir)/src/hello/libgnunethello.la \
707 $(top_builddir)/src/util/libgnunetutil.la \ 699 $(top_builddir)/src/util/libgnunetutil.la \
708 $(top_builddir)/src/transport/libgnunettransporttesting.la 700 libgnunettransporttesting.la
709 701
710test_plugin_bluetooth_SOURCES = \ 702test_plugin_bluetooth_SOURCES = \
711 test_plugin_transport.c 703 test_plugin_transport.c
712test_plugin_bluetooth_LDADD = \ 704test_plugin_bluetooth_LDADD = \
713 $(top_builddir)/src/transport/libgnunettransport.la \ 705 libgnunettransport.la \
714 $(top_builddir)/src/statistics/libgnunetstatistics.la \ 706 $(top_builddir)/src/statistics/libgnunetstatistics.la \
715 $(top_builddir)/src/hello/libgnunethello.la \ 707 $(top_builddir)/src/hello/libgnunethello.la \
716 $(top_builddir)/src/util/libgnunetutil.la \ 708 $(top_builddir)/src/util/libgnunetutil.la \
717 $(top_builddir)/src/transport/libgnunettransporttesting.la 709 libgnunettransporttesting.la
718 710
719test_http_common_SOURCES = \ 711test_http_common_SOURCES = \
720 test_http_common.c plugin_transport_http_common.c 712 test_http_common.c plugin_transport_http_common.c
721test_http_common_LDADD = \ 713test_http_common_LDADD = \
722 $(top_builddir)/src/transport/libgnunettransport.la \ 714 libgnunettransport.la \
723 $(top_builddir)/src/statistics/libgnunetstatistics.la \ 715 $(top_builddir)/src/statistics/libgnunetstatistics.la \
724 $(top_builddir)/src/hello/libgnunethello.la \ 716 $(top_builddir)/src/hello/libgnunethello.la \
725 $(top_builddir)/src/util/libgnunetutil.la \ 717 $(top_builddir)/src/util/libgnunetutil.la \
726 $(top_builddir)/src/transport/libgnunettransporttesting.la 718 libgnunettransporttesting.la
727 719
728test_plugin_http_server_SOURCES = \ 720test_plugin_http_server_SOURCES = \
729 test_plugin_transport.c 721 test_plugin_transport.c
730test_plugin_http_server_LDADD = \ 722test_plugin_http_server_LDADD = \
731 $(top_builddir)/src/transport/libgnunettransport.la \ 723 libgnunettransport.la \
732 $(top_builddir)/src/statistics/libgnunetstatistics.la \ 724 $(top_builddir)/src/statistics/libgnunetstatistics.la \
733 $(top_builddir)/src/hello/libgnunethello.la \ 725 $(top_builddir)/src/hello/libgnunethello.la \
734 $(top_builddir)/src/util/libgnunetutil.la \ 726 $(top_builddir)/src/util/libgnunetutil.la \
735 $(top_builddir)/src/transport/libgnunettransporttesting.la 727 libgnunettransporttesting.la
736 728
737test_plugin_https_server_SOURCES = \ 729test_plugin_https_server_SOURCES = \
738 test_plugin_transport.c 730 test_plugin_transport.c
739test_plugin_https_server_LDADD = \ 731test_plugin_https_server_LDADD = \
740 $(top_builddir)/src/transport/libgnunettransport.la \ 732 libgnunettransport.la \
741 $(top_builddir)/src/statistics/libgnunetstatistics.la \ 733 $(top_builddir)/src/statistics/libgnunetstatistics.la \
742 $(top_builddir)/src/hello/libgnunethello.la \ 734 $(top_builddir)/src/hello/libgnunethello.la \
743 $(top_builddir)/src/util/libgnunetutil.la \ 735 $(top_builddir)/src/util/libgnunetutil.la \
744 $(top_builddir)/src/transport/libgnunettransporttesting.la 736 libgnunettransporttesting.la
745 737
746test_plugin_http_client_SOURCES = \ 738test_plugin_http_client_SOURCES = \
747 test_plugin_transport.c 739 test_plugin_transport.c
748test_plugin_http_client_LDADD = \ 740test_plugin_http_client_LDADD = \
749 $(top_builddir)/src/transport/libgnunettransport.la \ 741 libgnunettransport.la \
750 $(top_builddir)/src/statistics/libgnunetstatistics.la \ 742 $(top_builddir)/src/statistics/libgnunetstatistics.la \
751 $(top_builddir)/src/hello/libgnunethello.la \ 743 $(top_builddir)/src/hello/libgnunethello.la \
752 $(top_builddir)/src/util/libgnunetutil.la \ 744 $(top_builddir)/src/util/libgnunetutil.la \
753 $(top_builddir)/src/transport/libgnunettransporttesting.la 745 libgnunettransporttesting.la
754 746
755test_plugin_https_client_SOURCES = \ 747test_plugin_https_client_SOURCES = \
756 test_plugin_transport.c 748 test_plugin_transport.c
757test_plugin_https_client_LDADD = \ 749test_plugin_https_client_LDADD = \
758 $(top_builddir)/src/transport/libgnunettransport.la \ 750 libgnunettransport.la \
759 $(top_builddir)/src/statistics/libgnunetstatistics.la \ 751 $(top_builddir)/src/statistics/libgnunetstatistics.la \
760 $(top_builddir)/src/hello/libgnunethello.la \ 752 $(top_builddir)/src/hello/libgnunethello.la \
761 $(top_builddir)/src/util/libgnunetutil.la \ 753 $(top_builddir)/src/util/libgnunetutil.la \
762 $(top_builddir)/src/transport/libgnunettransporttesting.la 754 libgnunettransporttesting.la
763 755
764test_transport_api_tcp_SOURCES = \ 756test_transport_api_tcp_SOURCES = \
765 test_transport_api.c 757 test_transport_api.c
766test_transport_api_tcp_LDADD = \ 758test_transport_api_tcp_LDADD = \
767 $(top_builddir)/src/transport/libgnunettransport.la \ 759 libgnunettransport.la \
768 $(top_builddir)/src/hello/libgnunethello.la \ 760 $(top_builddir)/src/hello/libgnunethello.la \
769 $(top_builddir)/src/util/libgnunetutil.la \ 761 $(top_builddir)/src/util/libgnunetutil.la \
770 $(top_builddir)/src/transport/libgnunettransporttesting.la 762 libgnunettransporttesting.la
771 763
772test_transport_api_bidirectional_connect_SOURCES = \ 764test_transport_api_bidirectional_connect_SOURCES = \
773 test_transport_api_bidirectional_connect.c 765 test_transport_api_bidirectional_connect.c
774test_transport_api_bidirectional_connect_LDADD = \ 766test_transport_api_bidirectional_connect_LDADD = \
775 $(top_builddir)/src/transport/libgnunettransport.la \ 767 libgnunettransport.la \
776 $(top_builddir)/src/hello/libgnunethello.la \ 768 $(top_builddir)/src/hello/libgnunethello.la \
777 $(top_builddir)/src/util/libgnunetutil.la \ 769 $(top_builddir)/src/util/libgnunetutil.la \
778 $(top_builddir)/src/transport/libgnunettransporttesting.la 770 libgnunettransporttesting.la
779 771
780test_transport_api_restart_1peer_SOURCES = \ 772test_transport_api_restart_1peer_SOURCES = \
781 test_transport_api_restart_1peer.c 773 test_transport_api_restart_1peer.c
782test_transport_api_restart_1peer_LDADD = \ 774test_transport_api_restart_1peer_LDADD = \
783 $(top_builddir)/src/transport/libgnunettransport.la \ 775 libgnunettransport.la \
784 $(top_builddir)/src/hello/libgnunethello.la \ 776 $(top_builddir)/src/hello/libgnunethello.la \
785 $(top_builddir)/src/statistics/libgnunetstatistics.la \ 777 $(top_builddir)/src/statistics/libgnunetstatistics.la \
786 $(top_builddir)/src/util/libgnunetutil.la \ 778 $(top_builddir)/src/util/libgnunetutil.la \
787 $(top_builddir)/src/transport/libgnunettransporttesting.la 779 libgnunettransporttesting.la
788 780
789test_transport_api_restart_2peers_SOURCES = \ 781test_transport_api_restart_2peers_SOURCES = \
790 test_transport_api_restart_2peers.c 782 test_transport_api_restart_2peers.c
791test_transport_api_restart_2peers_LDADD = \ 783test_transport_api_restart_2peers_LDADD = \
792 $(top_builddir)/src/transport/libgnunettransport.la \ 784 libgnunettransport.la \
793 $(top_builddir)/src/hello/libgnunethello.la \ 785 $(top_builddir)/src/hello/libgnunethello.la \
794 $(top_builddir)/src/statistics/libgnunetstatistics.la \ 786 $(top_builddir)/src/statistics/libgnunetstatistics.la \
795 $(top_builddir)/src/util/libgnunetutil.la \ 787 $(top_builddir)/src/util/libgnunetutil.la \
796 $(top_builddir)/src/transport/libgnunettransporttesting.la 788 libgnunettransporttesting.la
797 789
798test_transport_api_limited_sockets_tcp_SOURCES = \ 790test_transport_api_limited_sockets_tcp_SOURCES = \
799 test_transport_api_limited_sockets.c 791 test_transport_api_limited_sockets.c
800test_transport_api_limited_sockets_tcp_LDADD = \ 792test_transport_api_limited_sockets_tcp_LDADD = \
801 $(top_builddir)/src/transport/libgnunettransport.la \ 793 libgnunettransport.la \
802 $(top_builddir)/src/hello/libgnunethello.la \ 794 $(top_builddir)/src/hello/libgnunethello.la \
803 $(top_builddir)/src/util/libgnunetutil.la \ 795 $(top_builddir)/src/util/libgnunetutil.la \
804 $(top_builddir)/src/transport/libgnunettransporttesting.la 796 libgnunettransporttesting.la
805 797
806test_transport_api_tcp_nat_SOURCES = \ 798test_transport_api_tcp_nat_SOURCES = \
807 test_transport_api.c 799 test_transport_api.c
808test_transport_api_tcp_nat_LDADD = \ 800test_transport_api_tcp_nat_LDADD = \
809 $(top_builddir)/src/transport/libgnunettransport.la \ 801 libgnunettransport.la \
810 $(top_builddir)/src/hello/libgnunethello.la \ 802 $(top_builddir)/src/hello/libgnunethello.la \
811 $(top_builddir)/src/util/libgnunetutil.la \ 803 $(top_builddir)/src/util/libgnunetutil.la \
812 $(top_builddir)/src/transport/libgnunettransporttesting.la 804 libgnunettransporttesting.la
813 805
814test_transport_api_manipulation_send_tcp_SOURCES = \ 806test_transport_api_manipulation_send_tcp_SOURCES = \
815 test_transport_api_manipulation_send_tcp.c 807 test_transport_api_manipulation_send_tcp.c
816test_transport_api_manipulation_send_tcp_LDADD = \ 808test_transport_api_manipulation_send_tcp_LDADD = \
817 $(top_builddir)/src/transport/libgnunettransport.la \ 809 libgnunettransport.la \
818 $(top_builddir)/src/hello/libgnunethello.la \ 810 $(top_builddir)/src/hello/libgnunethello.la \
819 $(top_builddir)/src/util/libgnunetutil.la \ 811 $(top_builddir)/src/util/libgnunetutil.la \
820 $(top_builddir)/src/transport/libgnunettransporttesting.la 812 libgnunettransporttesting.la
821 813
822test_transport_api_manipulation_recv_tcp_SOURCES = \ 814test_transport_api_manipulation_recv_tcp_SOURCES = \
823 test_transport_api_manipulation_recv_tcp.c 815 test_transport_api_manipulation_recv_tcp.c
824test_transport_api_manipulation_recv_tcp_LDADD = \ 816test_transport_api_manipulation_recv_tcp_LDADD = \
825 $(top_builddir)/src/transport/libgnunettransport.la \ 817 libgnunettransport.la \
826 $(top_builddir)/src/hello/libgnunethello.la \ 818 $(top_builddir)/src/hello/libgnunethello.la \
827 $(top_builddir)/src/util/libgnunetutil.la \ 819 $(top_builddir)/src/util/libgnunetutil.la \
828 $(top_builddir)/src/transport/libgnunettransporttesting.la 820 libgnunettransporttesting.la
829 821
830test_transport_api_manipulation_cfg_SOURCES = \ 822test_transport_api_manipulation_cfg_SOURCES = \
831 test_transport_api_manipulation_cfg.c 823 test_transport_api_manipulation_cfg.c
832test_transport_api_manipulation_cfg_LDADD = \ 824test_transport_api_manipulation_cfg_LDADD = \
833 $(top_builddir)/src/transport/libgnunettransport.la \ 825 libgnunettransport.la \
834 $(top_builddir)/src/hello/libgnunethello.la \ 826 $(top_builddir)/src/hello/libgnunethello.la \
835 $(top_builddir)/src/util/libgnunetutil.la \ 827 $(top_builddir)/src/util/libgnunetutil.la \
836 $(top_builddir)/src/transport/libgnunettransporttesting.la 828 libgnunettransporttesting.la
837 829
838test_transport_api_reliability_tcp_SOURCES = \ 830test_transport_api_reliability_tcp_SOURCES = \
839 test_transport_api_reliability.c 831 test_transport_api_reliability.c
840test_transport_api_reliability_tcp_LDADD = \ 832test_transport_api_reliability_tcp_LDADD = \
841 $(top_builddir)/src/transport/libgnunettransport.la \ 833 libgnunettransport.la \
842 $(top_builddir)/src/hello/libgnunethello.la \ 834 $(top_builddir)/src/hello/libgnunethello.la \
843 $(top_builddir)/src/util/libgnunetutil.la \ 835 $(top_builddir)/src/util/libgnunetutil.la \
844 $(top_builddir)/src/transport/libgnunettransporttesting.la 836 libgnunettransporttesting.la
845 837
846test_transport_api_timeout_tcp_SOURCES = \ 838test_transport_api_timeout_tcp_SOURCES = \
847 test_transport_api_timeout.c 839 test_transport_api_timeout.c
848test_transport_api_timeout_tcp_LDADD = \ 840test_transport_api_timeout_tcp_LDADD = \
849 $(top_builddir)/src/transport/libgnunettransport.la \ 841 libgnunettransport.la \
850 $(top_builddir)/src/hello/libgnunethello.la \ 842 $(top_builddir)/src/hello/libgnunethello.la \
851 $(top_builddir)/src/util/libgnunetutil.la \ 843 $(top_builddir)/src/util/libgnunetutil.la \
852 $(top_builddir)/src/transport/libgnunettransporttesting.la 844 libgnunettransporttesting.la
853 845
854test_transport_api_timeout_unix_SOURCES = \ 846test_transport_api_timeout_unix_SOURCES = \
855 test_transport_api_timeout.c 847 test_transport_api_timeout.c
856test_transport_api_timeout_unix_LDADD = \ 848test_transport_api_timeout_unix_LDADD = \
857 $(top_builddir)/src/transport/libgnunettransport.la \ 849 libgnunettransport.la \
858 $(top_builddir)/src/hello/libgnunethello.la \ 850 $(top_builddir)/src/hello/libgnunethello.la \
859 $(top_builddir)/src/util/libgnunetutil.la \ 851 $(top_builddir)/src/util/libgnunetutil.la \
860 $(top_builddir)/src/transport/libgnunettransporttesting.la 852 libgnunettransporttesting.la
861 853
862test_transport_api_timeout_wlan_SOURCES = \ 854test_transport_api_timeout_wlan_SOURCES = \
863 test_transport_api_timeout.c 855 test_transport_api_timeout.c
864test_transport_api_timeout_wlan_LDADD = \ 856test_transport_api_timeout_wlan_LDADD = \
865 $(top_builddir)/src/transport/libgnunettransport.la \ 857 libgnunettransport.la \
866 $(top_builddir)/src/hello/libgnunethello.la \ 858 $(top_builddir)/src/hello/libgnunethello.la \
867 $(top_builddir)/src/util/libgnunetutil.la \ 859 $(top_builddir)/src/util/libgnunetutil.la \
868 $(top_builddir)/src/transport/libgnunettransporttesting.la 860 libgnunettransporttesting.la
869 861
870test_transport_api_timeout_bluetooth_SOURCES = \ 862test_transport_api_timeout_bluetooth_SOURCES = \
871 test_transport_api_timeout.c 863 test_transport_api_timeout.c
872test_transport_api_timeout_bluetooth_LDADD = \ 864test_transport_api_timeout_bluetooth_LDADD = \
873 $(top_builddir)/src/transport/libgnunettransport.la \ 865 libgnunettransport.la \
874 $(top_builddir)/src/hello/libgnunethello.la \ 866 $(top_builddir)/src/hello/libgnunethello.la \
875 $(top_builddir)/src/util/libgnunetutil.la \ 867 $(top_builddir)/src/util/libgnunetutil.la \
876 $(top_builddir)/src/transport/libgnunettransporttesting.la 868 libgnunettransporttesting.la
877 869
878test_transport_api_reliability_tcp_nat_SOURCES = \ 870test_transport_api_reliability_tcp_nat_SOURCES = \
879 test_transport_api_reliability.c 871 test_transport_api_reliability.c
880test_transport_api_reliability_tcp_nat_LDADD = \ 872test_transport_api_reliability_tcp_nat_LDADD = \
881 $(top_builddir)/src/transport/libgnunettransport.la \ 873 libgnunettransport.la \
882 $(top_builddir)/src/hello/libgnunethello.la \ 874 $(top_builddir)/src/hello/libgnunethello.la \
883 $(top_builddir)/src/util/libgnunetutil.la \ 875 $(top_builddir)/src/util/libgnunetutil.la \
884 $(top_builddir)/src/transport/libgnunettransporttesting.la 876 libgnunettransporttesting.la
885 877
886test_transport_api_reliability_bluetooth_SOURCES = \ 878test_transport_api_reliability_bluetooth_SOURCES = \
887 test_transport_api_reliability.c 879 test_transport_api_reliability.c
888test_transport_api_reliability_bluetooth_LDADD = \ 880test_transport_api_reliability_bluetooth_LDADD = \
889 $(top_builddir)/src/transport/libgnunettransport.la \ 881 libgnunettransport.la \
890 $(top_builddir)/src/hello/libgnunethello.la \ 882 $(top_builddir)/src/hello/libgnunethello.la \
891 $(top_builddir)/src/util/libgnunetutil.la \ 883 $(top_builddir)/src/util/libgnunetutil.la \
892 $(top_builddir)/src/transport/libgnunettransporttesting.la 884 libgnunettransporttesting.la
893 885
894test_transport_api_reliability_wlan_SOURCES = \ 886test_transport_api_reliability_wlan_SOURCES = \
895 test_transport_api_reliability.c 887 test_transport_api_reliability.c
896test_transport_api_reliability_wlan_LDADD = \ 888test_transport_api_reliability_wlan_LDADD = \
897 $(top_builddir)/src/transport/libgnunettransport.la \ 889 libgnunettransport.la \
898 $(top_builddir)/src/hello/libgnunethello.la \ 890 $(top_builddir)/src/hello/libgnunethello.la \
899 $(top_builddir)/src/util/libgnunetutil.la \ 891 $(top_builddir)/src/util/libgnunetutil.la \
900 $(top_builddir)/src/transport/libgnunettransporttesting.la 892 libgnunettransporttesting.la
901 893
902test_transport_api_udp_SOURCES = \ 894test_transport_api_udp_SOURCES = \
903 test_transport_api.c 895 test_transport_api.c
904test_transport_api_udp_LDADD = \ 896test_transport_api_udp_LDADD = \
905 $(top_builddir)/src/transport/libgnunettransport.la \ 897 libgnunettransport.la \
906 $(top_builddir)/src/hello/libgnunethello.la \ 898 $(top_builddir)/src/hello/libgnunethello.la \
907 $(top_builddir)/src/util/libgnunetutil.la \ 899 $(top_builddir)/src/util/libgnunetutil.la \
908 $(top_builddir)/src/transport/libgnunettransporttesting.la 900 libgnunettransporttesting.la
909 901
910test_transport_api_timeout_udp_SOURCES = \ 902test_transport_api_timeout_udp_SOURCES = \
911 test_transport_api_timeout.c 903 test_transport_api_timeout.c
912test_transport_api_timeout_udp_LDADD = \ 904test_transport_api_timeout_udp_LDADD = \
913 $(top_builddir)/src/transport/libgnunettransport.la \ 905 libgnunettransport.la \
914 $(top_builddir)/src/hello/libgnunethello.la \ 906 $(top_builddir)/src/hello/libgnunethello.la \
915 $(top_builddir)/src/util/libgnunetutil.la \ 907 $(top_builddir)/src/util/libgnunetutil.la \
916 $(top_builddir)/src/transport/libgnunettransporttesting.la 908 libgnunettransporttesting.la
917 909
918test_transport_api_udp_nat_SOURCES = \ 910test_transport_api_udp_nat_SOURCES = \
919 test_transport_api.c 911 test_transport_api.c
920test_transport_api_udp_nat_LDADD = \ 912test_transport_api_udp_nat_LDADD = \
921 $(top_builddir)/src/transport/libgnunettransport.la \ 913 libgnunettransport.la \
922 $(top_builddir)/src/hello/libgnunethello.la \ 914 $(top_builddir)/src/hello/libgnunethello.la \
923 $(top_builddir)/src/util/libgnunetutil.la \ 915 $(top_builddir)/src/util/libgnunetutil.la \
924 $(top_builddir)/src/transport/libgnunettransporttesting.la 916 libgnunettransporttesting.la
925 917
926test_transport_api_unix_SOURCES = \ 918test_transport_api_unix_SOURCES = \
927 test_transport_api.c 919 test_transport_api.c
928test_transport_api_unix_LDADD = \ 920test_transport_api_unix_LDADD = \
929 $(top_builddir)/src/transport/libgnunettransport.la \ 921 libgnunettransport.la \
930 $(top_builddir)/src/hello/libgnunethello.la \ 922 $(top_builddir)/src/hello/libgnunethello.la \
931 $(top_builddir)/src/util/libgnunetutil.la \ 923 $(top_builddir)/src/util/libgnunetutil.la \
932 $(top_builddir)/src/transport/libgnunettransporttesting.la 924 libgnunettransporttesting.la
933 925
934test_transport_api_unix_abstract_SOURCES = \ 926test_transport_api_unix_abstract_SOURCES = \
935 test_transport_api.c 927 test_transport_api.c
936test_transport_api_unix_abstract_LDADD = \ 928test_transport_api_unix_abstract_LDADD = \
937 $(top_builddir)/src/transport/libgnunettransport.la \ 929 libgnunettransport.la \
938 $(top_builddir)/src/hello/libgnunethello.la \ 930 $(top_builddir)/src/hello/libgnunethello.la \
939 $(top_builddir)/src/util/libgnunetutil.la \ 931 $(top_builddir)/src/util/libgnunetutil.la \
940 $(top_builddir)/src/transport/libgnunettransporttesting.la 932 libgnunettransporttesting.la
941 933
942# HTTP tests 934# HTTP tests
943test_transport_api_http_SOURCES = \ 935test_transport_api_http_SOURCES = \
944 test_transport_api.c 936 test_transport_api.c
945test_transport_api_http_LDADD = \ 937test_transport_api_http_LDADD = \
946 $(top_builddir)/src/transport/libgnunettransport.la \ 938 libgnunettransport.la \
947 $(top_builddir)/src/hello/libgnunethello.la \ 939 $(top_builddir)/src/hello/libgnunethello.la \
948 $(top_builddir)/src/util/libgnunetutil.la \ 940 $(top_builddir)/src/util/libgnunetutil.la \
949 $(top_builddir)/src/transport/libgnunettransporttesting.la 941 libgnunettransporttesting.la
950 942
951test_transport_api_http_reverse_SOURCES = \ 943test_transport_api_http_reverse_SOURCES = \
952 test_transport_api.c 944 test_transport_api.c
953test_transport_api_http_reverse_LDADD = \ 945test_transport_api_http_reverse_LDADD = \
954 $(top_builddir)/src/transport/libgnunettransport.la \ 946 libgnunettransport.la \
955 $(top_builddir)/src/hello/libgnunethello.la \ 947 $(top_builddir)/src/hello/libgnunethello.la \
956 $(top_builddir)/src/util/libgnunetutil.la \ 948 $(top_builddir)/src/util/libgnunetutil.la \
957 $(top_builddir)/src/transport/libgnunettransporttesting.la 949 libgnunettransporttesting.la
958 950
959test_transport_api_timeout_http_SOURCES = \ 951test_transport_api_timeout_http_SOURCES = \
960 test_transport_api_timeout.c 952 test_transport_api_timeout.c
961test_transport_api_timeout_http_LDADD = \ 953test_transport_api_timeout_http_LDADD = \
962 $(top_builddir)/src/transport/libgnunettransport.la \ 954 libgnunettransport.la \
963 $(top_builddir)/src/hello/libgnunethello.la \ 955 $(top_builddir)/src/hello/libgnunethello.la \
964 $(top_builddir)/src/util/libgnunetutil.la \ 956 $(top_builddir)/src/util/libgnunetutil.la \
965 $(top_builddir)/src/transport/libgnunettransporttesting.la 957 libgnunettransporttesting.la
966 958
967test_transport_api_reliability_http_SOURCES = \ 959test_transport_api_reliability_http_SOURCES = \
968 test_transport_api_reliability.c 960 test_transport_api_reliability.c
969test_transport_api_reliability_http_LDADD = \ 961test_transport_api_reliability_http_LDADD = \
970 $(top_builddir)/src/transport/libgnunettransport.la \ 962 libgnunettransport.la \
971 $(top_builddir)/src/hello/libgnunethello.la \ 963 $(top_builddir)/src/hello/libgnunethello.la \
972 $(top_builddir)/src/util/libgnunetutil.la \ 964 $(top_builddir)/src/util/libgnunetutil.la \
973 $(top_builddir)/src/transport/libgnunettransporttesting.la 965 libgnunettransporttesting.la
974 966
975test_transport_api_reliability_http_xhr_SOURCES = \ 967test_transport_api_reliability_http_xhr_SOURCES = \
976 test_transport_api_reliability.c 968 test_transport_api_reliability.c
977test_transport_api_reliability_http_xhr_LDADD = \ 969test_transport_api_reliability_http_xhr_LDADD = \
978 $(top_builddir)/src/transport/libgnunettransport.la \ 970 libgnunettransport.la \
979 $(top_builddir)/src/hello/libgnunethello.la \ 971 $(top_builddir)/src/hello/libgnunethello.la \
980 $(top_builddir)/src/util/libgnunetutil.la \ 972 $(top_builddir)/src/util/libgnunetutil.la \
981 $(top_builddir)/src/transport/libgnunettransporttesting.la 973 libgnunettransporttesting.la
982 974
983test_quota_compliance_http_SOURCES = \ 975test_quota_compliance_http_SOURCES = \
984 test_quota_compliance.c 976 test_quota_compliance.c
985test_quota_compliance_http_LDADD = \ 977test_quota_compliance_http_LDADD = \
986 $(top_builddir)/src/transport/libgnunettransport.la \ 978 libgnunettransport.la \
987 $(top_builddir)/src/hello/libgnunethello.la \ 979 $(top_builddir)/src/hello/libgnunethello.la \
988 $(top_builddir)/src/util/libgnunetutil.la \ 980 $(top_builddir)/src/util/libgnunetutil.la \
989 $(top_builddir)/src/transport/libgnunettransporttesting.la 981 libgnunettransporttesting.la
990 982
991test_quota_compliance_http_asymmetric_SOURCES = \ 983test_quota_compliance_http_asymmetric_SOURCES = \
992 test_quota_compliance.c 984 test_quota_compliance.c
993test_quota_compliance_http_asymmetric_LDADD = \ 985test_quota_compliance_http_asymmetric_LDADD = \
994 $(top_builddir)/src/transport/libgnunettransport.la \ 986 libgnunettransport.la \
995 $(top_builddir)/src/hello/libgnunethello.la \ 987 $(top_builddir)/src/hello/libgnunethello.la \
996 $(top_builddir)/src/util/libgnunetutil.la \ 988 $(top_builddir)/src/util/libgnunetutil.la \
997 $(top_builddir)/src/transport/libgnunettransporttesting.la 989 libgnunettransporttesting.la
998 990
999test_quota_compliance_https_SOURCES = \ 991test_quota_compliance_https_SOURCES = \
1000 test_quota_compliance.c 992 test_quota_compliance.c
1001test_quota_compliance_https_LDADD = \ 993test_quota_compliance_https_LDADD = \
1002 $(top_builddir)/src/transport/libgnunettransport.la \ 994 libgnunettransport.la \
1003 $(top_builddir)/src/hello/libgnunethello.la \ 995 $(top_builddir)/src/hello/libgnunethello.la \
1004 $(top_builddir)/src/util/libgnunetutil.la \ 996 $(top_builddir)/src/util/libgnunetutil.la \
1005 $(top_builddir)/src/transport/libgnunettransporttesting.la 997 libgnunettransporttesting.la
1006 998
1007test_quota_compliance_https_asymmetric_SOURCES = \ 999test_quota_compliance_https_asymmetric_SOURCES = \
1008 test_quota_compliance.c 1000 test_quota_compliance.c
1009test_quota_compliance_https_asymmetric_LDADD = \ 1001test_quota_compliance_https_asymmetric_LDADD = \
1010 $(top_builddir)/src/transport/libgnunettransport.la \ 1002 libgnunettransport.la \
1011 $(top_builddir)/src/hello/libgnunethello.la \ 1003 $(top_builddir)/src/hello/libgnunethello.la \
1012 $(top_builddir)/src/util/libgnunetutil.la \ 1004 $(top_builddir)/src/util/libgnunetutil.la \
1013 $(top_builddir)/src/transport/libgnunettransporttesting.la 1005 libgnunettransporttesting.la
1014 1006
1015# HTTPS tests 1007# HTTPS tests
1016test_transport_api_https_SOURCES = \ 1008test_transport_api_https_SOURCES = \
1017 test_transport_api.c 1009 test_transport_api.c
1018test_transport_api_https_LDADD = \ 1010test_transport_api_https_LDADD = \
1019 $(top_builddir)/src/transport/libgnunettransport.la \ 1011 libgnunettransport.la \
1020 $(top_builddir)/src/hello/libgnunethello.la \ 1012 $(top_builddir)/src/hello/libgnunethello.la \
1021 $(top_builddir)/src/util/libgnunetutil.la \ 1013 $(top_builddir)/src/util/libgnunetutil.la \
1022 $(top_builddir)/src/transport/libgnunettransporttesting.la 1014 libgnunettransporttesting.la
1023 1015
1024test_transport_api_timeout_https_SOURCES = \ 1016test_transport_api_timeout_https_SOURCES = \
1025 test_transport_api_timeout.c 1017 test_transport_api_timeout.c
1026test_transport_api_timeout_https_LDADD = \ 1018test_transport_api_timeout_https_LDADD = \
1027 $(top_builddir)/src/transport/libgnunettransport.la \ 1019 libgnunettransport.la \
1028 $(top_builddir)/src/hello/libgnunethello.la \ 1020 $(top_builddir)/src/hello/libgnunethello.la \
1029 $(top_builddir)/src/util/libgnunetutil.la \ 1021 $(top_builddir)/src/util/libgnunetutil.la \
1030 $(top_builddir)/src/transport/libgnunettransporttesting.la 1022 libgnunettransporttesting.la
1031 1023
1032 1024
1033test_transport_api_reliability_https_SOURCES = \ 1025test_transport_api_reliability_https_SOURCES = \
1034 test_transport_api_reliability.c 1026 test_transport_api_reliability.c
1035test_transport_api_reliability_https_LDADD = \ 1027test_transport_api_reliability_https_LDADD = \
1036 $(top_builddir)/src/transport/libgnunettransport.la \ 1028 libgnunettransport.la \
1037 $(top_builddir)/src/hello/libgnunethello.la \ 1029 $(top_builddir)/src/hello/libgnunethello.la \
1038 $(top_builddir)/src/util/libgnunetutil.la \ 1030 $(top_builddir)/src/util/libgnunetutil.la \
1039 $(top_builddir)/src/transport/libgnunettransporttesting.la 1031 libgnunettransporttesting.la
1040 1032
1041test_transport_api_reliability_https_xhr_SOURCES = \ 1033test_transport_api_reliability_https_xhr_SOURCES = \
1042 test_transport_api_reliability.c 1034 test_transport_api_reliability.c
1043test_transport_api_reliability_https_xhr_LDADD = \ 1035test_transport_api_reliability_https_xhr_LDADD = \
1044 $(top_builddir)/src/transport/libgnunettransport.la \ 1036 libgnunettransport.la \
1045 $(top_builddir)/src/hello/libgnunethello.la \ 1037 $(top_builddir)/src/hello/libgnunethello.la \
1046 $(top_builddir)/src/util/libgnunetutil.la \ 1038 $(top_builddir)/src/util/libgnunetutil.la \
1047 $(top_builddir)/src/transport/libgnunettransporttesting.la 1039 libgnunettransporttesting.la
1048 1040
1049test_transport_api_reliability_unix_SOURCES = \ 1041test_transport_api_reliability_unix_SOURCES = \
1050 test_transport_api_reliability.c 1042 test_transport_api_reliability.c
1051test_transport_api_reliability_unix_LDADD = \ 1043test_transport_api_reliability_unix_LDADD = \
1052 $(top_builddir)/src/transport/libgnunettransport.la \ 1044 libgnunettransport.la \
1053 $(top_builddir)/src/hello/libgnunethello.la \ 1045 $(top_builddir)/src/hello/libgnunethello.la \
1054 $(top_builddir)/src/util/libgnunetutil.la \ 1046 $(top_builddir)/src/util/libgnunetutil.la \
1055 $(top_builddir)/src/transport/libgnunettransporttesting.la 1047 libgnunettransporttesting.la
1056 1048
1057test_transport_api_reliability_udp_SOURCES = \ 1049test_transport_api_reliability_udp_SOURCES = \
1058 test_transport_api_reliability.c 1050 test_transport_api_reliability.c
1059test_transport_api_reliability_udp_LDADD = \ 1051test_transport_api_reliability_udp_LDADD = \
1060 $(top_builddir)/src/transport/libgnunettransport.la \ 1052 libgnunettransport.la \
1061 $(top_builddir)/src/hello/libgnunethello.la \ 1053 $(top_builddir)/src/hello/libgnunethello.la \
1062 $(top_builddir)/src/util/libgnunetutil.la \ 1054 $(top_builddir)/src/util/libgnunetutil.la \
1063 $(top_builddir)/src/transport/libgnunettransporttesting.la 1055 libgnunettransporttesting.la
1064 1056
1065if LINUX 1057if LINUX
1066test_transport_api_wlan_SOURCES = \ 1058test_transport_api_wlan_SOURCES = \
1067 test_transport_api.c 1059 test_transport_api.c
1068test_transport_api_wlan_LDADD = \ 1060test_transport_api_wlan_LDADD = \
1069 $(top_builddir)/src/transport/libgnunettransport.la \ 1061 libgnunettransport.la \
1070 $(top_builddir)/src/hello/libgnunethello.la \ 1062 $(top_builddir)/src/hello/libgnunethello.la \
1071 $(top_builddir)/src/util/libgnunetutil.la \ 1063 $(top_builddir)/src/util/libgnunetutil.la \
1072 $(top_builddir)/src/transport/libgnunettransporttesting.la 1064 libgnunettransporttesting.la
1073endif 1065endif
1074 1066
1075if LINUX 1067if LINUX
@@ -1077,146 +1069,146 @@ if HAVE_LIBBLUETOOTH
1077test_transport_api_bluetooth_SOURCES = \ 1069test_transport_api_bluetooth_SOURCES = \
1078 test_transport_api.c 1070 test_transport_api.c
1079test_transport_api_bluetooth_LDADD = \ 1071test_transport_api_bluetooth_LDADD = \
1080 $(top_builddir)/src/transport/libgnunettransport.la \ 1072 libgnunettransport.la \
1081 $(top_builddir)/src/hello/libgnunethello.la \ 1073 $(top_builddir)/src/hello/libgnunethello.la \
1082 $(top_builddir)/src/util/libgnunetutil.la \ 1074 $(top_builddir)/src/util/libgnunetutil.la \
1083 $(top_builddir)/src/transport/libgnunettransporttesting.la 1075 libgnunettransporttesting.la
1084endif 1076endif
1085endif 1077endif
1086 1078
1087test_transport_address_switch_tcp_SOURCES = \ 1079test_transport_address_switch_tcp_SOURCES = \
1088 test_transport_address_switch.c 1080 test_transport_address_switch.c
1089test_transport_address_switch_tcp_LDADD = \ 1081test_transport_address_switch_tcp_LDADD = \
1090 $(top_builddir)/src/transport/libgnunettransport.la \ 1082 libgnunettransport.la \
1091 $(top_builddir)/src/hello/libgnunethello.la \ 1083 $(top_builddir)/src/hello/libgnunethello.la \
1092 $(top_builddir)/src/statistics/libgnunetstatistics.la \ 1084 $(top_builddir)/src/statistics/libgnunetstatistics.la \
1093 $(top_builddir)/src/util/libgnunetutil.la \ 1085 $(top_builddir)/src/util/libgnunetutil.la \
1094 $(top_builddir)/src/transport/libgnunettransporttesting.la 1086 libgnunettransporttesting.la
1095 1087
1096 test_transport_address_switch_udp_SOURCES = \ 1088 test_transport_address_switch_udp_SOURCES = \
1097 test_transport_address_switch.c 1089 test_transport_address_switch.c
1098test_transport_address_switch_udp_LDADD = \ 1090test_transport_address_switch_udp_LDADD = \
1099 $(top_builddir)/src/transport/libgnunettransport.la \ 1091 libgnunettransport.la \
1100 $(top_builddir)/src/hello/libgnunethello.la \ 1092 $(top_builddir)/src/hello/libgnunethello.la \
1101 $(top_builddir)/src/statistics/libgnunetstatistics.la \ 1093 $(top_builddir)/src/statistics/libgnunetstatistics.la \
1102 $(top_builddir)/src/util/libgnunetutil.la \ 1094 $(top_builddir)/src/util/libgnunetutil.la \
1103 $(top_builddir)/src/transport/libgnunettransporttesting.la 1095 libgnunettransporttesting.la
1104 1096
1105 1097
1106 test_transport_address_switch_http_SOURCES = \ 1098 test_transport_address_switch_http_SOURCES = \
1107 test_transport_address_switch.c 1099 test_transport_address_switch.c
1108test_transport_address_switch_http_LDADD = \ 1100test_transport_address_switch_http_LDADD = \
1109 $(top_builddir)/src/transport/libgnunettransport.la \ 1101 libgnunettransport.la \
1110 $(top_builddir)/src/hello/libgnunethello.la \ 1102 $(top_builddir)/src/hello/libgnunethello.la \
1111 $(top_builddir)/src/statistics/libgnunetstatistics.la \ 1103 $(top_builddir)/src/statistics/libgnunetstatistics.la \
1112 $(top_builddir)/src/util/libgnunetutil.la \ 1104 $(top_builddir)/src/util/libgnunetutil.la \
1113 $(top_builddir)/src/transport/libgnunettransporttesting.la 1105 libgnunettransporttesting.la
1114 1106
1115 test_transport_address_switch_https_SOURCES = \ 1107 test_transport_address_switch_https_SOURCES = \
1116 test_transport_address_switch.c 1108 test_transport_address_switch.c
1117test_transport_address_switch_https_LDADD = \ 1109test_transport_address_switch_https_LDADD = \
1118 $(top_builddir)/src/transport/libgnunettransport.la \ 1110 libgnunettransport.la \
1119 $(top_builddir)/src/hello/libgnunethello.la \ 1111 $(top_builddir)/src/hello/libgnunethello.la \
1120 $(top_builddir)/src/statistics/libgnunetstatistics.la \ 1112 $(top_builddir)/src/statistics/libgnunetstatistics.la \
1121 $(top_builddir)/src/util/libgnunetutil.la \ 1113 $(top_builddir)/src/util/libgnunetutil.la \
1122 $(top_builddir)/src/transport/libgnunettransporttesting.la 1114 libgnunettransporttesting.la
1123 1115
1124test_quota_compliance_tcp_SOURCES = \ 1116test_quota_compliance_tcp_SOURCES = \
1125 test_quota_compliance.c 1117 test_quota_compliance.c
1126test_quota_compliance_tcp_LDADD = \ 1118test_quota_compliance_tcp_LDADD = \
1127 $(top_builddir)/src/transport/libgnunettransport.la \ 1119 libgnunettransport.la \
1128 $(top_builddir)/src/hello/libgnunethello.la \ 1120 $(top_builddir)/src/hello/libgnunethello.la \
1129 $(top_builddir)/src/util/libgnunetutil.la \ 1121 $(top_builddir)/src/util/libgnunetutil.la \
1130 $(top_builddir)/src/transport/libgnunettransporttesting.la 1122 libgnunettransporttesting.la
1131 1123
1132test_quota_compliance_tcp_asymmetric_SOURCES = \ 1124test_quota_compliance_tcp_asymmetric_SOURCES = \
1133 test_quota_compliance.c 1125 test_quota_compliance.c
1134test_quota_compliance_tcp_asymmetric_LDADD = \ 1126test_quota_compliance_tcp_asymmetric_LDADD = \
1135 $(top_builddir)/src/transport/libgnunettransport.la \ 1127 libgnunettransport.la \
1136 $(top_builddir)/src/hello/libgnunethello.la \ 1128 $(top_builddir)/src/hello/libgnunethello.la \
1137 $(top_builddir)/src/util/libgnunetutil.la \ 1129 $(top_builddir)/src/util/libgnunetutil.la \
1138 $(top_builddir)/src/transport/libgnunettransporttesting.la 1130 libgnunettransporttesting.la
1139 1131
1140test_quota_compliance_udp_SOURCES = \ 1132test_quota_compliance_udp_SOURCES = \
1141 test_quota_compliance.c 1133 test_quota_compliance.c
1142test_quota_compliance_udp_LDADD = \ 1134test_quota_compliance_udp_LDADD = \
1143 $(top_builddir)/src/transport/libgnunettransport.la \ 1135 libgnunettransport.la \
1144 $(top_builddir)/src/hello/libgnunethello.la \ 1136 $(top_builddir)/src/hello/libgnunethello.la \
1145 $(top_builddir)/src/util/libgnunetutil.la \ 1137 $(top_builddir)/src/util/libgnunetutil.la \
1146 $(top_builddir)/src/transport/libgnunettransporttesting.la 1138 libgnunettransporttesting.la
1147 1139
1148test_quota_compliance_unix_SOURCES = \ 1140test_quota_compliance_unix_SOURCES = \
1149 test_quota_compliance.c 1141 test_quota_compliance.c
1150test_quota_compliance_unix_LDADD = \ 1142test_quota_compliance_unix_LDADD = \
1151 $(top_builddir)/src/transport/libgnunettransport.la \ 1143 libgnunettransport.la \
1152 $(top_builddir)/src/hello/libgnunethello.la \ 1144 $(top_builddir)/src/hello/libgnunethello.la \
1153 $(top_builddir)/src/util/libgnunetutil.la \ 1145 $(top_builddir)/src/util/libgnunetutil.la \
1154 $(top_builddir)/src/transport/libgnunettransporttesting.la 1146 libgnunettransporttesting.la
1155 1147
1156test_quota_compliance_unix_asymmetric_SOURCES = \ 1148test_quota_compliance_unix_asymmetric_SOURCES = \
1157 test_quota_compliance.c 1149 test_quota_compliance.c
1158test_quota_compliance_unix_asymmetric_LDADD = \ 1150test_quota_compliance_unix_asymmetric_LDADD = \
1159 $(top_builddir)/src/transport/libgnunettransport.la \ 1151 libgnunettransport.la \
1160 $(top_builddir)/src/hello/libgnunethello.la \ 1152 $(top_builddir)/src/hello/libgnunethello.la \
1161 $(top_builddir)/src/util/libgnunetutil.la \ 1153 $(top_builddir)/src/util/libgnunetutil.la \
1162 $(top_builddir)/src/transport/libgnunettransporttesting.la 1154 libgnunettransporttesting.la
1163 1155
1164test_quota_compliance_wlan_SOURCES = \ 1156test_quota_compliance_wlan_SOURCES = \
1165 test_quota_compliance.c 1157 test_quota_compliance.c
1166test_quota_compliance_wlan_LDADD = \ 1158test_quota_compliance_wlan_LDADD = \
1167 $(top_builddir)/src/transport/libgnunettransport.la \ 1159 libgnunettransport.la \
1168 $(top_builddir)/src/hello/libgnunethello.la \ 1160 $(top_builddir)/src/hello/libgnunethello.la \
1169 $(top_builddir)/src/util/libgnunetutil.la \ 1161 $(top_builddir)/src/util/libgnunetutil.la \
1170 $(top_builddir)/src/transport/libgnunettransporttesting.la 1162 libgnunettransporttesting.la
1171 1163
1172test_quota_compliance_wlan_asymmetric_SOURCES = \ 1164test_quota_compliance_wlan_asymmetric_SOURCES = \
1173 test_quota_compliance.c 1165 test_quota_compliance.c
1174test_quota_compliance_wlan_asymmetric_LDADD = \ 1166test_quota_compliance_wlan_asymmetric_LDADD = \
1175 $(top_builddir)/src/transport/libgnunettransport.la \ 1167 libgnunettransport.la \
1176 $(top_builddir)/src/hello/libgnunethello.la \ 1168 $(top_builddir)/src/hello/libgnunethello.la \
1177 $(top_builddir)/src/util/libgnunetutil.la \ 1169 $(top_builddir)/src/util/libgnunetutil.la \
1178 $(top_builddir)/src/transport/libgnunettransporttesting.la 1170 libgnunettransporttesting.la
1179 1171
1180test_quota_compliance_bluetooth_SOURCES = \ 1172test_quota_compliance_bluetooth_SOURCES = \
1181 test_quota_compliance.c 1173 test_quota_compliance.c
1182test_quota_compliance_bluetooth_LDADD = \ 1174test_quota_compliance_bluetooth_LDADD = \
1183 $(top_builddir)/src/nat/libgnunetnat.la \ 1175 $(top_builddir)/src/nat/libgnunetnat.la \
1184 $(top_builddir)/src/transport/libgnunettransport.la \ 1176 libgnunettransport.la \
1185 $(top_builddir)/src/hello/libgnunethello.la \ 1177 $(top_builddir)/src/hello/libgnunethello.la \
1186 $(top_builddir)/src/util/libgnunetutil.la \ 1178 $(top_builddir)/src/util/libgnunetutil.la \
1187 $(top_builddir)/src/transport/libgnunettransporttesting.la 1179 libgnunettransporttesting.la
1188 1180
1189test_quota_compliance_bluetooth_asymmetric_SOURCES = \ 1181test_quota_compliance_bluetooth_asymmetric_SOURCES = \
1190 test_quota_compliance.c 1182 test_quota_compliance.c
1191test_quota_compliance_bluetooth_asymmetric_LDADD = \ 1183test_quota_compliance_bluetooth_asymmetric_LDADD = \
1192 $(top_builddir)/src/transport/libgnunettransport.la \ 1184 libgnunettransport.la \
1193 $(top_builddir)/src/hello/libgnunethello.la \ 1185 $(top_builddir)/src/hello/libgnunethello.la \
1194 $(top_builddir)/src/util/libgnunetutil.la \ 1186 $(top_builddir)/src/util/libgnunetutil.la \
1195 $(top_builddir)/src/transport/libgnunettransporttesting.la 1187 libgnunettransporttesting.la
1196 1188
1197test_transport_api_multi_SOURCES = \ 1189test_transport_api_multi_SOURCES = \
1198 test_transport_api.c 1190 test_transport_api.c
1199test_transport_api_multi_LDADD = \ 1191test_transport_api_multi_LDADD = \
1200 $(top_builddir)/src/transport/libgnunettransport.la \ 1192 libgnunettransport.la \
1201 $(top_builddir)/src/hello/libgnunethello.la \ 1193 $(top_builddir)/src/hello/libgnunethello.la \
1202 $(top_builddir)/src/util/libgnunetutil.la \ 1194 $(top_builddir)/src/util/libgnunetutil.la \
1203 $(top_builddir)/src/transport/libgnunettransporttesting.la 1195 libgnunettransporttesting.la
1204 1196
1205test_transport_api_monitor_peers_SOURCES = \ 1197test_transport_api_monitor_peers_SOURCES = \
1206 test_transport_api_monitor_peers.c 1198 test_transport_api_monitor_peers.c
1207test_transport_api_monitor_peers_LDADD = \ 1199test_transport_api_monitor_peers_LDADD = \
1208 $(top_builddir)/src/transport/libgnunettransport.la \ 1200 libgnunettransport.la \
1209 $(top_builddir)/src/hello/libgnunethello.la \ 1201 $(top_builddir)/src/hello/libgnunethello.la \
1210 $(top_builddir)/src/util/libgnunetutil.la \ 1202 $(top_builddir)/src/util/libgnunetutil.la \
1211 $(top_builddir)/src/transport/libgnunettransporttesting.la 1203 libgnunettransporttesting.la
1212 1204
1213test_transport_api_monitor_validation_SOURCES = \ 1205test_transport_api_monitor_validation_SOURCES = \
1214 test_transport_api_monitor_validation.c 1206 test_transport_api_monitor_validation.c
1215test_transport_api_monitor_validation_LDADD = \ 1207test_transport_api_monitor_validation_LDADD = \
1216 $(top_builddir)/src/transport/libgnunettransport.la \ 1208 libgnunettransport.la \
1217 $(top_builddir)/src/hello/libgnunethello.la \ 1209 $(top_builddir)/src/hello/libgnunethello.la \
1218 $(top_builddir)/src/util/libgnunetutil.la \ 1210 $(top_builddir)/src/util/libgnunetutil.la \
1219 $(top_builddir)/src/transport/libgnunettransporttesting.la 1211 libgnunettransporttesting.la
1220 1212
1221 1213
1222EXTRA_DIST = \ 1214EXTRA_DIST = \
diff --git a/src/tun/Makefile.am b/src/tun/Makefile.am
index 1b42e53ec..e3e31d785 100644
--- a/src/tun/Makefile.am
+++ b/src/tun/Makefile.am
@@ -35,11 +35,11 @@ test_tun_SOURCES = \
35 test_tun.c 35 test_tun.c
36test_tun_LDADD = \ 36test_tun_LDADD = \
37 $(top_builddir)/src/util/libgnunetutil.la \ 37 $(top_builddir)/src/util/libgnunetutil.la \
38 $(top_builddir)/src/tun/libgnunettun.la 38 libgnunettun.la
39 39
40 40
41test_regex_SOURCES = \ 41test_regex_SOURCES = \
42 test_regex.c 42 test_regex.c
43test_regex_LDADD = \ 43test_regex_LDADD = \
44 $(top_builddir)/src/util/libgnunetutil.la \ 44 $(top_builddir)/src/util/libgnunetutil.la \
45 $(top_builddir)/src/tun/libgnunettun.la 45 libgnunettun.la
diff --git a/src/util/Makefile.am b/src/util/Makefile.am
index 3d0632258..6aa32db08 100644
--- a/src/util/Makefile.am
+++ b/src/util/Makefile.am
@@ -43,9 +43,7 @@ gnunet_helper_w32_console_SOURCES = \
43 gnunet-helper-w32-console.c \ 43 gnunet-helper-w32-console.c \
44 gnunet-helper-w32-console.h 44 gnunet-helper-w32-console.h
45gnunet_helper_w32_console_LDADD = \ 45gnunet_helper_w32_console_LDADD = \
46 $(top_builddir)/src/util/libgnunetutil.la 46 libgnunetutil.la
47gnunet_helper_w32_console_DEPENDENCIES = \
48 libgnunetutil.la
49 47
50noinst_PROGRAMS = \ 48noinst_PROGRAMS = \
51 gnunet-config-diff \ 49 gnunet-config-diff \
@@ -56,15 +54,11 @@ noinst_PROGRAMS = \
56gnunet_config_diff_SOURCES = \ 54gnunet_config_diff_SOURCES = \
57 gnunet-config-diff.c 55 gnunet-config-diff.c
58gnunet_config_diff_LDADD = \ 56gnunet_config_diff_LDADD = \
59 $(top_builddir)/src/util/libgnunetutil.la
60gnunet_config_diff_DEPENDENCIES = \
61 libgnunetutil.la 57 libgnunetutil.la
62 58
63test_common_logging_dummy_SOURCES = \ 59test_common_logging_dummy_SOURCES = \
64 test_common_logging_dummy.c 60 test_common_logging_dummy.c
65test_common_logging_dummy_LDADD = \ 61test_common_logging_dummy_LDADD = \
66 $(top_builddir)/src/util/libgnunetutil.la
67test_common_logging_dummy_DEPENDENCIES = \
68 libgnunetutil.la 62 libgnunetutil.la
69 63
70lib_LTLIBRARIES = libgnunetutil.la 64lib_LTLIBRARIES = libgnunetutil.la
@@ -161,54 +155,42 @@ gnunet-qr: gnunet-qr.py.in Makefile
161gnunet_service_resolver_SOURCES = \ 155gnunet_service_resolver_SOURCES = \
162 gnunet-service-resolver.c 156 gnunet-service-resolver.c
163gnunet_service_resolver_LDADD = \ 157gnunet_service_resolver_LDADD = \
164 $(top_builddir)/src/util/libgnunetutil.la \ 158 libgnunetutil.la \
165 $(GN_LIBINTL) 159 $(GN_LIBINTL)
166gnunet_service_resolver_DEPENDENCIES = \
167 libgnunetutil.la
168 160
169 161
170gnunet_resolver_SOURCES = \ 162gnunet_resolver_SOURCES = \
171 gnunet-resolver.c 163 gnunet-resolver.c
172gnunet_resolver_LDADD = \ 164gnunet_resolver_LDADD = \
173 $(top_builddir)/src/util/libgnunetutil.la \ 165 libgnunetutil.la \
174 $(GN_LIBINTL) 166 $(GN_LIBINTL)
175gnunet_resolver_DEPENDENCIES = \
176 libgnunetutil.la
177 167
178 168
179gnunet_ecc_SOURCES = \ 169gnunet_ecc_SOURCES = \
180 gnunet-ecc.c 170 gnunet-ecc.c
181gnunet_ecc_LDADD = \ 171gnunet_ecc_LDADD = \
182 $(top_builddir)/src/util/libgnunetutil.la \ 172 libgnunetutil.la \
183 $(GN_LIBINTL) -lgcrypt 173 $(GN_LIBINTL) -lgcrypt
184gnunet_ecc_DEPENDENCIES = \
185 libgnunetutil.la
186 174
187gnunet_scrypt_SOURCES = \ 175gnunet_scrypt_SOURCES = \
188 gnunet-scrypt.c 176 gnunet-scrypt.c
189gnunet_scrypt_LDADD = \ 177gnunet_scrypt_LDADD = \
190 $(top_builddir)/src/util/libgnunetutil.la \ 178 libgnunetutil.la \
191 $(GN_LIBINTL) -lgcrypt 179 $(GN_LIBINTL) -lgcrypt
192gnunet_scrypt_DEPENDENCIES = \
193 libgnunetutil.la
194 180
195 181
196gnunet_config_SOURCES = \ 182gnunet_config_SOURCES = \
197 gnunet-config.c 183 gnunet-config.c
198gnunet_config_LDADD = \ 184gnunet_config_LDADD = \
199 $(top_builddir)/src/util/libgnunetutil.la \ 185 libgnunetutil.la \
200 $(GN_LIBINTL) 186 $(GN_LIBINTL)
201gnunet_config_DEPENDENCIES = \
202 libgnunetutil.la
203 187
204 188
205gnunet_uri_SOURCES = \ 189gnunet_uri_SOURCES = \
206 gnunet-uri.c 190 gnunet-uri.c
207gnunet_uri_LDADD = \ 191gnunet_uri_LDADD = \
208 $(top_builddir)/src/util/libgnunetutil.la \ 192 libgnunetutil.la \
209 $(GN_LIBINTL) 193 $(GN_LIBINTL)
210gnunet_uri_DEPENDENCIES = \
211 libgnunetutil.la
212 194
213plugin_LTLIBRARIES = \ 195plugin_LTLIBRARIES = \
214 libgnunet_plugin_test.la 196 libgnunet_plugin_test.la
@@ -303,282 +285,283 @@ test_server_mst_interrupt.log: test_server_with_client.log
303test_bio_SOURCES = \ 285test_bio_SOURCES = \
304 test_bio.c 286 test_bio.c
305test_bio_LDADD = \ 287test_bio_LDADD = \
306 $(top_builddir)/src/util/libgnunetutil.la 288 libgnunetutil.la
307 289
308 290
309test_os_start_process_SOURCES = \ 291test_os_start_process_SOURCES = \
310 test_os_start_process.c 292 test_os_start_process.c
311test_os_start_process_LDADD = \ 293test_os_start_process_LDADD = \
312 $(top_builddir)/src/util/libgnunetutil.la 294 libgnunetutil.la
313test_os_start_process_DEPENDENCIES = \ 295test_os_start_process_DEPENDENCIES = \
296 libgnunetutil.la \
314 $(WINCAT) 297 $(WINCAT)
315 298
316test_client_nc_SOURCES = \ 299test_client_nc_SOURCES = \
317 test_client.c 300 test_client.c
318test_client_nc_LDADD = \ 301test_client_nc_LDADD = \
319 $(top_builddir)/src/util/libgnunetutil.la 302 libgnunetutil.la
320 303
321test_common_allocation_SOURCES = \ 304test_common_allocation_SOURCES = \
322 test_common_allocation.c 305 test_common_allocation.c
323test_common_allocation_LDADD = \ 306test_common_allocation_LDADD = \
324 $(top_builddir)/src/util/libgnunetutil.la 307 libgnunetutil.la
325 308
326test_common_endian_SOURCES = \ 309test_common_endian_SOURCES = \
327 test_common_endian.c 310 test_common_endian.c
328test_common_endian_LDADD = \ 311test_common_endian_LDADD = \
329 $(top_builddir)/src/util/libgnunetutil.la 312 libgnunetutil.la
330 313
331test_common_logging_SOURCES = \ 314test_common_logging_SOURCES = \
332 test_common_logging.c 315 test_common_logging.c
333test_common_logging_LDADD = \ 316test_common_logging_LDADD = \
334 $(top_builddir)/src/util/libgnunetutil.la 317 libgnunetutil.la
335 318
336test_common_logging_runtime_loglevels_SOURCES = \ 319test_common_logging_runtime_loglevels_SOURCES = \
337 test_common_logging_runtime_loglevels.c 320 test_common_logging_runtime_loglevels.c
338test_common_logging_runtime_loglevels_LDADD = \ 321test_common_logging_runtime_loglevels_LDADD = \
339 $(top_builddir)/src/util/libgnunetutil.la 322 libgnunetutil.la
340 323
341test_configuration_SOURCES = \ 324test_configuration_SOURCES = \
342 test_configuration.c 325 test_configuration.c
343test_configuration_LDADD = \ 326test_configuration_LDADD = \
344 $(top_builddir)/src/util/libgnunetutil.la 327 libgnunetutil.la
345 328
346test_container_bloomfilter_SOURCES = \ 329test_container_bloomfilter_SOURCES = \
347 test_container_bloomfilter.c 330 test_container_bloomfilter.c
348test_container_bloomfilter_LDADD = \ 331test_container_bloomfilter_LDADD = \
349 $(top_builddir)/src/util/libgnunetutil.la 332 libgnunetutil.la
350 333
351test_container_meta_data_SOURCES = \ 334test_container_meta_data_SOURCES = \
352 test_container_meta_data.c 335 test_container_meta_data.c
353test_container_meta_data_LDADD = \ 336test_container_meta_data_LDADD = \
354 $(top_builddir)/src/util/libgnunetutil.la -lextractor 337 libgnunetutil.la -lextractor
355 338
356test_container_multihashmap_SOURCES = \ 339test_container_multihashmap_SOURCES = \
357 test_container_multihashmap.c 340 test_container_multihashmap.c
358test_container_multihashmap_LDADD = \ 341test_container_multihashmap_LDADD = \
359 $(top_builddir)/src/util/libgnunetutil.la 342 libgnunetutil.la
360 343
361test_container_multihashmap32_SOURCES = \ 344test_container_multihashmap32_SOURCES = \
362 test_container_multihashmap32.c 345 test_container_multihashmap32.c
363test_container_multihashmap32_LDADD = \ 346test_container_multihashmap32_LDADD = \
364 $(top_builddir)/src/util/libgnunetutil.la 347 libgnunetutil.la
365 348
366test_container_multipeermap_SOURCES = \ 349test_container_multipeermap_SOURCES = \
367 test_container_multipeermap.c 350 test_container_multipeermap.c
368test_container_multipeermap_LDADD = \ 351test_container_multipeermap_LDADD = \
369 $(top_builddir)/src/util/libgnunetutil.la 352 libgnunetutil.la
370 353
371test_container_heap_SOURCES = \ 354test_container_heap_SOURCES = \
372 test_container_heap.c 355 test_container_heap.c
373test_container_heap_LDADD = \ 356test_container_heap_LDADD = \
374 $(top_builddir)/src/util/libgnunetutil.la 357 libgnunetutil.la
375 358
376test_container_slist_SOURCES = \ 359test_container_slist_SOURCES = \
377 test_container_slist.c 360 test_container_slist.c
378test_container_slist_LDADD = \ 361test_container_slist_LDADD = \
379 $(top_builddir)/src/util/libgnunetutil.la 362 libgnunetutil.la
380 363
381test_crypto_symmetric_SOURCES = \ 364test_crypto_symmetric_SOURCES = \
382 test_crypto_symmetric.c 365 test_crypto_symmetric.c
383test_crypto_symmetric_LDADD = \ 366test_crypto_symmetric_LDADD = \
384 $(top_builddir)/src/util/libgnunetutil.la 367 libgnunetutil.la
385 368
386test_crypto_crc_SOURCES = \ 369test_crypto_crc_SOURCES = \
387 test_crypto_crc.c 370 test_crypto_crc.c
388test_crypto_crc_LDADD = \ 371test_crypto_crc_LDADD = \
389 $(top_builddir)/src/util/libgnunetutil.la 372 libgnunetutil.la
390 373
391test_crypto_ecdsa_SOURCES = \ 374test_crypto_ecdsa_SOURCES = \
392 test_crypto_ecdsa.c 375 test_crypto_ecdsa.c
393test_crypto_ecdsa_LDADD = \ 376test_crypto_ecdsa_LDADD = \
394 $(top_builddir)/src/util/libgnunetutil.la \ 377 libgnunetutil.la \
395 $(LIBGCRYPT_LIBS) 378 $(LIBGCRYPT_LIBS)
396 379
397test_crypto_eddsa_SOURCES = \ 380test_crypto_eddsa_SOURCES = \
398 test_crypto_eddsa.c 381 test_crypto_eddsa.c
399test_crypto_eddsa_LDADD = \ 382test_crypto_eddsa_LDADD = \
400 $(top_builddir)/src/util/libgnunetutil.la \ 383 libgnunetutil.la \
401 $(LIBGCRYPT_LIBS) 384 $(LIBGCRYPT_LIBS)
402 385
403test_crypto_ecdhe_SOURCES = \ 386test_crypto_ecdhe_SOURCES = \
404 test_crypto_ecdhe.c 387 test_crypto_ecdhe.c
405test_crypto_ecdhe_LDADD = \ 388test_crypto_ecdhe_LDADD = \
406 $(top_builddir)/src/util/libgnunetutil.la \ 389 libgnunetutil.la \
407 $(LIBGCRYPT_LIBS) 390 $(LIBGCRYPT_LIBS)
408 391
409test_crypto_hash_SOURCES = \ 392test_crypto_hash_SOURCES = \
410 test_crypto_hash.c 393 test_crypto_hash.c
411test_crypto_hash_LDADD = \ 394test_crypto_hash_LDADD = \
412 $(top_builddir)/src/util/libgnunetutil.la 395 libgnunetutil.la
413 396
414test_crypto_hkdf_SOURCES = \ 397test_crypto_hkdf_SOURCES = \
415 test_crypto_hkdf.c 398 test_crypto_hkdf.c
416test_crypto_hkdf_LDADD = \ 399test_crypto_hkdf_LDADD = \
417 $(top_builddir)/src/util/libgnunetutil.la 400 libgnunetutil.la
418 401
419test_crypto_paillier_SOURCES = \ 402test_crypto_paillier_SOURCES = \
420 test_crypto_paillier.c 403 test_crypto_paillier.c
421test_crypto_paillier_LDADD = \ 404test_crypto_paillier_LDADD = \
422 $(LIBGCRYPT_LIBS) \ 405 $(LIBGCRYPT_LIBS) \
423 $(top_builddir)/src/util/libgnunetutil.la 406 libgnunetutil.la
424 407
425test_crypto_random_SOURCES = \ 408test_crypto_random_SOURCES = \
426 test_crypto_random.c 409 test_crypto_random.c
427test_crypto_random_LDADD = \ 410test_crypto_random_LDADD = \
428 $(top_builddir)/src/util/libgnunetutil.la 411 libgnunetutil.la
429 412
430test_disk_SOURCES = \ 413test_disk_SOURCES = \
431 test_disk.c 414 test_disk.c
432test_disk_LDADD = \ 415test_disk_LDADD = \
433 $(top_builddir)/src/util/libgnunetutil.la 416 libgnunetutil.la
434 417
435test_getopt_SOURCES = \ 418test_getopt_SOURCES = \
436 test_getopt.c 419 test_getopt.c
437test_getopt_LDADD = \ 420test_getopt_LDADD = \
438 $(top_builddir)/src/util/libgnunetutil.la 421 libgnunetutil.la
439 422
440test_connection_nc_SOURCES = \ 423test_connection_nc_SOURCES = \
441 test_connection.c 424 test_connection.c
442test_connection_nc_LDADD = \ 425test_connection_nc_LDADD = \
443 $(top_builddir)/src/util/libgnunetutil.la 426 libgnunetutil.la
444 427
445test_connection_addressing_nc_SOURCES = \ 428test_connection_addressing_nc_SOURCES = \
446 test_connection_addressing.c 429 test_connection_addressing.c
447test_connection_addressing_nc_LDADD = \ 430test_connection_addressing_nc_LDADD = \
448 $(top_builddir)/src/util/libgnunetutil.la 431 libgnunetutil.la
449 432
450test_connection_receive_cancel_nc_SOURCES = \ 433test_connection_receive_cancel_nc_SOURCES = \
451 test_connection_receive_cancel.c 434 test_connection_receive_cancel.c
452test_connection_receive_cancel_nc_LDADD = \ 435test_connection_receive_cancel_nc_LDADD = \
453 $(top_builddir)/src/util/libgnunetutil.la 436 libgnunetutil.la
454 437
455test_connection_timeout_nc_SOURCES = \ 438test_connection_timeout_nc_SOURCES = \
456 test_connection_timeout.c 439 test_connection_timeout.c
457test_connection_timeout_nc_LDADD = \ 440test_connection_timeout_nc_LDADD = \
458 $(top_builddir)/src/util/libgnunetutil.la 441 libgnunetutil.la
459 442
460test_connection_timeout_no_connect_nc_SOURCES = \ 443test_connection_timeout_no_connect_nc_SOURCES = \
461 test_connection_timeout_no_connect.c 444 test_connection_timeout_no_connect.c
462test_connection_timeout_no_connect_nc_LDADD = \ 445test_connection_timeout_no_connect_nc_LDADD = \
463 $(top_builddir)/src/util/libgnunetutil.la 446 libgnunetutil.la
464 447
465test_connection_transmit_cancel_nc_SOURCES = \ 448test_connection_transmit_cancel_nc_SOURCES = \
466 test_connection_transmit_cancel.c 449 test_connection_transmit_cancel.c
467test_connection_transmit_cancel_nc_LDADD = \ 450test_connection_transmit_cancel_nc_LDADD = \
468 $(top_builddir)/src/util/libgnunetutil.la 451 libgnunetutil.la
469 452
470test_mq_SOURCES = \ 453test_mq_SOURCES = \
471 test_mq.c 454 test_mq.c
472test_mq_LDADD = \ 455test_mq_LDADD = \
473 $(top_builddir)/src/util/libgnunetutil.la 456 libgnunetutil.la
474 457
475test_mq_client_nc_SOURCES = \ 458test_mq_client_nc_SOURCES = \
476 test_mq_client.c 459 test_mq_client.c
477test_mq_client_nc_LDADD = \ 460test_mq_client_nc_LDADD = \
478 $(top_builddir)/src/util/libgnunetutil.la 461 libgnunetutil.la
479 462
480test_os_network_SOURCES = \ 463test_os_network_SOURCES = \
481 test_os_network.c 464 test_os_network.c
482test_os_network_LDADD = \ 465test_os_network_LDADD = \
483 $(top_builddir)/src/util/libgnunetutil.la 466 libgnunetutil.la
484 467
485test_peer_SOURCES = \ 468test_peer_SOURCES = \
486 test_peer.c 469 test_peer.c
487test_peer_LDADD = \ 470test_peer_LDADD = \
488$(top_builddir)/src/util/libgnunetutil.la -lgcrypt 471 libgnunetutil.la -lgcrypt
489 472
490test_plugin_SOURCES = \ 473test_plugin_SOURCES = \
491 test_plugin.c 474 test_plugin.c
492test_plugin_LDADD = \ 475test_plugin_LDADD = \
493 $(top_builddir)/src/util/libgnunetutil.la 476 libgnunetutil.la
494 477
495test_program_SOURCES = \ 478test_program_SOURCES = \
496 test_program.c 479 test_program.c
497test_program_LDADD = \ 480test_program_LDADD = \
498 $(top_builddir)/src/util/libgnunetutil.la 481 libgnunetutil.la
499 482
500test_resolver_api_nc_SOURCES = \ 483test_resolver_api_nc_SOURCES = \
501 test_resolver_api.c 484 test_resolver_api.c
502test_resolver_api_nc_LDADD = \ 485test_resolver_api_nc_LDADD = \
503 $(top_builddir)/src/util/libgnunetutil.la 486 libgnunetutil.la
504 487
505test_scheduler_SOURCES = \ 488test_scheduler_SOURCES = \
506 test_scheduler.c 489 test_scheduler.c
507test_scheduler_LDADD = \ 490test_scheduler_LDADD = \
508 $(top_builddir)/src/util/libgnunetutil.la 491 libgnunetutil.la
509 492
510test_scheduler_delay_SOURCES = \ 493test_scheduler_delay_SOURCES = \
511 test_scheduler_delay.c 494 test_scheduler_delay.c
512test_scheduler_delay_LDADD = \ 495test_scheduler_delay_LDADD = \
513 $(top_builddir)/src/util/libgnunetutil.la 496 libgnunetutil.la
514 497
515test_server_mst_interrupt_nc_SOURCES = \ 498test_server_mst_interrupt_nc_SOURCES = \
516 test_server_mst_interrupt.c 499 test_server_mst_interrupt.c
517test_server_mst_interrupt_nc_LDADD = \ 500test_server_mst_interrupt_nc_LDADD = \
518 $(top_builddir)/src/util/libgnunetutil.la 501 libgnunetutil.la
519 502
520test_server_nc_SOURCES = \ 503test_server_nc_SOURCES = \
521 test_server.c 504 test_server.c
522test_server_nc_LDADD = \ 505test_server_nc_LDADD = \
523 $(top_builddir)/src/util/libgnunetutil.la 506 libgnunetutil.la
524 507
525test_server_disconnect_nc_SOURCES = \ 508test_server_disconnect_nc_SOURCES = \
526 test_server_disconnect.c 509 test_server_disconnect.c
527test_server_disconnect_nc_LDADD = \ 510test_server_disconnect_nc_LDADD = \
528 $(top_builddir)/src/util/libgnunetutil.la 511 libgnunetutil.la
529 512
530test_server_with_client_nc_SOURCES = \ 513test_server_with_client_nc_SOURCES = \
531 test_server_with_client.c 514 test_server_with_client.c
532test_server_with_client_nc_LDADD = \ 515test_server_with_client_nc_LDADD = \
533 $(top_builddir)/src/util/libgnunetutil.la 516 libgnunetutil.la
534 517
535test_server_with_client_unix_SOURCES = \ 518test_server_with_client_unix_SOURCES = \
536 test_server_with_client_unix.c 519 test_server_with_client_unix.c
537test_server_with_client_unix_LDADD = \ 520test_server_with_client_unix_LDADD = \
538 $(top_builddir)/src/util/libgnunetutil.la 521 libgnunetutil.la
539 522
540 523
541test_service_SOURCES = \ 524test_service_SOURCES = \
542 test_service.c 525 test_service.c
543test_service_LDADD = \ 526test_service_LDADD = \
544 $(top_builddir)/src/util/libgnunetutil.la 527 libgnunetutil.la
545 528
546test_strings_SOURCES = \ 529test_strings_SOURCES = \
547 test_strings.c 530 test_strings.c
548test_strings_LDADD = \ 531test_strings_LDADD = \
549 $(top_builddir)/src/util/libgnunetutil.la 532 libgnunetutil.la
550 533
551 534
552test_strings_to_data_SOURCES = \ 535test_strings_to_data_SOURCES = \
553 test_strings_to_data.c 536 test_strings_to_data.c
554test_strings_to_data_LDADD = \ 537test_strings_to_data_LDADD = \
555 $(top_builddir)/src/util/libgnunetutil.la 538 libgnunetutil.la
556 539
557 540
558test_time_SOURCES = \ 541test_time_SOURCES = \
559 test_time.c 542 test_time.c
560test_time_LDADD = \ 543test_time_LDADD = \
561 $(top_builddir)/src/util/libgnunetutil.la 544 libgnunetutil.la
562 545
563test_speedup_SOURCES = \ 546test_speedup_SOURCES = \
564 test_speedup.c 547 test_speedup.c
565test_speedup_LDADD = \ 548test_speedup_LDADD = \
566 $(top_builddir)/src/util/libgnunetutil.la 549 libgnunetutil.la
567 550
568perf_crypto_hash_SOURCES = \ 551perf_crypto_hash_SOURCES = \
569 perf_crypto_hash.c 552 perf_crypto_hash.c
570perf_crypto_hash_LDADD = \ 553perf_crypto_hash_LDADD = \
571 $(top_builddir)/src/util/libgnunetutil.la 554 libgnunetutil.la
572 555
573perf_crypto_symmetric_SOURCES = \ 556perf_crypto_symmetric_SOURCES = \
574 perf_crypto_symmetric.c 557 perf_crypto_symmetric.c
575perf_crypto_symmetric_LDADD = \ 558perf_crypto_symmetric_LDADD = \
576 $(top_builddir)/src/util/libgnunetutil.la 559 libgnunetutil.la
577 560
578perf_malloc_SOURCES = \ 561perf_malloc_SOURCES = \
579 perf_malloc.c 562 perf_malloc.c
580perf_malloc_LDADD = \ 563perf_malloc_LDADD = \
581 $(top_builddir)/src/util/libgnunetutil.la 564 libgnunetutil.la
582 565
583 566
584EXTRA_DIST = \ 567EXTRA_DIST = \
diff --git a/src/vpn/Makefile.am b/src/vpn/Makefile.am
index cfc0456c7..e533cc081 100644
--- a/src/vpn/Makefile.am
+++ b/src/vpn/Makefile.am
@@ -67,12 +67,10 @@ gnunet_service_vpn_CFLAGS = \
67gnunet_vpn_SOURCES = \ 67gnunet_vpn_SOURCES = \
68 gnunet-vpn.c 68 gnunet-vpn.c
69gnunet_vpn_LDADD = \ 69gnunet_vpn_LDADD = \
70 $(top_builddir)/src/vpn/libgnunetvpn.la \ 70 libgnunetvpn.la \
71 $(top_builddir)/src/tun/libgnunettun.la \ 71 $(top_builddir)/src/tun/libgnunettun.la \
72 $(top_builddir)/src/util/libgnunetutil.la \ 72 $(top_builddir)/src/util/libgnunetutil.la \
73 $(GN_LIBINTL) 73 $(GN_LIBINTL)
74gnunet_vpn_DEPENDENCIES = \
75 libgnunetvpn.la
76 74
77libgnunetvpn_la_SOURCES = \ 75libgnunetvpn_la_SOURCES = \
78 vpn_api.c vpn.h 76 vpn_api.c vpn.h
generated by cgit v1.2.3 (git 2.39.1) at 2024-05-01 17:12:52 +0000