diff options
author | Christian Grothoff <christian@grothoff.org> | 2017-03-11 13:15:25 +0100 |
---|---|---|
committer | Christian Grothoff <christian@grothoff.org> | 2017-03-11 13:15:25 +0100 |
commit | 3b76938ba264c296d14f6912f22f3116e5893eb4 (patch) | |
tree | e4cd46f510972e084ccd554de8a4bb2e233c6c82 /src/cadet/Makefile.am | |
parent | c1ca3b26ef3dc26bb853505a87b49f9a9d654caf (diff) | |
download | gnunet-3b76938ba264c296d14f6912f22f3116e5893eb4.tar.gz gnunet-3b76938ba264c296d14f6912f22f3116e5893eb4.zip |
rename cadet*new to just cadet, except for libgnunetcadetnew-logic (where the 'old' one is not yet entirely dead)
Diffstat (limited to 'src/cadet/Makefile.am')
-rw-r--r-- | src/cadet/Makefile.am | 80 |
1 files changed, 33 insertions, 47 deletions
diff --git a/src/cadet/Makefile.am b/src/cadet/Makefile.am index d7208d601..1fe912305 100644 --- a/src/cadet/Makefile.am +++ b/src/cadet/Makefile.am | |||
@@ -22,7 +22,7 @@ plugindir = $(libdir)/gnunet | |||
22 | AM_CLFAGS = -g | 22 | AM_CLFAGS = -g |
23 | 23 | ||
24 | libexec_PROGRAMS = \ | 24 | libexec_PROGRAMS = \ |
25 | gnunet-service-cadet-new \ | 25 | gnunet-service-cadet \ |
26 | $(EXP_LIBEXEC) | 26 | $(EXP_LIBEXEC) |
27 | 27 | ||
28 | bin_PROGRAMS = \ | 28 | bin_PROGRAMS = \ |
@@ -60,17 +60,17 @@ gnunet_cadet_LDADD = \ | |||
60 | libgnunetcadetnew.la \ | 60 | libgnunetcadetnew.la \ |
61 | $(top_builddir)/src/util/libgnunetutil.la | 61 | $(top_builddir)/src/util/libgnunetutil.la |
62 | 62 | ||
63 | gnunet_service_cadet_new_SOURCES = \ | 63 | gnunet_service_cadet_SOURCES = \ |
64 | gnunet-service-cadet-new.c gnunet-service-cadet-new.h \ | 64 | gnunet-service-cadet.c gnunet-service-cadet.h \ |
65 | gnunet-service-cadet-new_channel.c gnunet-service-cadet-new_channel.h \ | 65 | gnunet-service-cadet_channel.c gnunet-service-cadet_channel.h \ |
66 | gnunet-service-cadet-new_connection.c gnunet-service-cadet-new_connection.h \ | 66 | gnunet-service-cadet_connection.c gnunet-service-cadet_connection.h \ |
67 | gnunet-service-cadet-new_core.c gnunet-service-cadet-new_core.h \ | 67 | gnunet-service-cadet_core.c gnunet-service-cadet_core.h \ |
68 | gnunet-service-cadet-new_dht.c gnunet-service-cadet-new_dht.h \ | 68 | gnunet-service-cadet_dht.c gnunet-service-cadet_dht.h \ |
69 | gnunet-service-cadet-new_hello.c gnunet-service-cadet-new_hello.h \ | 69 | gnunet-service-cadet_hello.c gnunet-service-cadet_hello.h \ |
70 | gnunet-service-cadet-new_tunnels.c gnunet-service-cadet-new_tunnels.h \ | 70 | gnunet-service-cadet_tunnels.c gnunet-service-cadet_tunnels.h \ |
71 | gnunet-service-cadet-new_paths.c gnunet-service-cadet-new_paths.h \ | 71 | gnunet-service-cadet_paths.c gnunet-service-cadet_paths.h \ |
72 | gnunet-service-cadet-new_peer.c gnunet-service-cadet-new_peer.h | 72 | gnunet-service-cadet_peer.c gnunet-service-cadet_peer.h |
73 | gnunet_service_cadet_new_LDADD = \ | 73 | gnunet_service_cadet_LDADD = \ |
74 | $(top_builddir)/src/util/libgnunetutil.la \ | 74 | $(top_builddir)/src/util/libgnunetutil.la \ |
75 | $(top_builddir)/src/ats/libgnunetats.la \ | 75 | $(top_builddir)/src/ats/libgnunetats.la \ |
76 | $(top_builddir)/src/core/libgnunetcore.la \ | 76 | $(top_builddir)/src/core/libgnunetcore.la \ |
@@ -87,7 +87,7 @@ endif | |||
87 | 87 | ||
88 | if HAVE_TESTING | 88 | if HAVE_TESTING |
89 | noinst_LTLIBRARIES = libgnunetcadettest.la $(noinst_LIB_EXP) | 89 | noinst_LTLIBRARIES = libgnunetcadettest.la $(noinst_LIB_EXP) |
90 | noinst_PROGRAMS = gnunet-cadet-profiler | 90 | # noinst_PROGRAMS = gnunet-cadet-profiler |
91 | endif | 91 | endif |
92 | 92 | ||
93 | if HAVE_TESTING | 93 | if HAVE_TESTING |
@@ -112,23 +112,10 @@ check_PROGRAMS = \ | |||
112 | test_cadet_5_speed_backwards | 112 | test_cadet_5_speed_backwards |
113 | endif | 113 | endif |
114 | 114 | ||
115 | ld_cadet_test_lib = \ | ||
116 | $(top_builddir)/src/util/libgnunetutil.la \ | ||
117 | $(top_builddir)/src/testing/libgnunettesting.la \ | ||
118 | libgnunetcadettest.la \ | ||
119 | libgnunetcadet.la \ | ||
120 | $(top_builddir)/src/testbed/libgnunettestbed.la \ | ||
121 | $(top_builddir)/src/statistics/libgnunetstatistics.la | ||
122 | 115 | ||
123 | dep_cadet_test_lib = \ | 116 | #gnunet_cadet_profiler_SOURCES = \ |
124 | libgnunetcadet.la \ | 117 | # gnunet-cadet-profiler.c |
125 | libgnunetcadettest.la \ | 118 | #gnunet_cadet_profiler_LDADD = $(ld_cadet_test_lib) |
126 | $(top_builddir)/src/statistics/libgnunetstatistics.la | ||
127 | |||
128 | |||
129 | gnunet_cadet_profiler_SOURCES = \ | ||
130 | gnunet-cadet-profiler.c | ||
131 | gnunet_cadet_profiler_LDADD = $(ld_cadet_test_lib) | ||
132 | 119 | ||
133 | 120 | ||
134 | test_cadet_local_mq_SOURCES = \ | 121 | test_cadet_local_mq_SOURCES = \ |
@@ -140,7 +127,7 @@ test_cadet_local_mq_LDADD = \ | |||
140 | 127 | ||
141 | 128 | ||
142 | libgnunetcadettest_la_SOURCES = \ | 129 | libgnunetcadettest_la_SOURCES = \ |
143 | cadet_test_lib_new.c cadet_test_lib_new.h | 130 | cadet_test_lib.c cadet_test_lib.h |
144 | libgnunetcadettest_la_LIBADD = \ | 131 | libgnunetcadettest_la_LIBADD = \ |
145 | $(top_builddir)/src/util/libgnunetutil.la \ | 132 | $(top_builddir)/src/util/libgnunetutil.la \ |
146 | $(top_builddir)/src/testbed/libgnunettestbed.la \ | 133 | $(top_builddir)/src/testbed/libgnunettestbed.la \ |
@@ -159,68 +146,67 @@ dep_cadet_test_lib = \ | |||
159 | $(top_builddir)/src/statistics/libgnunetstatistics.la | 146 | $(top_builddir)/src/statistics/libgnunetstatistics.la |
160 | 147 | ||
161 | test_cadet_2_forward_SOURCES = \ | 148 | test_cadet_2_forward_SOURCES = \ |
162 | test_cadet_new.c | 149 | test_cadet.c |
163 | test_cadet_2_forward_LDADD = $(ld_cadet_test_lib) | 150 | test_cadet_2_forward_LDADD = $(ld_cadet_test_lib) |
164 | 151 | ||
165 | test_cadet_2_signal_SOURCES = \ | 152 | test_cadet_2_signal_SOURCES = \ |
166 | test_cadet_new.c | 153 | test_cadet.c |
167 | test_cadet_2_signal_LDADD = $(ld_cadet_test_lib) | 154 | test_cadet_2_signal_LDADD = $(ld_cadet_test_lib) |
168 | 155 | ||
169 | test_cadet_2_keepalive_SOURCES = \ | 156 | test_cadet_2_keepalive_SOURCES = \ |
170 | test_cadet_new.c | 157 | test_cadet.c |
171 | test_cadet_2_keepalive_LDADD = $(ld_cadet_test_lib) | 158 | test_cadet_2_keepalive_LDADD = $(ld_cadet_test_lib) |
172 | 159 | ||
173 | test_cadet_2_speed_SOURCES = \ | 160 | test_cadet_2_speed_SOURCES = \ |
174 | test_cadet_new.c | 161 | test_cadet.c |
175 | test_cadet_2_speed_LDADD = $(ld_cadet_test_lib) | 162 | test_cadet_2_speed_LDADD = $(ld_cadet_test_lib) |
176 | 163 | ||
177 | test_cadet_2_speed_ack_SOURCES = \ | 164 | test_cadet_2_speed_ack_SOURCES = \ |
178 | test_cadet_new.c | 165 | test_cadet.c |
179 | test_cadet_2_speed_ack_LDADD = $(ld_cadet_test_lib) | 166 | test_cadet_2_speed_ack_LDADD = $(ld_cadet_test_lib) |
180 | 167 | ||
181 | test_cadet_2_speed_backwards_SOURCES = \ | 168 | test_cadet_2_speed_backwards_SOURCES = \ |
182 | test_cadet_new.c | 169 | test_cadet.c |
183 | test_cadet_2_speed_backwards_LDADD = $(ld_cadet_test_lib) | 170 | test_cadet_2_speed_backwards_LDADD = $(ld_cadet_test_lib) |
184 | 171 | ||
185 | test_cadet_2_speed_reliable_SOURCES = \ | 172 | test_cadet_2_speed_reliable_SOURCES = \ |
186 | test_cadet_new.c | 173 | test_cadet.c |
187 | test_cadet_2_speed_reliable_LDADD = $(ld_cadet_test_lib) | 174 | test_cadet_2_speed_reliable_LDADD = $(ld_cadet_test_lib) |
188 | 175 | ||
189 | test_cadet_2_speed_reliable_backwards_SOURCES = \ | 176 | test_cadet_2_speed_reliable_backwards_SOURCES = \ |
190 | test_cadet_new.c | 177 | test_cadet.c |
191 | test_cadet_2_speed_reliable_backwards_LDADD = $(ld_cadet_test_lib) | 178 | test_cadet_2_speed_reliable_backwards_LDADD = $(ld_cadet_test_lib) |
192 | 179 | ||
193 | |||
194 | test_cadet_5_forward_SOURCES = \ | 180 | test_cadet_5_forward_SOURCES = \ |
195 | test_cadet_new.c | 181 | test_cadet.c |
196 | test_cadet_5_forward_LDADD = $(ld_cadet_test_lib) | 182 | test_cadet_5_forward_LDADD = $(ld_cadet_test_lib) |
197 | 183 | ||
198 | test_cadet_5_signal_SOURCES = \ | 184 | test_cadet_5_signal_SOURCES = \ |
199 | test_cadet_new.c | 185 | test_cadet.c |
200 | test_cadet_5_signal_LDADD = $(ld_cadet_test_lib) | 186 | test_cadet_5_signal_LDADD = $(ld_cadet_test_lib) |
201 | 187 | ||
202 | test_cadet_5_keepalive_SOURCES = \ | 188 | test_cadet_5_keepalive_SOURCES = \ |
203 | test_cadet_new.c | 189 | test_cadet.c |
204 | test_cadet_5_keepalive_LDADD = $(ld_cadet_test_lib) | 190 | test_cadet_5_keepalive_LDADD = $(ld_cadet_test_lib) |
205 | 191 | ||
206 | test_cadet_5_speed_SOURCES = \ | 192 | test_cadet_5_speed_SOURCES = \ |
207 | test_cadet_new.c | 193 | test_cadet.c |
208 | test_cadet_5_speed_LDADD = $(ld_cadet_test_lib) | 194 | test_cadet_5_speed_LDADD = $(ld_cadet_test_lib) |
209 | 195 | ||
210 | test_cadet_5_speed_ack_SOURCES = \ | 196 | test_cadet_5_speed_ack_SOURCES = \ |
211 | test_cadet_new.c | 197 | test_cadet.c |
212 | test_cadet_5_speed_ack_LDADD = $(ld_cadet_test_lib) | 198 | test_cadet_5_speed_ack_LDADD = $(ld_cadet_test_lib) |
213 | 199 | ||
214 | test_cadet_5_speed_backwards_SOURCES = \ | 200 | test_cadet_5_speed_backwards_SOURCES = \ |
215 | test_cadet_new.c | 201 | test_cadet.c |
216 | test_cadet_5_speed_backwards_LDADD = $(ld_cadet_test_lib) | 202 | test_cadet_5_speed_backwards_LDADD = $(ld_cadet_test_lib) |
217 | 203 | ||
218 | test_cadet_5_speed_reliable_SOURCES = \ | 204 | test_cadet_5_speed_reliable_SOURCES = \ |
219 | test_cadet_new.c | 205 | test_cadet.c |
220 | test_cadet_5_speed_reliable_LDADD = $(ld_cadet_test_lib) | 206 | test_cadet_5_speed_reliable_LDADD = $(ld_cadet_test_lib) |
221 | 207 | ||
222 | test_cadet_5_speed_reliable_backwards_SOURCES = \ | 208 | test_cadet_5_speed_reliable_backwards_SOURCES = \ |
223 | test_cadet_new.c | 209 | test_cadet.c |
224 | test_cadet_5_speed_reliable_backwards_LDADD = $(ld_cadet_test_lib) | 210 | test_cadet_5_speed_reliable_backwards_LDADD = $(ld_cadet_test_lib) |
225 | 211 | ||
226 | 212 | ||