1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
79
80
81
82
83
84
85
86
87
88
89
90
91
92
93
94
95
96
97
98
99
100
101
102
103
104
105
106
107
108
109
110
111
112
113
114
115
116
117
118
119
120
121
122
123
124
125
126
127
128
129
130
131
132
133
134
135
136
137
138
139
140
141
142
143
144
145
146
147
148
149
150
151
152
153
154
155
156
157
158
159
160
161
162
163
164
165
166
167
168
169
170
171
172
173
174
175
176
177
178
179
180
181
182
183
184
185
186
187
188
189
190
191
192
193
194
195
196
197
198
199
200
201
202
203
204
205
206
207
208
209
210
211
212
213
214
215
216
217
218
219
220
221
222
223
224
225
226
227
228
229
230
231
232
233
234
235
236
237
238
239
240
241
242
|
Fixing parallel build issues
--- src/server/Makefile.am
+++ src/server/Makefile.am
@@ -30,26 +30,25 @@
gnunetd_SOURCES = \
gnunetd.c
gnunetd_LDADD = \
- $(top_builddir)/src/server/libgnunetcore.la \
+ libgnunetcore.la \
$(GN_LIBINTL)
gnunet_update_SOURCES = \
gnunet-update.c
gnunet_update_LDADD = \
- $(top_builddir)/src/server/libgnunetcore.la \
+ libgnunetcore.la \
$(GN_LIBINTL)
gnunet_peer_info_SOURCES = \
gnunet-peer-info.c
gnunet_peer_info_LDADD = \
$(top_builddir)/src/util/libgnunetutil.la \
- $(top_builddir)/src/server/libgnunetcore.la \
+ libgnunetcore.la \
$(GN_LIBINTL)
gnunet_transport_check_SOURCES = \
gnunet-transport-check.c
gnunet_transport_check_LDADD = \
- $(top_builddir)/src/server/libgnunetcore.la \
+ libgnunetcore.la \
$(GN_LIBINTL)
-
--- src/applications/stats/Makefile.am
+++ src/applications/stats/Makefile.am
@@ -21,7 +21,7 @@
gnunet_stats_SOURCES = \
gnunet-stats.c
gnunet_stats_LDADD = \
- $(top_builddir)/src/applications/stats/libgnunetstatsapi.la \
+ libgnunetstatsapi.la \
$(top_builddir)/src/util/libgnunetutil.la \
$(GN_LIBINTL)
--- src/applications/rpc/Makefile.am
+++ src/applications/rpc/Makefile.am
@@ -16,7 +16,7 @@
libgnunetmodule_rpc_la_LDFLAGS = \
$(GN_PLUGIN_LDFLAGS)
libgnunetmodule_rpc_la_LIBADD = \
- $(top_builddir)/src/applications/rpc/libgnunetrpcutil.la \
+ libgnunetrpcutil.la \
$(top_builddir)/src/util/libgnunetutil.la \
$(GN_LIBINTL)
--- src/applications/tracekit/Makefile.am
+++ src/applications/tracekit/Makefile.am
@@ -18,7 +18,7 @@
gnunet-tracekit.c \
tracekit.h
gnunet_tracekit_LDADD = \
- $(top_builddir)/src/applications/tracekit/libgnunettracekitapi.la \
+ libgnunettracekitapi.la \
$(top_builddir)/src/util/libgnunetutil.la \
$(GN_LIBINTL)
@@ -53,5 +53,5 @@
tracekittest_LDADD = \
$(top_builddir)/src/applications/testing/libgnunettestingapi.la \
$(top_builddir)/src/applications/stats/libgnunetstatsapi.la \
- $(top_builddir)/src/applications/tracekit/libgnunettracekitapi.la \
+ libgnunettracekitapi.la \
$(top_builddir)/src/util/libgnunetutil.la
--- src/applications/testing/Makefile.am
+++ src/applications/testing/Makefile.am
@@ -40,20 +40,20 @@
testingtest.c
testingtest_LDADD = \
$(top_builddir)/src/util/libgnunetutil.la \
- $(top_builddir)/src/applications/testing/libgnunettestingapi.la
+ libgnunettestingapi.la
remotetest_SOURCES = \
remotetest.c
remotetest_LDADD = \
$(top_builddir)/src/util/libgnunetutil.la \
- $(top_builddir)/src/applications/testing/libgnunetremoteapi.la
+ libgnunetremoteapi.la
testingtest_loop_SOURCES = \
testingtest_loop.c
testingtest_loop_LDADD = \
$(top_builddir)/src/util/libgnunetutil.la \
- $(top_builddir)/src/applications/testing/libgnunettestingapi.la
+ libgnunettestingapi.la
pkgdata_DATA = \
--- src/applications/fs/fsui/Makefile.am.orig 2010-04-06 15:02:21.375530243 +0000
+++ src/applications/fs/fsui/Makefile.am 2010-04-06 15:03:26.424279707 +0000
@@ -37,7 +37,7 @@
fsui_loader_SOURCES = \
fsui-loader.c
fsui_loader_LDADD = \
- $(top_builddir)/src/applications/fs/fsui/libgnunetfsui.la \
+ libgnunetfsui.la \
$(top_builddir)/src/applications/fs/ecrs/libgnunetecrs.la \
$(top_builddir)/src/util/libgnunetutil.la
@@ -59,14 +59,14 @@
basic_fsui_test.c
basic_fsui_test_LDADD = \
$(top_builddir)/src/applications/fs/ecrs/libgnunetecrs.la \
- $(top_builddir)/src/applications/fs/fsui/libgnunetfsui.la \
+ libgnunetfsui.la \
$(top_builddir)/src/util/libgnunetutil.la
fsui_start_stop_test_SOURCES = \
fsui_start_stop_test.c
fsui_start_stop_test_LDADD = \
$(top_builddir)/src/applications/fs/ecrs/libgnunetecrs.la \
- $(top_builddir)/src/applications/fs/fsui/libgnunetfsui.la \
+ libgnunetfsui.la \
$(top_builddir)/src/util/libgnunetutil.la
search_pause_resume_persistence_test_SOURCES = \
@@ -80,42 +80,42 @@
search_ranking_test.c
search_ranking_test_LDADD = \
$(top_builddir)/src/applications/fs/ecrs/libgnunetecrs.la \
- $(top_builddir)/src/applications/fs/fsui/libgnunetfsui.la \
+ libgnunetfsui.la \
$(top_builddir)/src/util/libgnunetutil.la
download_persistence_test_SOURCES = \
download_persistence_test.c
download_persistence_test_LDADD = \
$(top_builddir)/src/applications/fs/ecrs/libgnunetecrs.la \
- $(top_builddir)/src/applications/fs/fsui/libgnunetfsui.la \
+ libgnunetfsui.la \
$(top_builddir)/src/util/libgnunetutil.la
recursive_download_test_SOURCES = \
recursive_download_test.c
recursive_download_test_LDADD = \
$(top_builddir)/src/applications/fs/ecrs/libgnunetecrs.la \
- $(top_builddir)/src/applications/fs/fsui/libgnunetfsui.la \
+ libgnunetfsui.la \
$(top_builddir)/src/util/libgnunetutil.la
upload_unindex_persistence_test_SOURCES = \
upload_unindex_persistence_test.c
upload_unindex_persistence_test_LDADD = \
$(top_builddir)/src/applications/fs/ecrs/libgnunetecrs.la \
- $(top_builddir)/src/applications/fs/fsui/libgnunetfsui.la \
+ libgnunetfsui.la \
$(top_builddir)/src/util/libgnunetutil.la
search_linked_download_persistence_test_SOURCES = \
search_linked_download_persistence_test.c
search_linked_download_persistence_test_LDADD = \
$(top_builddir)/src/applications/fs/ecrs/libgnunetecrs.la \
- $(top_builddir)/src/applications/fs/fsui/libgnunetfsui.la \
+ libgnunetfsui.la \
$(top_builddir)/src/util/libgnunetutil.la
search_persistence_test_SOURCES = \
search_persistence_test.c
search_persistence_test_LDADD = \
$(top_builddir)/src/applications/fs/ecrs/libgnunetecrs.la \
- $(top_builddir)/src/applications/fs/fsui/libgnunetfsui.la \
+ libgnunetfsui.la \
$(top_builddir)/src/util/libgnunetutil.la
@@ -123,6 +123,6 @@
recursive_download_persistence_test.c
recursive_download_persistence_test_LDADD = \
$(top_builddir)/src/applications/fs/ecrs/libgnunetecrs.la \
- $(top_builddir)/src/applications/fs/fsui/libgnunetfsui.la \
+ libgnunetfsui.la \
$(top_builddir)/src/util/libgnunetutil.la
--- src/applications/dv_dht/tools/Makefile.am.orig 2010-04-06 15:04:16.738530159 +0000
+++ src/applications/dv_dht/tools/Makefile.am 2010-04-06 15:04:40.525280090 +0000
@@ -24,7 +24,7 @@
gnunet_dvdht_query_SOURCES = \
dht-query.c
gnunet_dvdht_query_LDADD = \
- $(top_builddir)/src/applications/dv_dht/tools/libgnunetdvdhtapi.la \
+ libgnunetdvdhtapi.la \
$(top_builddir)/src/util/libgnunetutil.la \
$(GN_LIBINTL)
@@ -34,7 +34,7 @@
$(top_builddir)/src/applications/stats/libgnunetstatsapi.la \
$(top_builddir)/src/applications/testing/libgnunettestingapi.la \
$(top_builddir)/src/applications/testing/libgnunetremoteapi.la \
- $(top_builddir)/src/applications/dv_dht/tools/libgnunetdvdhtapi.la \
+ libgnunetdvdhtapi.la \
$(top_builddir)/src/util/libgnunetutil.la
check_PROGRAMS = \
@@ -49,7 +49,7 @@
dv_dht_loopback_test_LDADD = \
$(top_builddir)/src/applications/stats/libgnunetstatsapi.la \
$(top_builddir)/src/applications/testing/libgnunettestingapi.la \
- $(top_builddir)/src/applications/dv_dht/tools/libgnunetdvdhtapi.la \
+ libgnunetdvdhtapi.la \
$(top_builddir)/src/util/libgnunetutil.la
dv_dht_twopeer_test_SOURCES = \
@@ -57,7 +57,7 @@
dv_dht_twopeer_test_LDADD = \
$(top_builddir)/src/applications/stats/libgnunetstatsapi.la \
$(top_builddir)/src/applications/testing/libgnunettestingapi.la \
- $(top_builddir)/src/applications/dv_dht/tools/libgnunetdvdhtapi.la \
+ libgnunetdvdhtapi.la \
$(top_builddir)/src/util/libgnunetutil.la
dv_dht_multipeer_test_SOURCES = \
@@ -65,7 +65,7 @@
dv_dht_multipeer_test_LDADD = \
$(top_builddir)/src/applications/stats/libgnunetstatsapi.la \
$(top_builddir)/src/applications/testing/libgnunettestingapi.la \
- $(top_builddir)/src/applications/dv_dht/tools/libgnunetdvdhtapi.la \
+ libgnunetdvdhtapi.la \
$(top_builddir)/src/util/libgnunetutil.la
dv_dht_multi_topology_test_SOURCES = \
@@ -74,7 +74,7 @@
$(top_builddir)/src/applications/stats/libgnunetstatsapi.la \
$(top_builddir)/src/applications/testing/libgnunettestingapi.la \
$(top_builddir)/src/applications/testing/libgnunetremoteapi.la \
- $(top_builddir)/src/applications/dv_dht/tools/libgnunetdvdhtapi.la \
+ libgnunetdvdhtapi.la \
$(top_builddir)/src/util/libgnunetutil.la
EXTRA_DIST = \
|
GitWeb