diff options
author | Matthias Wachs <wachs@net.in.tum.de> | 2014-01-22 10:45:25 +0000 |
---|---|---|
committer | Matthias Wachs <wachs@net.in.tum.de> | 2014-01-22 10:45:25 +0000 |
commit | 67bb119f1cf91644a45d53ccb9e6eb6a11ca0598 (patch) | |
tree | 888c72f0f17d3876af070fbb942d3b950ff9e1ce /src | |
parent | 7c241d90b842906019706995a48ba93eaa7acb9e (diff) | |
download | gnunet-67bb119f1cf91644a45d53ccb9e6eb6a11ca0598.tar.gz gnunet-67bb119f1cf91644a45d53ccb9e6eb6a11ca0598.zip |
fixes for makefile
Diffstat (limited to 'src')
-rw-r--r-- | src/ats-tests/Makefile.am | 103 |
1 files changed, 84 insertions, 19 deletions
diff --git a/src/ats-tests/Makefile.am b/src/ats-tests/Makefile.am index 54c784664..abb0988fc 100644 --- a/src/ats-tests/Makefile.am +++ b/src/ats-tests/Makefile.am | |||
@@ -105,150 +105,215 @@ perf_ats_proportional_transport_none_DEPENDENCIES = \ | |||
105 | $(top_builddir)/src/util/libgnunetutil.la | 105 | $(top_builddir)/src/util/libgnunetutil.la |
106 | 106 | ||
107 | perf_ats_proportional_core_bandwidth_SOURCES = \ | 107 | perf_ats_proportional_core_bandwidth_SOURCES = \ |
108 | perf_ats.c perf_ats_logging.c | 108 | perf_ats.c |
109 | perf_ats_proportional_core_bandwidth_LDADD = \ | 109 | perf_ats_proportional_core_bandwidth_LDADD = \ |
110 | $(top_builddir)/src/util/libgnunetutil.la \ | 110 | $(top_builddir)/src/util/libgnunetutil.la \ |
111 | $(top_builddir)/src/ats-tests/libgnunetatstesting.la \ | ||
111 | $(top_builddir)/src/testbed/libgnunettestbed.la \ | 112 | $(top_builddir)/src/testbed/libgnunettestbed.la \ |
112 | $(top_builddir)/src/ats/libgnunetats.la \ | 113 | $(top_builddir)/src/ats/libgnunetats.la \ |
113 | $(top_builddir)/src/core/libgnunetcore.la \ | 114 | $(top_builddir)/src/core/libgnunetcore.la \ |
114 | $(top_builddir)/src/transport/libgnunettransport.la | 115 | $(top_builddir)/src/transport/libgnunettransport.la |
116 | perf_ats_proportional_core_bandwidth_DEPENDENCIES = \ | ||
117 | $(top_builddir)/src/ats-tests/libgnunetatstesting.la \ | ||
118 | $(top_builddir)/src/util/libgnunetutil.la | ||
115 | 119 | ||
116 | perf_ats_proportional_transport_bandwidth_SOURCES = \ | 120 | perf_ats_proportional_transport_bandwidth_SOURCES = \ |
117 | perf_ats.c perf_ats_logging.c | 121 | perf_ats.c |
118 | perf_ats_proportional_transport_bandwidth_LDADD = \ | 122 | perf_ats_proportional_transport_bandwidth_LDADD = \ |
119 | $(top_builddir)/src/util/libgnunetutil.la \ | 123 | $(top_builddir)/src/util/libgnunetutil.la \ |
124 | $(top_builddir)/src/ats-tests/libgnunetatstesting.la \ | ||
120 | $(top_builddir)/src/testbed/libgnunettestbed.la \ | 125 | $(top_builddir)/src/testbed/libgnunettestbed.la \ |
121 | $(top_builddir)/src/ats/libgnunetats.la \ | 126 | $(top_builddir)/src/ats/libgnunetats.la \ |
122 | $(top_builddir)/src/core/libgnunetcore.la \ | 127 | $(top_builddir)/src/core/libgnunetcore.la \ |
123 | $(top_builddir)/src/transport/libgnunettransport.la | 128 | $(top_builddir)/src/transport/libgnunettransport.la |
129 | perf_ats_proportional_transport_bandwidth_DEPENDENCIES = \ | ||
130 | $(top_builddir)/src/ats-tests/libgnunetatstesting.la \ | ||
131 | $(top_builddir)/src/util/libgnunetutil.la | ||
124 | 132 | ||
125 | perf_ats_proportional_core_latency_SOURCES = \ | 133 | perf_ats_proportional_core_latency_SOURCES = \ |
126 | perf_ats.c perf_ats_logging.c | 134 | perf_ats.c |
127 | perf_ats_proportional_core_latency_LDADD = \ | 135 | perf_ats_proportional_core_latency_LDADD = \ |
128 | $(top_builddir)/src/util/libgnunetutil.la \ | 136 | $(top_builddir)/src/util/libgnunetutil.la \ |
137 | $(top_builddir)/src/ats-tests/libgnunetatstesting.la \ | ||
129 | $(top_builddir)/src/testbed/libgnunettestbed.la \ | 138 | $(top_builddir)/src/testbed/libgnunettestbed.la \ |
130 | $(top_builddir)/src/ats/libgnunetats.la \ | 139 | $(top_builddir)/src/ats/libgnunetats.la \ |
131 | $(top_builddir)/src/core/libgnunetcore.la \ | 140 | $(top_builddir)/src/core/libgnunetcore.la \ |
132 | $(top_builddir)/src/transport/libgnunettransport.la | 141 | $(top_builddir)/src/transport/libgnunettransport.la |
133 | 142 | perf_ats_proportional_core_latency_DEPENDENCIES = \ | |
143 | $(top_builddir)/src/ats-tests/libgnunetatstesting.la \ | ||
144 | $(top_builddir)/src/util/libgnunetutil.la | ||
145 | |||
134 | perf_ats_proportional_transport_latency_SOURCES = \ | 146 | perf_ats_proportional_transport_latency_SOURCES = \ |
135 | perf_ats.c perf_ats_logging.c | 147 | perf_ats.c |
136 | perf_ats_proportional_transport_latency_LDADD = \ | 148 | perf_ats_proportional_transport_latency_LDADD = \ |
137 | $(top_builddir)/src/util/libgnunetutil.la \ | 149 | $(top_builddir)/src/util/libgnunetutil.la \ |
150 | $(top_builddir)/src/ats-tests/libgnunetatstesting.la \ | ||
138 | $(top_builddir)/src/testbed/libgnunettestbed.la \ | 151 | $(top_builddir)/src/testbed/libgnunettestbed.la \ |
139 | $(top_builddir)/src/ats/libgnunetats.la \ | 152 | $(top_builddir)/src/ats/libgnunetats.la \ |
140 | $(top_builddir)/src/core/libgnunetcore.la \ | 153 | $(top_builddir)/src/core/libgnunetcore.la \ |
141 | $(top_builddir)/src/transport/libgnunettransport.la | 154 | $(top_builddir)/src/transport/libgnunettransport.la |
155 | perf_ats_proportional_transport_latency_DEPENDENCIES = \ | ||
156 | $(top_builddir)/src/ats-tests/libgnunetatstesting.la \ | ||
157 | $(top_builddir)/src/util/libgnunetutil.la | ||
142 | 158 | ||
143 | if HAVE_LIBGLPK | 159 | if HAVE_LIBGLPK |
144 | perf_ats_mlp_core_none_SOURCES = \ | 160 | perf_ats_mlp_core_none_SOURCES = \ |
145 | perf_ats.c perf_ats_logging.c | 161 | perf_ats.c |
146 | perf_ats_mlp_core_none_LDADD = \ | 162 | perf_ats_mlp_core_none_LDADD = \ |
147 | $(top_builddir)/src/util/libgnunetutil.la \ | 163 | $(top_builddir)/src/util/libgnunetutil.la \ |
164 | $(top_builddir)/src/ats-tests/libgnunetatstesting.la \ | ||
148 | $(top_builddir)/src/testbed/libgnunettestbed.la \ | 165 | $(top_builddir)/src/testbed/libgnunettestbed.la \ |
149 | $(top_builddir)/src/ats/libgnunetats.la \ | 166 | $(top_builddir)/src/ats/libgnunetats.la \ |
150 | $(top_builddir)/src/core/libgnunetcore.la \ | 167 | $(top_builddir)/src/core/libgnunetcore.la \ |
151 | $(top_builddir)/src/transport/libgnunettransport.la | 168 | $(top_builddir)/src/transport/libgnunettransport.la |
152 | 169 | perf_ats_mlp_core_none_DEPENDENCIES = \ | |
170 | $(top_builddir)/src/ats-tests/libgnunetatstesting.la \ | ||
171 | $(top_builddir)/src/util/libgnunetutil.la | ||
172 | |||
153 | perf_ats_mlp_transport_none_SOURCES = \ | 173 | perf_ats_mlp_transport_none_SOURCES = \ |
154 | perf_ats.c perf_ats_logging.c | 174 | perf_ats.c |
155 | perf_ats_mlp_transport_none_LDADD = \ | 175 | perf_ats_mlp_transport_none_LDADD = \ |
156 | $(top_builddir)/src/util/libgnunetutil.la \ | 176 | $(top_builddir)/src/util/libgnunetutil.la \ |
177 | $(top_builddir)/src/ats-tests/libgnunetatstesting.la \ | ||
157 | $(top_builddir)/src/testbed/libgnunettestbed.la \ | 178 | $(top_builddir)/src/testbed/libgnunettestbed.la \ |
158 | $(top_builddir)/src/ats/libgnunetats.la \ | 179 | $(top_builddir)/src/ats/libgnunetats.la \ |
159 | $(top_builddir)/src/core/libgnunetcore.la \ | 180 | $(top_builddir)/src/core/libgnunetcore.la \ |
160 | $(top_builddir)/src/transport/libgnunettransport.la | 181 | $(top_builddir)/src/transport/libgnunettransport.la |
182 | perf_ats_mlp_transport_none_DEPENDENCIES = \ | ||
183 | $(top_builddir)/src/ats-tests/libgnunetatstesting.la \ | ||
184 | $(top_builddir)/src/util/libgnunetutil.la | ||
161 | 185 | ||
162 | perf_ats_mlp_core_bandwidth_SOURCES = \ | 186 | perf_ats_mlp_core_bandwidth_SOURCES = \ |
163 | perf_ats.c perf_ats_logging.c | 187 | perf_ats.c |
164 | perf_ats_mlp_core_bandwidth_LDADD = \ | 188 | perf_ats_mlp_core_bandwidth_LDADD = \ |
165 | $(top_builddir)/src/util/libgnunetutil.la \ | 189 | $(top_builddir)/src/util/libgnunetutil.la \ |
190 | $(top_builddir)/src/ats-tests/libgnunetatstesting.la \ | ||
166 | $(top_builddir)/src/testbed/libgnunettestbed.la \ | 191 | $(top_builddir)/src/testbed/libgnunettestbed.la \ |
167 | $(top_builddir)/src/ats/libgnunetats.la \ | 192 | $(top_builddir)/src/ats/libgnunetats.la \ |
168 | $(top_builddir)/src/core/libgnunetcore.la \ | 193 | $(top_builddir)/src/core/libgnunetcore.la \ |
169 | $(top_builddir)/src/transport/libgnunettransport.la | 194 | $(top_builddir)/src/transport/libgnunettransport.la |
195 | perf_ats_mlp_core_bandwidth_DEPENDENCIES = \ | ||
196 | $(top_builddir)/src/ats-tests/libgnunetatstesting.la \ | ||
197 | $(top_builddir)/src/util/libgnunetutil.la | ||
170 | 198 | ||
171 | perf_ats_mlp_transport_bandwidth_SOURCES = \ | 199 | perf_ats_mlp_transport_bandwidth_SOURCES = \ |
172 | perf_ats.c perf_ats_logging.c | 200 | perf_ats.c |
173 | perf_ats_mlp_transport_bandwidth_LDADD = \ | 201 | perf_ats_mlp_transport_bandwidth_LDADD = \ |
174 | $(top_builddir)/src/util/libgnunetutil.la \ | 202 | $(top_builddir)/src/util/libgnunetutil.la \ |
203 | $(top_builddir)/src/ats-tests/libgnunetatstesting.la \ | ||
175 | $(top_builddir)/src/testbed/libgnunettestbed.la \ | 204 | $(top_builddir)/src/testbed/libgnunettestbed.la \ |
176 | $(top_builddir)/src/ats/libgnunetats.la \ | 205 | $(top_builddir)/src/ats/libgnunetats.la \ |
177 | $(top_builddir)/src/core/libgnunetcore.la \ | 206 | $(top_builddir)/src/core/libgnunetcore.la \ |
178 | $(top_builddir)/src/transport/libgnunettransport.la | 207 | $(top_builddir)/src/transport/libgnunettransport.la |
208 | perf_ats_mlp_transport_bandwidth_DEPENDENCIES = \ | ||
209 | $(top_builddir)/src/ats-tests/libgnunetatstesting.la \ | ||
210 | $(top_builddir)/src/util/libgnunetutil.la | ||
179 | 211 | ||
180 | perf_ats_mlp_core_latency_SOURCES = \ | 212 | perf_ats_mlp_core_latency_SOURCES = \ |
181 | perf_ats.c perf_ats_logging.c | 213 | perf_ats.c |
182 | perf_ats_mlp_core_latency_LDADD = \ | 214 | perf_ats_mlp_core_latency_LDADD = \ |
183 | $(top_builddir)/src/util/libgnunetutil.la \ | 215 | $(top_builddir)/src/util/libgnunetutil.la \ |
216 | $(top_builddir)/src/ats-tests/libgnunetatstesting.la \ | ||
184 | $(top_builddir)/src/testbed/libgnunettestbed.la \ | 217 | $(top_builddir)/src/testbed/libgnunettestbed.la \ |
185 | $(top_builddir)/src/ats/libgnunetats.la \ | 218 | $(top_builddir)/src/ats/libgnunetats.la \ |
186 | $(top_builddir)/src/core/libgnunetcore.la \ | 219 | $(top_builddir)/src/core/libgnunetcore.la \ |
187 | $(top_builddir)/src/transport/libgnunettransport.la | 220 | $(top_builddir)/src/transport/libgnunettransport.la |
221 | perf_ats_mlp_core_latency_DEPENDENCIES = \ | ||
222 | $(top_builddir)/src/ats-tests/libgnunetatstesting.la \ | ||
223 | $(top_builddir)/src/util/libgnunetutil.la | ||
188 | 224 | ||
189 | perf_ats_mlp_transport_latency_SOURCES = \ | 225 | perf_ats_mlp_transport_latency_SOURCES = \ |
190 | perf_ats.c perf_ats_logging.c | 226 | perf_ats.c |
191 | perf_ats_mlp_transport_latency_LDADD = \ | 227 | perf_ats_mlp_transport_latency_LDADD = \ |
192 | $(top_builddir)/src/util/libgnunetutil.la \ | 228 | $(top_builddir)/src/util/libgnunetutil.la \ |
229 | $(top_builddir)/src/ats-tests/libgnunetatstesting.la \ | ||
193 | $(top_builddir)/src/testbed/libgnunettestbed.la \ | 230 | $(top_builddir)/src/testbed/libgnunettestbed.la \ |
194 | $(top_builddir)/src/ats/libgnunetats.la \ | 231 | $(top_builddir)/src/ats/libgnunetats.la \ |
195 | $(top_builddir)/src/core/libgnunetcore.la \ | 232 | $(top_builddir)/src/core/libgnunetcore.la \ |
196 | $(top_builddir)/src/transport/libgnunettransport.la | 233 | $(top_builddir)/src/transport/libgnunettransport.la |
234 | perf_ats_mlp_transport_latencyDEPENDENCIES = \ | ||
235 | $(top_builddir)/src/ats-tests/libgnunetatstesting.la \ | ||
236 | $(top_builddir)/src/util/libgnunetutil.la | ||
197 | endif | 237 | endif |
198 | 238 | ||
199 | perf_ats_ril_core_none_SOURCES = \ | 239 | perf_ats_ril_core_none_SOURCES = \ |
200 | perf_ats.c perf_ats_logging.c | 240 | perf_ats.c |
201 | perf_ats_ril_core_none_LDADD = \ | 241 | perf_ats_ril_core_none_LDADD = \ |
202 | $(top_builddir)/src/util/libgnunetutil.la \ | 242 | $(top_builddir)/src/util/libgnunetutil.la \ |
243 | $(top_builddir)/src/ats-tests/libgnunetatstesting.la \ | ||
203 | $(top_builddir)/src/testbed/libgnunettestbed.la \ | 244 | $(top_builddir)/src/testbed/libgnunettestbed.la \ |
204 | $(top_builddir)/src/ats/libgnunetats.la \ | 245 | $(top_builddir)/src/ats/libgnunetats.la \ |
205 | $(top_builddir)/src/core/libgnunetcore.la \ | 246 | $(top_builddir)/src/core/libgnunetcore.la \ |
206 | $(top_builddir)/src/transport/libgnunettransport.la | 247 | $(top_builddir)/src/transport/libgnunettransport.la |
248 | perf_ats_ril_core_none_DEPENDENCIES = \ | ||
249 | $(top_builddir)/src/ats-tests/libgnunetatstesting.la \ | ||
250 | $(top_builddir)/src/util/libgnunetutil.la | ||
207 | 251 | ||
208 | perf_ats_ril_transport_none_SOURCES = \ | 252 | perf_ats_ril_transport_none_SOURCES = \ |
209 | perf_ats.c perf_ats_logging.c | 253 | perf_ats.c |
210 | perf_ats_ril_transport_none_LDADD = \ | 254 | perf_ats_ril_transport_none_LDADD = \ |
211 | $(top_builddir)/src/util/libgnunetutil.la \ | 255 | $(top_builddir)/src/util/libgnunetutil.la \ |
256 | $(top_builddir)/src/ats-tests/libgnunetatstesting.la \ | ||
212 | $(top_builddir)/src/testbed/libgnunettestbed.la \ | 257 | $(top_builddir)/src/testbed/libgnunettestbed.la \ |
213 | $(top_builddir)/src/ats/libgnunetats.la \ | 258 | $(top_builddir)/src/ats/libgnunetats.la \ |
214 | $(top_builddir)/src/core/libgnunetcore.la \ | 259 | $(top_builddir)/src/core/libgnunetcore.la \ |
215 | $(top_builddir)/src/transport/libgnunettransport.la | 260 | $(top_builddir)/src/transport/libgnunettransport.la |
261 | perf_ats_ril_transport_none_DEPENDENCIES = \ | ||
262 | $(top_builddir)/src/ats-tests/libgnunetatstesting.la \ | ||
263 | $(top_builddir)/src/util/libgnunetutil.la | ||
216 | 264 | ||
217 | perf_ats_ril_core_bandwidth_SOURCES = \ | 265 | perf_ats_ril_core_bandwidth_SOURCES = \ |
218 | perf_ats.c perf_ats_logging.c | 266 | perf_ats.c |
219 | perf_ats_ril_core_bandwidth_LDADD = \ | 267 | perf_ats_ril_core_bandwidth_LDADD = \ |
220 | $(top_builddir)/src/util/libgnunetutil.la \ | 268 | $(top_builddir)/src/util/libgnunetutil.la \ |
269 | $(top_builddir)/src/ats-tests/libgnunetatstesting.la \ | ||
221 | $(top_builddir)/src/testbed/libgnunettestbed.la \ | 270 | $(top_builddir)/src/testbed/libgnunettestbed.la \ |
222 | $(top_builddir)/src/ats/libgnunetats.la \ | 271 | $(top_builddir)/src/ats/libgnunetats.la \ |
223 | $(top_builddir)/src/core/libgnunetcore.la \ | 272 | $(top_builddir)/src/core/libgnunetcore.la \ |
224 | $(top_builddir)/src/transport/libgnunettransport.la | 273 | $(top_builddir)/src/transport/libgnunettransport.la |
274 | perf_ats_ril_core_bandwidth_DEPENDENCIES = \ | ||
275 | $(top_builddir)/src/ats-tests/libgnunetatstesting.la \ | ||
276 | $(top_builddir)/src/util/libgnunetutil.la | ||
225 | 277 | ||
226 | perf_ats_ril_transport_bandwidth_SOURCES = \ | 278 | perf_ats_ril_transport_bandwidth_SOURCES = \ |
227 | perf_ats.c perf_ats_logging.c | 279 | perf_ats.c |
228 | perf_ats_ril_transport_bandwidth_LDADD = \ | 280 | perf_ats_ril_transport_bandwidth_LDADD = \ |
229 | $(top_builddir)/src/util/libgnunetutil.la \ | 281 | $(top_builddir)/src/util/libgnunetutil.la \ |
282 | $(top_builddir)/src/ats-tests/libgnunetatstesting.la \ | ||
230 | $(top_builddir)/src/testbed/libgnunettestbed.la \ | 283 | $(top_builddir)/src/testbed/libgnunettestbed.la \ |
231 | $(top_builddir)/src/ats/libgnunetats.la \ | 284 | $(top_builddir)/src/ats/libgnunetats.la \ |
232 | $(top_builddir)/src/core/libgnunetcore.la \ | 285 | $(top_builddir)/src/core/libgnunetcore.la \ |
233 | $(top_builddir)/src/transport/libgnunettransport.la | 286 | $(top_builddir)/src/transport/libgnunettransport.la |
287 | perf_ats_ril_transport_DEPENDENCIES = \ | ||
288 | $(top_builddir)/src/ats-tests/libgnunetatstesting.la \ | ||
289 | $(top_builddir)/src/util/libgnunetutil.la | ||
290 | |||
234 | 291 | ||
235 | perf_ats_ril_core_latency_SOURCES = \ | 292 | perf_ats_ril_core_latency_SOURCES = \ |
236 | perf_ats.c perf_ats_logging.c | 293 | perf_ats.c |
237 | perf_ats_ril_core_latency_LDADD = \ | 294 | perf_ats_ril_core_latency_LDADD = \ |
238 | $(top_builddir)/src/util/libgnunetutil.la \ | 295 | $(top_builddir)/src/util/libgnunetutil.la \ |
296 | $(top_builddir)/src/ats-tests/libgnunetatstesting.la \ | ||
239 | $(top_builddir)/src/testbed/libgnunettestbed.la \ | 297 | $(top_builddir)/src/testbed/libgnunettestbed.la \ |
240 | $(top_builddir)/src/ats/libgnunetats.la \ | 298 | $(top_builddir)/src/ats/libgnunetats.la \ |
241 | $(top_builddir)/src/core/libgnunetcore.la \ | 299 | $(top_builddir)/src/core/libgnunetcore.la \ |
242 | $(top_builddir)/src/transport/libgnunettransport.la | 300 | $(top_builddir)/src/transport/libgnunettransport.la |
243 | 301 | perf_ats_ril_core_latency_DEPENDENCIES = \ | |
302 | $(top_builddir)/src/ats-tests/libgnunetatstesting.la \ | ||
303 | $(top_builddir)/src/util/libgnunetutil.la | ||
304 | |||
244 | perf_ats_ril_transport_latency_SOURCES = \ | 305 | perf_ats_ril_transport_latency_SOURCES = \ |
245 | perf_ats.c perf_ats_logging.c | 306 | perf_ats.c |
246 | perf_ats_ril_transport_latency_LDADD = \ | 307 | perf_ats_ril_transport_latency_LDADD = \ |
247 | $(top_builddir)/src/util/libgnunetutil.la \ | 308 | $(top_builddir)/src/util/libgnunetutil.la \ |
309 | $(top_builddir)/src/ats-tests/libgnunetatstesting.la \ | ||
248 | $(top_builddir)/src/testbed/libgnunettestbed.la \ | 310 | $(top_builddir)/src/testbed/libgnunettestbed.la \ |
249 | $(top_builddir)/src/ats/libgnunetats.la \ | 311 | $(top_builddir)/src/ats/libgnunetats.la \ |
250 | $(top_builddir)/src/core/libgnunetcore.la \ | 312 | $(top_builddir)/src/core/libgnunetcore.la \ |
251 | $(top_builddir)/src/transport/libgnunettransport.la | 313 | $(top_builddir)/src/transport/libgnunettransport.la |
314 | perf_ats_ril_transport_latency_DEPENDENCIES = \ | ||
315 | $(top_builddir)/src/ats-tests/libgnunetatstesting.la \ | ||
316 | $(top_builddir)/src/util/libgnunetutil.la | ||
252 | 317 | ||
253 | EXTRA_DIST = \ | 318 | EXTRA_DIST = \ |
254 | perf_ats_proportional_none.conf \ | 319 | perf_ats_proportional_none.conf \ |