diff options
author | Christian Grothoff <christian@grothoff.org> | 2014-09-13 13:54:57 +0000 |
---|---|---|
committer | Christian Grothoff <christian@grothoff.org> | 2014-09-13 13:54:57 +0000 |
commit | d94c5185fcdf47c6a57d3233b946fa7e621f7ad9 (patch) | |
tree | 1ded577285183d6457bde8787b9bccaa01f12143 /src/cadet | |
parent | e184df6030ab5c5374fe3b8a94482ff5a30c1580 (diff) | |
download | gnunet-d94c5185fcdf47c6a57d3233b946fa7e621f7ad9.tar.gz gnunet-d94c5185fcdf47c6a57d3233b946fa7e621f7ad9.zip |
fixing parallel build, getting rid of useless _DEPENDENCIES declarations
Diffstat (limited to 'src/cadet')
-rw-r--r-- | src/cadet/Makefile.am | 42 |
1 files changed, 4 insertions, 38 deletions
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 = \ | |||
42 | gnunet_cadet_SOURCES = \ | 42 | gnunet_cadet_SOURCES = \ |
43 | gnunet-cadet.c | 43 | gnunet-cadet.c |
44 | gnunet_cadet_LDADD = \ | 44 | gnunet_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 |
47 | gnunet_cadet_DEPENDENCIES = \ | ||
48 | libgnunetcadet.la | ||
49 | 47 | ||
50 | gnunet_service_cadet_SOURCES = \ | 48 | gnunet_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 |
71 | gnunet_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 | ||
80 | if LINUX | 69 | if LINUX |
81 | gnunet_service_cadet_LDFLAGS = -lrt | 70 | gnunet_service_cadet_LDFLAGS = -lrt |
82 | endif | 71 | endif |
@@ -92,9 +81,7 @@ libgnunetcadettest_a_SOURCES = \ | |||
92 | libgnunetcadettest_a_LIBADD = \ | 81 | libgnunetcadettest_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 |
96 | libgnunetcadettest_a_DEPENDENCIES = \ | ||
97 | libgnunetcadet.la | ||
98 | 85 | ||
99 | if HAVE_TESTING | 86 | if HAVE_TESTING |
100 | check_PROGRAMS = \ | 87 | check_PROGRAMS = \ |
@@ -121,8 +108,8 @@ endif | |||
121 | ld_cadet_test_lib = \ | 108 | ld_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 = \ | |||
135 | gnunet_cadet_profiler_SOURCES = \ | 122 | gnunet_cadet_profiler_SOURCES = \ |
136 | gnunet-cadet-profiler.c | 123 | gnunet-cadet-profiler.c |
137 | gnunet_cadet_profiler_LDADD = $(ld_cadet_test_lib) | 124 | gnunet_cadet_profiler_LDADD = $(ld_cadet_test_lib) |
138 | gnunet_cadet_profiler_DEPENDENCIES = $(dep_cadet_test_lib) | ||
139 | 125 | ||
140 | 126 | ||
141 | test_cadet_single_SOURCES = \ | 127 | test_cadet_single_SOURCES = \ |
142 | test_cadet_single.c | 128 | test_cadet_single.c |
143 | test_cadet_single_LDADD = $(ld_cadet_test_lib) | 129 | test_cadet_single_LDADD = $(ld_cadet_test_lib) |
144 | test_cadet_single_DEPENDENCIES = $(dep_cadet_test_lib) | ||
145 | 130 | ||
146 | test_cadet_local_SOURCES = \ | 131 | test_cadet_local_SOURCES = \ |
147 | test_cadet_local.c | 132 | test_cadet_local.c |
148 | test_cadet_local_LDADD = $(ld_cadet_test_lib) | 133 | test_cadet_local_LDADD = $(ld_cadet_test_lib) |
149 | test_cadet_local_DEPENDENCIES = $(dep_cadet_test_lib) | ||
150 | |||
151 | 134 | ||
152 | 135 | ||
153 | test_cadet_2_forward_SOURCES = \ | 136 | test_cadet_2_forward_SOURCES = \ |
154 | test_cadet.c | 137 | test_cadet.c |
155 | test_cadet_2_forward_LDADD = $(ld_cadet_test_lib) | 138 | test_cadet_2_forward_LDADD = $(ld_cadet_test_lib) |
156 | test_cadet_2_forward_DEPENDENCIES = $(dep_cadet_test_lib) | ||
157 | 139 | ||
158 | test_cadet_2_signal_SOURCES = \ | 140 | test_cadet_2_signal_SOURCES = \ |
159 | test_cadet.c | 141 | test_cadet.c |
160 | test_cadet_2_signal_LDADD = $(ld_cadet_test_lib) | 142 | test_cadet_2_signal_LDADD = $(ld_cadet_test_lib) |
161 | test_cadet_2_signal_DEPENDENCIES = $(dep_cadet_test_lib) | ||
162 | 143 | ||
163 | test_cadet_2_keepalive_SOURCES = \ | 144 | test_cadet_2_keepalive_SOURCES = \ |
164 | test_cadet.c | 145 | test_cadet.c |
165 | test_cadet_2_keepalive_LDADD = $(ld_cadet_test_lib) | 146 | test_cadet_2_keepalive_LDADD = $(ld_cadet_test_lib) |
166 | test_cadet_2_keepalive_DEPENDENCIES = $(dep_cadet_test_lib) | ||
167 | 147 | ||
168 | test_cadet_2_speed_SOURCES = \ | 148 | test_cadet_2_speed_SOURCES = \ |
169 | test_cadet.c | 149 | test_cadet.c |
170 | test_cadet_2_speed_LDADD = $(ld_cadet_test_lib) | 150 | test_cadet_2_speed_LDADD = $(ld_cadet_test_lib) |
171 | test_cadet_2_speed_DEPENDENCIES = $(dep_cadet_test_lib) | ||
172 | 151 | ||
173 | test_cadet_2_speed_ack_SOURCES = \ | 152 | test_cadet_2_speed_ack_SOURCES = \ |
174 | test_cadet.c | 153 | test_cadet.c |
175 | test_cadet_2_speed_ack_LDADD = $(ld_cadet_test_lib) | 154 | test_cadet_2_speed_ack_LDADD = $(ld_cadet_test_lib) |
176 | test_cadet_2_speed_ack_DEPENDENCIES = $(dep_cadet_test_lib) | ||
177 | 155 | ||
178 | test_cadet_2_speed_backwards_SOURCES = \ | 156 | test_cadet_2_speed_backwards_SOURCES = \ |
179 | test_cadet.c | 157 | test_cadet.c |
180 | test_cadet_2_speed_backwards_LDADD = $(ld_cadet_test_lib) | 158 | test_cadet_2_speed_backwards_LDADD = $(ld_cadet_test_lib) |
181 | test_cadet_2_speed_backwards_DEPENDENCIES = $(dep_cadet_test_lib) | ||
182 | 159 | ||
183 | test_cadet_2_speed_reliable_SOURCES = \ | 160 | test_cadet_2_speed_reliable_SOURCES = \ |
184 | test_cadet.c | 161 | test_cadet.c |
185 | test_cadet_2_speed_reliable_LDADD = $(ld_cadet_test_lib) | 162 | test_cadet_2_speed_reliable_LDADD = $(ld_cadet_test_lib) |
186 | test_cadet_2_speed_reliable_DEPENDENCIES = $(dep_cadet_test_lib) | ||
187 | 163 | ||
188 | test_cadet_2_speed_reliable_backwards_SOURCES = \ | 164 | test_cadet_2_speed_reliable_backwards_SOURCES = \ |
189 | test_cadet.c | 165 | test_cadet.c |
190 | test_cadet_2_speed_reliable_backwards_LDADD = $(ld_cadet_test_lib) | 166 | test_cadet_2_speed_reliable_backwards_LDADD = $(ld_cadet_test_lib) |
191 | test_cadet_2_speed_reliable_backwards_DEPENDENCIES = $(dep_cadet_test_lib) | ||
192 | |||
193 | 167 | ||
194 | 168 | ||
195 | test_cadet_5_forward_SOURCES = \ | 169 | test_cadet_5_forward_SOURCES = \ |
196 | test_cadet.c | 170 | test_cadet.c |
197 | test_cadet_5_forward_LDADD = $(ld_cadet_test_lib) | 171 | test_cadet_5_forward_LDADD = $(ld_cadet_test_lib) |
198 | test_cadet_5_forward_DEPENDENCIES = $(dep_cadet_test_lib) | ||
199 | 172 | ||
200 | test_cadet_5_signal_SOURCES = \ | 173 | test_cadet_5_signal_SOURCES = \ |
201 | test_cadet.c | 174 | test_cadet.c |
202 | test_cadet_5_signal_LDADD = $(ld_cadet_test_lib) | 175 | test_cadet_5_signal_LDADD = $(ld_cadet_test_lib) |
203 | test_cadet_5_signal_DEPENDENCIES = $(dep_cadet_test_lib) | ||
204 | 176 | ||
205 | test_cadet_5_keepalive_SOURCES = \ | 177 | test_cadet_5_keepalive_SOURCES = \ |
206 | test_cadet.c | 178 | test_cadet.c |
207 | test_cadet_5_keepalive_LDADD = $(ld_cadet_test_lib) | 179 | test_cadet_5_keepalive_LDADD = $(ld_cadet_test_lib) |
208 | test_cadet_5_keepalive_DEPENDENCIES = $(dep_cadet_test_lib) | ||
209 | 180 | ||
210 | test_cadet_5_speed_SOURCES = \ | 181 | test_cadet_5_speed_SOURCES = \ |
211 | test_cadet.c | 182 | test_cadet.c |
212 | test_cadet_5_speed_LDADD = $(ld_cadet_test_lib) | 183 | test_cadet_5_speed_LDADD = $(ld_cadet_test_lib) |
213 | test_cadet_5_speed_DEPENDENCIES = $(dep_cadet_test_lib) | ||
214 | 184 | ||
215 | test_cadet_5_speed_ack_SOURCES = \ | 185 | test_cadet_5_speed_ack_SOURCES = \ |
216 | test_cadet.c | 186 | test_cadet.c |
217 | test_cadet_5_speed_ack_LDADD = $(ld_cadet_test_lib) | 187 | test_cadet_5_speed_ack_LDADD = $(ld_cadet_test_lib) |
218 | test_cadet_5_speed_ack_DEPENDENCIES = $(dep_cadet_test_lib) | ||
219 | 188 | ||
220 | test_cadet_5_speed_backwards_SOURCES = \ | 189 | test_cadet_5_speed_backwards_SOURCES = \ |
221 | test_cadet.c | 190 | test_cadet.c |
222 | test_cadet_5_speed_backwards_LDADD = $(ld_cadet_test_lib) | 191 | test_cadet_5_speed_backwards_LDADD = $(ld_cadet_test_lib) |
223 | test_cadet_5_speed_backwards_DEPENDENCIES = $(dep_cadet_test_lib) | ||
224 | 192 | ||
225 | test_cadet_5_speed_reliable_SOURCES = \ | 193 | test_cadet_5_speed_reliable_SOURCES = \ |
226 | test_cadet.c | 194 | test_cadet.c |
227 | test_cadet_5_speed_reliable_LDADD = $(ld_cadet_test_lib) | 195 | test_cadet_5_speed_reliable_LDADD = $(ld_cadet_test_lib) |
228 | test_cadet_5_speed_reliable_DEPENDENCIES = $(dep_cadet_test_lib) | ||
229 | 196 | ||
230 | test_cadet_5_speed_reliable_backwards_SOURCES = \ | 197 | test_cadet_5_speed_reliable_backwards_SOURCES = \ |
231 | test_cadet.c | 198 | test_cadet.c |
232 | test_cadet_5_speed_reliable_backwards_LDADD = $(ld_cadet_test_lib) | 199 | test_cadet_5_speed_reliable_backwards_LDADD = $(ld_cadet_test_lib) |
233 | test_cadet_5_speed_reliable_backwards_DEPENDENCIES = $(dep_cadet_test_lib) | ||
234 | 200 | ||
235 | 201 | ||
236 | if ENABLE_TEST_RUN | 202 | if ENABLE_TEST_RUN |