]>
Commit | Line | Data |
---|---|---|
e0d09ed7 ER |
1 | --- cyrus-imapd-2.4.4/com_err/et/Makefile.in 2010-11-12 00:15:33.000000000 +0200 |
2 | +++ cyrus-imapd-2.4.4-makeopt/com_err/et/Makefile.in 2010-11-27 17:50:39.110743283 +0200 | |
3 | @@ -132,7 +132,7 @@ | |
4 | ## | |
5 | ||
6 | libcom_err.o: $(LIBOBJS) | |
7 | - ld -r -s -o libcom_err.o $(LIBOBJS) | |
8 | + ld -r -s -o $@ $? \ | |
9 | chmod -x libcom_err.o | |
10 | ||
11 | TAGS: et_name.c error_message.c compile_et.c error_table.c \ | |
12 | --- cyrus-imapd-2.4.4/imap/Makefile.in 2010-11-12 00:15:33.000000000 +0200 | |
13 | +++ cyrus-imapd-2.4.4-makeopt/imap/Makefile.in 2010-11-27 17:45:48.382799837 +0200 | |
14 | @@ -181,189 +181,180 @@ | |
15 | ||
16 | ### Services | |
17 | idled: idled.o mutex_fake.o libimap.a $(DEPLIBS) | |
18 | - $(CC) $(LDFLAGS) -o idled \ | |
19 | - idled.o mutex_fake.o libimap.a $(DEPLIBS) $(LIBS) | |
20 | + $(CC) $(LDFLAGS) -o $@ $? \ | |
21 | + $(LIBS) | |
22 | ||
23 | lmtpd: lmtpd.o proxy.o $(LMTPOBJS) $(SIEVE_OBJS) mutex_fake.o \ | |
24 | libimap.a $(SIEVE_LIBS) $(DEPLIBS) $(SERVICE) | |
25 | - $(CC) $(LDFLAGS) -o lmtpd \ | |
26 | - $(SERVICE) lmtpd.o proxy.o $(LMTPOBJS) $(SIEVE_OBJS) \ | |
27 | - mutex_fake.o libimap.a $(SIEVE_LIBS) $(DEPLIBS) $(LIBS) $(LIB_WRAP) | |
28 | + $(CC) $(LDFLAGS) -o $@ $? \ | |
29 | + $(LIBS) $(LIB_WRAP) | |
30 | ||
31 | lmtpd.pure: lmtpd.o proxy.o $(LMTPOBJS) $(SIEVE_OBJS) \ | |
32 | mutex_fake.o libimap.a $(SIEVE_LIBS) $(DEPLIBS) $(SERVICE) | |
33 | - $(PURIFY) $(PUREOPT) $(CC) $(LDFLAGS) -o lmtpd.pure \ | |
34 | - $(SERVICE) lmtpd.o proxy.o $(LMTPOBJS) $(SIEVE_OBJS) \ | |
35 | - mutex_fake.o libimap.a $(SIEVE_LIBS) $(DEPLIBS) $(LIBS) $(LIB_WRAP) | |
36 | + $(PURIFY) $(PUREOPT) $(CC) $(LDFLAGS) -o $@ $? \ | |
37 | + $(LIBS) $(LIB_WRAP) | |
38 | ||
39 | imapd: $(IMAPDOBJS) mutex_fake.o libimap.a $(DEPLIBS) $(SERVICE) | |
40 | - $(CC) $(LDFLAGS) -o imapd \ | |
41 | - $(SERVICE) $(IMAPDOBJS) mutex_fake.o \ | |
42 | - libimap.a $(DEPLIBS) $(LIBS) $(LIB_WRAP) | |
43 | + $(CC) $(LDFLAGS) -o $@ $? \ | |
44 | + $(LIBS) $(LIB_WRAP) | |
45 | ||
46 | imapd.pure: $(IMAPDOBJS) mutex_fake.o libimap.a $(DEPLIBS) $(SERVICE) | |
47 | - $(PURIFY) $(PUREOPT) $(CC) $(LDFLAGS) -o imapd.pure \ | |
48 | - $(SERVICE) $(IMAPDOBJS) mutex_fake.o libimap.a \ | |
49 | - $(DEPLIBS) $(LIBS) $(LIB_WRAP) | |
50 | + $(PURIFY) $(PUREOPT) $(CC) $(LDFLAGS) -o $@ $? \ | |
51 | + $(LIBS) $(LIB_WRAP) | |
52 | ||
53 | imapd.quant: $(IMAPDOBJS) mutex_fake.o libimap.a $(DEPLIBS) $(SERVICE) | |
54 | - $(QUANTIFY) $(QUANTOPT) $(CC) $(LDFLAGS) -o imapd.quant \ | |
55 | - $(SERVICE) $(IMAPDOBJS) mutex_fake.o libimap.a \ | |
56 | - $(DEPLIBS) $(LIBS) $(LIB_WRAP) | |
57 | + $(QUANTIFY) $(QUANTOPT) $(CC) $(LDFLAGS) -o $@ $? \ | |
58 | + $(LIBS) $(LIB_WRAP) | |
59 | ||
60 | mupdate: mupdate.o mupdate-slave.o mupdate-client.o mutex_pthread.o tls.o \ | |
61 | libimap.a $(DEPLIBS) | |
62 | - $(CC) $(LDFLAGS) -o mupdate \ | |
63 | - $(SERVICETHREAD) mupdate.o mupdate-slave.o mupdate-client.o \ | |
64 | - mutex_pthread.o tls.o libimap.a \ | |
65 | - $(DEPLIBS) $(LIBS) $(LIB_WRAP) -lpthread | |
66 | + $(CC) $(LDFLAGS) -o $@ $? \ | |
67 | + $(SERVICETHREAD) \ | |
68 | + $(LIBS) $(LIB_WRAP) -lpthread | |
69 | ||
70 | mupdate.pure: mupdate.o mupdate-slave.o mupdate-client.o mutex_pthread.o \ | |
71 | libimap.a $(DEPLIBS) | |
72 | - $(PURIFY) $(PUREOPT) $(CC) $(LDFLAGS) -o mupdate.pure \ | |
73 | - $(SERVICETHREAD) mupdate.o mupdate-slave.o mupdate-client.o \ | |
74 | - mutex_pthread.o libimap.a $(DEPLIBS) $(LIBS) $(LIB_WRAP) -lpthread | |
75 | + $(PURIFY) $(PUREOPT) $(CC) $(LDFLAGS) -o $@ $? \ | |
76 | + $(SERVICETHREAD) \ | |
77 | + $(LIBS) $(LIB_WRAP) -lpthread | |
78 | ||
79 | pop3d: pop3d.o proxy.o backend.o tls.o mutex_fake.o libimap.a \ | |
80 | $(DEPLIBS) $(SERVICE) | |
81 | - $(CC) $(LDFLAGS) -o pop3d pop3d.o proxy.o backend.o tls.o $(SERVICE) \ | |
82 | - mutex_fake.o libimap.a $(DEPLIBS) $(LIBS) $(LIB_WRAP) | |
83 | + $(CC) $(LDFLAGS) -o $@ $? \ | |
84 | + $(LIBS) $(LIB_WRAP) | |
85 | ||
86 | nntpd: nntpd.o proxy.o backend.o index.o smtpclient.o spool.o tls.o \ | |
87 | mutex_fake.o nntp_err.o libimap.a $(DEPLIBS) $(SERVICE) | |
88 | - $(CC) $(LDFLAGS) -o nntpd nntpd.o proxy.o backend.o index.o spool.o \ | |
89 | - smtpclient.o tls.o $(SERVICE) mutex_fake.o nntp_err.o \ | |
90 | - libimap.a $(DEPLIBS) $(LIBS) $(LIB_WRAP) | |
91 | + $(CC) $(LDFLAGS) -o $@ $? \ | |
92 | + $(LIBS) $(LIB_WRAP) | |
93 | ||
94 | fud: fud.o libimap.a mutex_fake.o $(DEPLIBS) $(SERVICE) | |
95 | - $(CC) $(LDFLAGS) -o fud $(SERVICE) fud.o mutex_fake.o libimap.a \ | |
96 | - $(DEPLIBS) $(LIBS) $(LIB_WRAP) | |
97 | + $(CC) $(LDFLAGS) -o $@ $? \ | |
98 | + $(LIBS) $(LIB_WRAP) | |
99 | ||
100 | smmapd: smmapd.o libimap.a mutex_fake.o $(DEPLIBS) $(SERVICE) | |
101 | - $(CC) $(LDFLAGS) -o smmapd $(SERVICE) smmapd.o mutex_fake.o libimap.a \ | |
102 | - $(DEPLIBS) $(LIBS) $(LIB_WRAP) | |
103 | + $(CC) $(LDFLAGS) -o $@ $? \ | |
104 | + $(LIBS) $(LIB_WRAP) | |
105 | ||
106 | sync_server: sync_server.o sync_support.o \ | |
107 | imapparse.o tls.o libimap.a mutex_fake.o $(DEPLIBS) $(SERVICE) | |
108 | - $(CC) $(LDFLAGS) -o \ | |
109 | - sync_server sync_server.o sync_support.o \ | |
110 | - imapparse.o tls.o $(SERVICE) libimap.a mutex_fake.o \ | |
111 | - $(DEPLIBS) $(LIBS) $(LIB_WRAP) | |
112 | + $(CC) $(LDFLAGS) -o $@ $? \ | |
113 | + $(LIBS) $(LIB_WRAP) | |
114 | ||
115 | ### Command Line Utilities | |
116 | arbitron: arbitron.o $(CLIOBJS) libimap.a $(DEPLIBS) | |
117 | - $(CC) $(LDFLAGS) -o arbitron arbitron.o $(CLIOBJS) \ | |
118 | - libimap.a $(DEPLIBS) $(LIBS) | |
119 | + $(CC) $(LDFLAGS) -o $@ $? \ | |
120 | + $(LIBS) | |
121 | ||
122 | -cyr_userseen: cyr_userseen.o mutex_fake.o libimap.a $(DEPLIBS) | |
123 | - $(CC) $(LDFLAGS) -o cyr_userseen cyr_userseen.o $(CLIOBJS) \ | |
124 | - libimap.a $(DEPLIBS) $(LIBS) | |
125 | - | |
126 | -cyr_sequence: cyr_sequence.o mutex_fake.o libimap.a $(DEPLIBS) | |
127 | - $(CC) $(LDFLAGS) -o cyr_sequence cyr_sequence.o $(CLIOBJS) \ | |
128 | - libimap.a $(DEPLIBS) $(LIBS) | |
129 | - | |
130 | -cyr_dbtool: cyr_dbtool.o mutex_fake.o libimap.a $(DEPLIBS) | |
131 | - $(CC) $(LDFLAGS) -o cyr_dbtool cyr_dbtool.o $(CLIOBJS) \ | |
132 | - libimap.a $(DEPLIBS) $(LIBS) | |
133 | - | |
134 | -cyr_synclog: cyr_synclog.o mutex_fake.o libimap.a $(DEPLIBS) | |
135 | - $(CC) $(LDFLAGS) -o cyr_synclog cyr_synclog.o $(CLIOBJS) \ | |
136 | - libimap.a $(DEPLIBS) $(LIBS) | |
137 | - | |
138 | -cvt_cyrusdb: cvt_cyrusdb.o mutex_fake.o libimap.a $(DEPLIBS) | |
139 | - $(CC) $(LDFLAGS) -o cvt_cyrusdb cvt_cyrusdb.o $(CLIOBJS) \ | |
140 | - libimap.a $(DEPLIBS) $(LIBS) | |
141 | - | |
142 | -chk_cyrus: chk_cyrus.o mutex_fake.o libimap.a $(DEPLIBS) | |
143 | - $(CC) $(LDFLAGS) -o chk_cyrus chk_cyrus.o $(CLIOBJS) \ | |
144 | - libimap.a $(DEPLIBS) $(LIBS) | |
145 | +cyr_userseen: cyr_userseen.o mutex_fake.o libimap.a $(CLIOBJS) $(DEPLIBS) | |
146 | + $(CC) $(LDFLAGS) -o $@ $? \ | |
147 | + $(LIBS) | |
148 | + | |
149 | +cyr_sequence: cyr_sequence.o mutex_fake.o libimap.a $(CLIOBJS) $(DEPLIBS) | |
150 | + $(CC) $(LDFLAGS) -o $@ $? \ | |
151 | + $(LIBS) | |
152 | + | |
153 | +cyr_dbtool: cyr_dbtool.o mutex_fake.o libimap.a $(CLIOBJS) $(DEPLIBS) | |
154 | + $(CC) $(LDFLAGS) -o $@ $? \ | |
155 | + $(LIBS) | |
156 | + | |
157 | +cyr_synclog: cyr_synclog.o mutex_fake.o libimap.a $(CLIOBJS) $(DEPLIBS) | |
158 | + $(CC) $(LDFLAGS) -o $@ $? \ | |
159 | + $(LIBS) | |
160 | + | |
161 | +cvt_cyrusdb: cvt_cyrusdb.o mutex_fake.o libimap.a $(CLIOBJS) $(DEPLIBS) | |
162 | + $(CC) $(LDFLAGS) -o $@ $? \ | |
163 | + $(LIBS) | |
164 | + | |
165 | +chk_cyrus: chk_cyrus.o mutex_fake.o libimap.a $(CLIOBJS) $(DEPLIBS) | |
166 | + $(CC) $(LDFLAGS) -o $@ $? \ | |
167 | + $(LIBS) | |
168 | ||
169 | deliver: deliver.o $(LMTPOBJS) proxy.o mutex_fake.o libimap.a $(DEPLIBS) | |
170 | - $(CC) $(LDFLAGS) -o deliver deliver.o $(LMTPOBJS) proxy.o \ | |
171 | - mutex_fake.o libimap.a $(DEPLIBS) $(LIBS) | |
172 | + $(CC) $(LDFLAGS) -o $@ $? \ | |
173 | + $(LIBS) | |
174 | ||
175 | ctl_deliver: ctl_deliver.o $(CLIOBJS) libimap.a $(DEPLIBS) | |
176 | - $(CC) $(LDFLAGS) -o \ | |
177 | - $@ ctl_deliver.o $(CLIOBJS) libimap.a $(DEPLIBS) $(LIBS) | |
178 | + $(CC) $(LDFLAGS) -o $@ $? \ | |
179 | + $(LIBS) | |
180 | ||
181 | ctl_mboxlist: ctl_mboxlist.o mupdate-client.o $(CLIOBJS) libimap.a $(DEPLIBS) | |
182 | - $(CC) $(LDFLAGS) -o $@ ctl_mboxlist.o mupdate-client.o $(CLIOBJS) \ | |
183 | - libimap.a $(DEPLIBS) $(LIBS) | |
184 | + $(CC) $(LDFLAGS) -o $@ $? \ | |
185 | + $(LIBS) | |
186 | ||
187 | ctl_cyrusdb: ctl_cyrusdb.o $(CLIOBJS) libimap.a $(DEPLIBS) | |
188 | - $(CC) $(LDFLAGS) -o \ | |
189 | - $@ ctl_cyrusdb.o $(CLIOBJS) libimap.a $(DEPLIBS) $(LIBS) | |
190 | + $(CC) $(LDFLAGS) -o $@ $? \ | |
191 | + $(LIBS) | |
192 | ||
193 | cyr_expire: cyr_expire.o $(CLIOBJS) libimap.a $(DEPLIBS) | |
194 | - $(CC) $(LDFLAGS) -o $@ cyr_expire.o $(CLIOBJS) \ | |
195 | - libimap.a $(DEPLIBS) $(LIBS) | |
196 | + $(CC) $(LDFLAGS) -o $@ $? \ | |
197 | + $(LIBS) | |
198 | ||
199 | fetchnews: fetchnews.o $(CLIOBJS) libimap.a $(DEPLIBS) | |
200 | - $(CC) $(LDFLAGS) -o \ | |
201 | - $@ fetchnews.o $(CLIOBJS) libimap.a $(DEPLIBS) $(LIBS) | |
202 | + $(CC) $(LDFLAGS) -o $@ $? \ | |
203 | + $(LIBS) | |
204 | ||
205 | squatter: squatter.o index.o squat_build.o $(CLIOBJS) libimap.a $(DEPLIBS) | |
206 | - $(CC) $(LDFLAGS) -o squatter squatter.o index.o squat_build.o \ | |
207 | - $(CLIOBJS) libimap.a $(DEPLIBS) $(LIBS) | |
208 | + $(CC) $(LDFLAGS) -o $@ $? \ | |
209 | + $(LIBS) | |
210 | ||
211 | mbpath: mbpath.o $(CLIOBJS) libimap.a $(DEPLIBS) | |
212 | - $(CC) $(LDFLAGS) -o mbpath mbpath.o $(CLIOBJS) libimap.a \ | |
213 | - $(DEPLIBS) $(LIBS) | |
214 | + $(CC) $(LDFLAGS) -o $@ $? \ | |
215 | + $(LIBS) | |
216 | ||
217 | ipurge: ipurge.o $(CLIOBJS) libimap.a $(DEPLIBS) | |
218 | - $(CC) $(LDFLAGS) -o ipurge ipurge.o $(CLIOBJS) \ | |
219 | - libimap.a $(DEPLIBS) $(LIBS) | |
220 | + $(CC) $(LDFLAGS) -o $@ $? \ | |
221 | + $(LIBS) | |
222 | ||
223 | cyr_virusscan: cyr_virusscan.o index.o $(CLIOBJS) libimap.a $(DEPLIBS) | |
224 | - $(CC) $(LDFLAGS) -o cyr_virusscan cyr_virusscan.o index.o $(CLIOBJS) \ | |
225 | - libimap.a $(DEPLIBS) $(LIBS) -lclamav | |
226 | + $(CC) $(LDFLAGS) -o $@ $? \ | |
227 | + $(LIBS) -lclamav | |
228 | ||
229 | cyrdump: cyrdump.o index.o $(CLIOBJS) libimap.a $(DEPLIBS) | |
230 | - $(CC) $(LDFLAGS) -o cyrdump cyrdump.o index.o $(CLIOBJS) \ | |
231 | - libimap.a $(DEPLIBS) $(LIBS) | |
232 | + $(CC) $(LDFLAGS) -o $@ $? \ | |
233 | + $(LIBS) | |
234 | ||
235 | cyr_df: cyr_df.o $(CLIOBJS) libimap.a $(DEPLIBS) | |
236 | - $(CC) $(LDFLAGS) -o \ | |
237 | - cyr_df cyr_df.o $(CLIOBJS) libimap.a $(DEPLIBS) $(LIBS) | |
238 | + $(CC) $(LDFLAGS) -o $@ $? \ | |
239 | + $(LIBS) | |
240 | ||
241 | mbexamine: mbexamine.o $(CLIOBJS) libimap.a $(DEPLIBS) | |
242 | - $(CC) $(LDFLAGS) -o \ | |
243 | - mbexamine mbexamine.o $(CLIOBJS) libimap.a $(DEPLIBS) $(LIBS) | |
244 | + $(CC) $(LDFLAGS) -o $@ $? \ | |
245 | + $(LIBS) | |
246 | ||
247 | reconstruct: reconstruct.o $(CLIOBJS) libimap.a $(DEPLIBS) | |
248 | - $(CC) $(LDFLAGS) -o \ | |
249 | - reconstruct reconstruct.o $(CLIOBJS) libimap.a $(DEPLIBS) $(LIBS) | |
250 | + $(CC) $(LDFLAGS) -o $@ $? \ | |
251 | + $(LIBS) | |
252 | ||
253 | quota: quota.o $(CLIOBJS) libimap.a $(DEPLIBS) | |
254 | - $(CC) $(LDFLAGS) -o quota quota.o $(CLIOBJS) \ | |
255 | - libimap.a $(DEPLIBS) $(LIBS) | |
256 | + $(CC) $(LDFLAGS) -o $@ $? \ | |
257 | + $(LIBS) | |
258 | ||
259 | tls_prune: tls_prune.o tls.o $(CLIOBJS) libimap.a $(DEPLIBS) | |
260 | - $(CC) $(LDFLAGS) -o \ | |
261 | - $@ tls_prune.o tls.o $(CLIOBJS) libimap.a $(DEPLIBS) $(LIBS) | |
262 | + $(CC) $(LDFLAGS) -o $@ $? \ | |
263 | + $(LIBS) | |
264 | ||
265 | unexpunge: unexpunge.o $(CLIOBJS) libimap.a $(DEPLIBS) | |
266 | - $(CC) $(LDFLAGS) -o $@ unexpunge.o $(CLIOBJS) \ | |
267 | - libimap.a $(DEPLIBS) $(LIBS) | |
268 | + $(CC) $(LDFLAGS) -o $@ $? \ | |
269 | + $(LIBS) | |
270 | ||
271 | make_md5: make_md5.o libimap.a mutex_fake.o $(DEPLIBS) | |
272 | - $(CC) $(LDFLAGS) -o make_md5 make_md5.o libimap.a mutex_fake.o $(DEPLIBS) $(LIBS) | |
273 | + $(CC) $(LDFLAGS) -o $@ $? \ | |
274 | + $(LIBS) | |
275 | ||
276 | make_sha1: make_sha1.o libimap.a mutex_fake.o $(DEPLIBS) | |
277 | - $(CC) $(LDFLAGS) -o make_sha1 make_sha1.o libimap.a mutex_fake.o $(DEPLIBS) $(LIBS) | |
278 | + $(CC) $(LDFLAGS) -o $@ $? \ | |
279 | + $(LIBS) | |
280 | ||
281 | sync_client: sync_client.o sync_support.o \ | |
282 | backend.o tls.o imapparse.o libimap.a mutex_fake.o $(DEPLIBS) | |
283 | - $(CC) $(LDFLAGS) -o \ | |
284 | - sync_client sync_client.o sync_support.o \ | |
285 | - backend.o tls.o imapparse.o libimap.a mutex_fake.o $(DEPLIBS) $(LIBS) | |
286 | + $(CC) $(LDFLAGS) -o $@ $? \ | |
287 | + $(LIBS) | |
288 | ||
289 | sync_reset: sync_reset.o sync_support.o \ | |
290 | libimap.a mutex_fake.o $(DEPLIBS) | |
291 | - $(CC) $(LDFLAGS) -o \ | |
292 | - sync_reset sync_reset.o sync_support.o \ | |
293 | - libimap.a mutex_fake.o $(DEPLIBS) $(LIBS) | |
294 | + $(CC) $(LDFLAGS) -o $@ $? \ | |
295 | + $(LIBS) | |
296 | ||
297 | ### Other Misc Targets | |
298 | ||
299 | --- cyrus-imapd-2.4.4/imtest/Makefile.in 2010-11-12 00:15:33.000000000 +0200 | |
300 | +++ cyrus-imapd-2.4.4-makeopt/imtest/Makefile.in 2010-11-27 17:49:42.564752106 +0200 | |
301 | @@ -86,10 +86,12 @@ | |
302 | $(CC) -c $(CPPFLAGS) $(DEFS) $(CFLAGS) $< | |
303 | ||
304 | imtest: imtest.o $(DEPLIBS) | |
305 | - $(CC) $(LDFLAGS) -o imtest imtest.o $(DEPLIBS) $(IMAP_LIBS) | |
306 | + $(CC) $(LDFLAGS) -o $@ $? \ | |
307 | + $(IMAP_LIBS) | |
308 | ||
309 | -imtest.pure: imtest.o $(DEPLIBS) | |
310 | - $(PURIFY) $(PUREOPT) $(CC) $(LDFLAGS) -o imtest $(OBJS) $(DEPLIBS) $(LIBS) $(IMAP_LIBS) | |
311 | +imtest.pure: imtest.o $(OBJS) $(DEPLIBS) | |
312 | + $(PURIFY) $(PUREOPT) $(CC) $(LDFLAGS) -o $@ $? \ | |
313 | + $(LIBS) $(IMAP_LIBS) | |
314 | ||
315 | clean: | |
316 | rm -f *.o Makefile.bak makedepend.log imtest | |
317 | --- cyrus-imapd-2.4.4/installsieve/Makefile.in 2010-11-12 00:15:33.000000000 +0200 | |
318 | +++ cyrus-imapd-2.4.4-makeopt/installsieve/Makefile.in 2010-11-27 17:48:40.131123165 +0200 | |
319 | @@ -78,7 +78,8 @@ | |
320 | $(RANLIB) libinstallsieve.a | |
321 | ||
322 | installsieve: libinstallsieve.a installscript.o $(DEPLIBS) | |
323 | - $(CC) $(LDFLAGS) -o installsieve libinstallsieve.a installscript.o $(DEPLIBS) $(IMAP_LIBS) | |
324 | + $(CC) $(LDFLAGS) -o $@ $? \ | |
325 | + $(IMAP_LIBS) | |
326 | ||
327 | clean: | |
328 | rm -f *.o *.a Makefile.bak makedepend.log | |
329 | --- cyrus-imapd-2.4.4/makedepend/Makefile.in 2010-11-12 00:15:33.000000000 +0200 | |
330 | +++ cyrus-imapd-2.4.4-makeopt/makedepend/Makefile.in 2010-11-27 17:48:27.795755643 +0200 | |
331 | @@ -65,9 +65,9 @@ | |
332 | .c.o: | |
333 | $(CC) -c $(CPPFLAGS) $(DEFS) $(CFLAGS) $< | |
334 | ||
335 | -makedepend: cppsetup.o ifparser.o include.o main.o parse.o pr.o | |
336 | - $(CC) $(LDFLAGS) -o makedepend cppsetup.o ifparser.o include.o \ | |
337 | - main.o parse.o pr.o $(DEPLIBS) $(LIBS) | |
338 | +makedepend: cppsetup.o ifparser.o include.o main.o parse.o pr.o $(DEPLIBS) | |
339 | + $(CC) $(LDFLAGS) -o $@ $? \ | |
340 | + $(LIBS) | |
341 | ||
342 | clean: | |
343 | rm -f *.o Makefile.bak makedepend | |
344 | --- cyrus-imapd-2.4.4/master/Makefile.in 2010-11-12 00:15:33.000000000 +0200 | |
345 | +++ cyrus-imapd-2.4.4-makeopt/master/Makefile.in 2010-11-27 17:50:06.291998115 +0200 | |
346 | @@ -86,7 +86,8 @@ | |
347 | $< | |
348 | ||
349 | master: master.o masterconf.o cyrusMasterMIB.o ../lib/lock_@WITH_LOCK@.o | |
350 | - $(CC) $(LDFLAGS) -o master master.o masterconf.o cyrusMasterMIB.o ../lib/lock_@WITH_LOCK@.o $(LIBS) $(DEPLIBS) | |
351 | + $(CC) $(LDFLAGS) -o $@ $? \ | |
352 | + $(LIBS) $(DEPLIBS) | |
353 | ||
354 | clean: | |
355 | rm -f *.o *.a Makefile.bak $(PROGS) | |
356 | --- cyrus-imapd-2.4.4/netnews/Makefile.in 2010-11-12 00:15:33.000000000 +0200 | |
357 | +++ cyrus-imapd-2.4.4-makeopt/netnews/Makefile.in 2010-11-27 17:29:33.031532813 +0200 | |
358 | @@ -77,8 +77,7 @@ | |
359 | $(CC) -c $(CPPFLAGS) $(DEFS) $(CFLAGS) $< | |
360 | ||
361 | remotepurge: $(OBJS) $(DEPLIBS) | |
362 | - $(CC) $(LDFLAGS) -o remotepurge $(OBJS) \ | |
363 | - $(DEPLIBS) $(LIBS) | |
364 | + $(CC) $(LDFLAGS) -o $@ $? $(LIBS) | |
365 | ||
366 | ||
367 | clean: | |
368 | --- cyrus-imapd-2.4.4/syslog/Makefile.in 2010-11-12 00:15:33.000000000 +0200 | |
369 | +++ cyrus-imapd-2.4.4-makeopt/syslog/Makefile.in 2010-11-27 17:47:32.069899278 +0200 | |
370 | @@ -74,7 +74,7 @@ | |
371 | $(RANLIB) libsyslog.a | |
372 | ||
373 | syslogd: syslogd.o | |
374 | - $(CC) $(LDFLAGS) -o syslogd syslogd.o $(LIBS) | |
375 | + $(CC) $(LDFLAGS) -o $@ $? $(LIBS) | |
376 | ||
377 | clean: | |
378 | rm -f *.o *.a Makefile.bak | |
379 | --- cyrus-imapd-2.4.4/timsieved/Makefile.in 2010-11-12 00:15:33.000000000 +0200 | |
380 | +++ cyrus-imapd-2.4.4-makeopt/timsieved/Makefile.in 2010-11-27 17:30:16.995473471 +0200 | |
381 | @@ -88,12 +88,12 @@ | |
382 | ../imap/proxy.o | |
383 | ||
384 | timsieved: $(OBJS) $(SERVICE) | |
385 | - $(CC) $(LDFLAGS) -o timsieved \ | |
386 | + $(CC) $(LDFLAGS) -o $@ \ | |
387 | $(SERVICE) $(OBJS) $(DEPLIBS) $(IMAP_LIBS) $(LIBS) $(LIB_WRAP) | |
388 | ||
389 | timsieved.pure: $(OBJS) $(SERVICE) | |
390 | $(PURIFY) $(PUREOPT) \ | |
391 | - $(CC) $(LDFLAGS) -o timsieved.pure \ | |
392 | + $(CC) $(LDFLAGS) -o $@ \ | |
393 | $(SERVICE) $(OBJS) $(DEPLIBS) $(IMAP_LIBS) $(LIBS) $(LIB_WRAP) | |
394 | ||
395 | clean: | |
396 | --- cyrus-imapd-2.4.4/notifyd/Makefile.in 2010-11-12 00:15:33.000000000 +0200 | |
397 | +++ cyrus-imapd-2.4.4-makeopt4/notifyd/Makefile.in 2010-11-29 07:44:19.039527336 +0200 | |
398 | @@ -88,17 +88,17 @@ | |
399 | notify_external.o | |
400 | ||
401 | notifytest: notifytest.o | |
402 | - $(CC) $(LDFLAGS) -o notifytest \ | |
403 | - notifytest.o $(DEPLIBS) $(IMAP_LIBS) $(LIBS) $(LIB_WRAP) | |
404 | + $(CC) $(LDFLAGS) -o $@ $? \ | |
405 | + $(DEPLIBS) $(IMAP_LIBS) $(LIBS) $(LIB_WRAP) | |
406 | ||
407 | notifyd: $(OBJS) $(SERVICE) | |
408 | - $(CC) $(LDFLAGS) -o notifyd \ | |
409 | - $(SERVICE) $(OBJS) $(DEPLIBS) $(IMAP_LIBS) $(LIBS) $(LIB_WRAP) | |
410 | + $(CC) $(LDFLAGS) -o $@ $? \ | |
411 | + $(DEPLIBS) $(IMAP_LIBS) $(LIBS) $(LIB_WRAP) | |
412 | ||
413 | notifyd.pure: $(OBJS) $(SERVICE) | |
414 | $(PURIFY) $(PUREOPT) \ | |
415 | - $(CC) $(LDFLAGS) -o notifyd.pure \ | |
416 | - $(SERVICE) $(OBJS) $(DEPLIBS) $(IMAP_LIBS) $(LIBS) $(LIB_WRAP) | |
417 | + $(CC) $(LDFLAGS) -o $@ $? \ | |
418 | + $(DEPLIBS) $(IMAP_LIBS) $(LIBS) $(LIB_WRAP) | |
419 | ||
420 | clean: | |
421 | rm -f notifyd notifytest *.o *.a *~ Makefile.bak makedepend.log | |
422 | --- cyrus-imapd-2.4.4/ptclient/Makefile.in 2010-11-12 00:15:33.000000000 +0200 | |
423 | +++ cyrus-imapd-2.4.4-makeopt4/ptclient/Makefile.in 2010-11-29 07:47:21.146089774 +0200 | |
424 | @@ -97,25 +97,25 @@ | |
425 | $(CC) -c $(CPPFLAGS) $(LDAP_CPPFLAGS) $(DEFS) $(CFLAGS) $< | |
426 | ||
427 | ptloader: ptloader.o afskrb.o ldap.o ../imap/mutex_fake.o $(DEPLIBS) | |
428 | - $(CC) $(LDFLAGS) -o $@ ptloader.o afskrb.o ldap.o ../imap/mutex_fake.o $(SERVICETHREAD) ${AFS_LDFLAGS} ${LDAP_LDFLAGS} $(AFS_LIBS) ${LDAP_LIBS} $(DEPLIBS) $(LIB_SASL) $(LIBS) $(LIB_WRAP) $(LIB_RT) | |
429 | + $(CC) $(LDFLAGS) -o $@ $? $(SERVICETHREAD) ${AFS_LDFLAGS} ${LDAP_LDFLAGS} $(AFS_LIBS) ${LDAP_LIBS} $(LIB_SASL) $(LIBS) $(LIB_WRAP) $(LIB_RT) | |
430 | ||
431 | ptloader.pure: ptloader.o afskrb.o ldap.o ../imap/mutex_fake.o $(DEPLIBS) | |
432 | - $(PURIFY) $(PUREARGS) $(CC) $(LDFLAGS) -o $@ ptloader.o afskrb.o ldap.o ../imap/mutex_fake.o $(SERVICETHREAD) ${AFS_LDFLAGS} ${LDAP_LDFLAGS} $(AFS_LIBS) ${LDAP_LIBS} $(DEPLIBS) $(LIB_SASL) $(LIBS) $(LIB_WRAP) $(LIB_RT) | |
433 | + $(PURIFY) $(PUREARGS) $(CC) $(LDFLAGS) -o $@ $? $(SERVICETHREAD) ${AFS_LDFLAGS} ${LDAP_LDFLAGS} $(AFS_LIBS) ${LDAP_LIBS} $(LIB_SASL) $(LIBS) $(LIB_WRAP) $(LIB_RT) | |
434 | ||
435 | ptexpire: ptexpire.o $(DEPLIBS) $(UTIL_LIBS) | |
436 | - $(CC) $(LDFLAGS) -o $@ ptexpire.o $(UTIL_LIBS) $(DEPLIBS) $(LIB_SASL) $(LIBS) $(LIB_RT) | |
437 | + $(CC) $(LDFLAGS) -o $@ $? $(LIB_SASL) $(LIBS) $(LIB_RT) | |
438 | ||
439 | ptexpire.pure: ptexpire.o $(DEPLIBS) $(UTIL_LIBS) | |
440 | - $(PURIFY) $(PUREARGS) $(CC) $(LDFLAGS) -o $@ ptexpire.o $(UTIL_LIBS) $(DEPLIBS) $(LIB_SASL) $(LIBS) $(LIB_WRAP) $(LIB_RT) | |
441 | + $(PURIFY) $(PUREARGS) $(CC) $(LDFLAGS) -o $@ $? $(LIB_SASL) $(LIBS) $(LIB_WRAP) $(LIB_RT) | |
442 | ||
443 | ptdump: ptdump.o $(DEPLIBS) $(UTIL_LIBS) | |
444 | - $(CC) $(LDFLAGS) -o $@ ptdump.o $(UTIL_LIBS) $(DEPLIBS) $(LIB_SASL) $(LIBS) $(LIB_RT) | |
445 | + $(CC) $(LDFLAGS) -o $@ $? $(LIB_SASL) $(LIBS) $(LIB_RT) | |
446 | ||
447 | -ptdump.pure: ptexpire.o $(DEPLIBS) $(UTIL_LIBS) | |
448 | - $(PURIFY) $(PUREARGS) $(CC) $(LDFLAGS) -o $@ ptdump.o $(UTIL_LIBS) $(DEPLIBS) $(LIB_SASL) $(LIBS) $(LIB_WRAP) $(LIB_RT) | |
449 | +ptdump.pure: ptdump.o $(DEPLIBS) $(UTIL_LIBS) | |
450 | + $(PURIFY) $(PUREARGS) $(CC) $(LDFLAGS) -o $@ $? $(LIB_SASL) $(LIBS) $(LIB_WRAP) $(LIB_RT) | |
451 | ||
452 | ptextract: ptextract.o $(DEPLIBS) $(UTIL_LIBS) | |
453 | - $(CC) $(LDFLAGS) -o $@ ptextract.o $(UTIL_LIBS) $(DEPLIBS) $(LIBS) | |
454 | + $(CC) $(LDFLAGS) -o $@ $? $(LIBS) | |
455 | ||
456 | clean: | |
457 | rm -f *.o Makefile.bak $(PROGS) makedepend.log | |
458 | --- cyrus-imapd-2.4.4/sieve/Makefile.in 2010-11-12 00:15:33.000000000 +0200 | |
459 | +++ cyrus-imapd-2.4.4-makeopt4/sieve/Makefile.in 2010-11-29 07:48:28.187095358 +0200 | |
460 | @@ -84,9 +84,9 @@ | |
461 | $(srcdir)/../install-sh -c -m 755 sievec $(DESTDIR)$(service_path) || exit | |
462 | $(srcdir)/../install-sh -c -m 755 sieved $(DESTDIR)$(service_path) || exit | |
463 | ||
464 | -test: $(DEPLIBS) libsieve.a test.o ../imap/message.o | |
465 | - $(CC) $(LDFLAGS) -o test test.o ../imap/message.o \ | |
466 | - libsieve.a $(DEPLIBS) $(LIBS) | |
467 | +test: libsieve.a test.o ../imap/message.o $(DEPLIBS) | |
468 | + $(CC) $(LDFLAGS) -o $@ $? \ | |
469 | + $(LIBS) | |
470 | ||
471 | OBJS = sieve_err.o \ | |
472 | sieve.o sieve-lex.o comparator.o interp.o message.o \ | |
473 | @@ -123,11 +123,11 @@ | |
474 | ar cr libsieve.a $(OBJS) | |
475 | $(RANLIB) libsieve.a | |
476 | ||
477 | -sievec: sievec.o libsieve.a | |
478 | - $(CC) $(LDFLAGS) -o sievec sievec.o libsieve.a $(DEPLIBS) $(LIBS) | |
479 | +sievec: sievec.o libsieve.a $(DEPLIBS) | |
480 | + $(CC) $(LDFLAGS) -o $@ $? $(LIBS) | |
481 | ||
482 | -sieved: sieved.o libsieve.a | |
483 | - $(CC) $(LDFLAGS) -o sieved sieved.o libsieve.a $(DEPLIBS) $(LIBS) | |
484 | +sieved: sieved.o libsieve.a $(DEPLIBS) | |
485 | + $(CC) $(LDFLAGS) -o $@ $? $(LIBS) | |
486 | ||
487 | ||
488 | sieve_interface.h: sieve_err.h |