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/dht | |
parent | e184df6030ab5c5374fe3b8a94482ff5a30c1580 (diff) | |
download | gnunet-d94c5185fcdf47c6a57d3233b946fa7e621f7ad9.tar.gz gnunet-d94c5185fcdf47c6a57d3233b946fa7e621f7ad9.zip |
fixing parallel build, getting rid of useless _DEPENDENCIES declarations
Diffstat (limited to 'src/dht')
-rw-r--r-- | src/dht/Makefile.am | 59 |
1 files changed, 17 insertions, 42 deletions
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) |
44 | libgnunet_plugin_block_dht_la_LDFLAGS = \ | 44 | libgnunet_plugin_block_dht_la_LDFLAGS = \ |
45 | $(GN_PLUGIN_LDFLAGS) | 45 | $(GN_PLUGIN_LDFLAGS) |
46 | libgnunet_plugin_block_dht_la_DEPENDENCIES = \ | ||
47 | $(top_builddir)/src/block/libgnunetblock.la | ||
48 | |||
49 | 46 | ||
50 | 47 | ||
51 | libexec_PROGRAMS = \ | 48 | libexec_PROGRAMS = \ |
@@ -105,39 +102,31 @@ gnunet_service_dht_xvine_LDADD = \ | |||
105 | gnunet_dht_get_SOURCES = \ | 102 | gnunet_dht_get_SOURCES = \ |
106 | gnunet-dht-get.c | 103 | gnunet-dht-get.c |
107 | gnunet_dht_get_LDADD = \ | 104 | gnunet_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 |
111 | gnunet_dht_get_DEPENDENCIES = \ | ||
112 | libgnunetdht.la | ||
113 | 108 | ||
114 | gnunet_dht_put_SOURCES = \ | 109 | gnunet_dht_put_SOURCES = \ |
115 | gnunet-dht-put.c | 110 | gnunet-dht-put.c |
116 | gnunet_dht_put_LDADD = \ | 111 | gnunet_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 |
120 | gnunet_dht_put_DEPENDENCIES = \ | ||
121 | libgnunetdht.la | ||
122 | 115 | ||
123 | gnunet_dht_monitor_SOURCES = \ | 116 | gnunet_dht_monitor_SOURCES = \ |
124 | gnunet-dht-monitor.c | 117 | gnunet-dht-monitor.c |
125 | gnunet_dht_monitor_LDADD = \ | 118 | gnunet_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 |
129 | gnunet_dht_monitor_DEPENDENCIES = \ | ||
130 | libgnunetdht.la | ||
131 | 122 | ||
132 | gnunet_dht_profiler_SOURCES = \ | 123 | gnunet_dht_profiler_SOURCES = \ |
133 | gnunet_dht_profiler.c | 124 | gnunet_dht_profiler.c |
134 | gnunet_dht_profiler_LDADD = \ | 125 | gnunet_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 |
139 | gnunet_dht_profiler_DEPENDENCIES = \ | ||
140 | libgnunetdht.la | ||
141 | 130 | ||
142 | if HAVE_TESTING | 131 | if HAVE_TESTING |
143 | noinst_LIBRARIES = libgnunetdhttest.a | 132 | noinst_LIBRARIES = libgnunetdhttest.a |
@@ -148,9 +137,7 @@ libgnunetdhttest_a_SOURCES = \ | |||
148 | libgnunetdhttest_a_LIBADD = \ | 137 | libgnunetdhttest_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 |
152 | libgnunetdhttest_a_DEPENDENCIES = \ | ||
153 | libgnunetdht.la | ||
154 | 141 | ||
155 | if HAVE_TESTING | 142 | if HAVE_TESTING |
156 | check_PROGRAMS = \ | 143 | check_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 |
187 | test_dht_api_DEPENDENCIES = \ | ||
188 | libgnunetdht.la | ||
189 | 174 | ||
190 | test_dht_twopeer_SOURCES = \ | 175 | test_dht_twopeer_SOURCES = \ |
191 | test_dht_topo.c | 176 | test_dht_topo.c |
192 | test_dht_twopeer_LDADD = \ | 177 | test_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 |
198 | test_dht_twopeer_DEPENDENCIES = \ | ||
199 | libgnunetdht.la | ||
200 | 183 | ||
201 | test_dht_2dtorus_SOURCES = \ | 184 | test_dht_2dtorus_SOURCES = \ |
202 | test_dht_topo.c | 185 | test_dht_topo.c |
203 | test_dht_2dtorus_LDADD = \ | 186 | test_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 |
208 | test_dht_2dtorus_DEPENDENCIES = \ | ||
209 | libgnunetdht.la | ||
210 | 191 | ||
211 | test_dht_line_SOURCES = \ | 192 | test_dht_line_SOURCES = \ |
212 | test_dht_topo.c | 193 | test_dht_topo.c |
213 | test_dht_line_LDADD = \ | 194 | test_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 |
218 | test_dht_line_DEPENDENCIES = \ | ||
219 | libgnunetdht.la | ||
220 | 199 | ||
221 | test_dht_multipeer_SOURCES = \ | 200 | test_dht_multipeer_SOURCES = \ |
222 | test_dht_topo.c | 201 | test_dht_topo.c |
223 | test_dht_multipeer_LDADD = \ | 202 | test_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 |
229 | test_dht_multipeer_DEPENDENCIES = \ | ||
230 | libgnunetdht.la | ||
231 | 208 | ||
232 | test_dht_monitor_SOURCES = \ | 209 | test_dht_monitor_SOURCES = \ |
233 | test_dht_monitor.c | 210 | test_dht_monitor.c |
234 | test_dht_monitor_LDADD = \ | 211 | test_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 |
239 | test_dht_monitor_DEPENDENCIES = \ | ||
240 | libgnunetdht.la | ||
241 | 216 | ||
242 | EXTRA_DIST = \ | 217 | EXTRA_DIST = \ |
243 | $(check_SCRIPTS) \ | 218 | $(check_SCRIPTS) \ |