1 --- cyrus-imapd-2.3.12p2/configure.in 2008-09-23 21:46:38.514085631 +0300
2 +++ cyrus-imapd-2.3.12p2.shared/configure.in 2008-09-23 21:44:50.591844716 +0300
4 AC_DEFINE_UNQUOTED(SYSCONFDIR,"$sysconfdir",[Config File Location])
13 cyrus_cv_getaddrinfo=no)], cyrus_cv_getaddrinfo=no)
15 if test $cyrus_cv_getaddrinfo = no; then
16 - IPV6_OBJS="getaddrinfo.o"
17 + IPV6_OBJS="getaddrinfo.lo"
20 cyrus_cv_getnameinfo=yes
22 cyrus_cv_getnameinfo=no)
24 if test $cyrus_cv_getnameinfo = no; then
25 - IPV6_OBJS="$IPV6_OBJS getnameinfo.o"
26 + IPV6_OBJS="$IPV6_OBJS getnameinfo.lo"
29 IPv6_CHECK_SS_FAMILY()
31 dnl function for doing each of the database backends
32 dnl parameters: backend name, variable to set, withval
34 -CYRUSDB_OBJS="cyrusdb_flat.o cyrusdb_skiplist.o cyrusdb_quotalegacy.o"
35 +CYRUSDB_OBJS="cyrusdb_flat.lo cyrusdb_skiplist.lo cyrusdb_quotalegacy.lo"
37 dnl Berkeley DB Detection
40 LIBS="${LIBS} ${BDB_LIBADD}"
41 CPPFLAGS="${BDB_INCADD} ${CPPFLAGS}"
43 - CYRUSDB_OBJS="$CYRUSDB_OBJS cyrusdb_berkeley.o"
44 + CYRUSDB_OBJS="$CYRUSDB_OBJS cyrusdb_berkeley.lo"
45 AC_DEFINE(HAVE_BDB,[],[Build in Berkeley DB support?])
49 dnl Check for MD5 functions
50 AC_FUNC_CHECK(MD5Init,,
51 AC_CHECK_LIB(md, MD5Init, LIBS="${LIBS} -lmd",
57 --- cyrus-imapd-2.3.12p2/depot/Makefile.in 2008-03-24 22:26:12.000000000 +0200
58 +++ cyrus-imapd-2.3.12p2.shared/depot/Makefile.in 2008-09-23 21:44:50.599845178 +0300
61 CPPFLAGS = -I. -I$(srcdir) -I$(srcdir)/../lib -I$(srcdir)/../et @CPPFLAGS@
63 -DEPLIBS = ../lib/libcyrus.a ../lib/libcyrus_min.a @DEPLIBS@
64 +DEPLIBS = ../lib/libcyrus.la ../lib/libcyrus_min.la @DEPLIBS@
68 --- cyrus-imapd-2.3.12p2/imap/Makefile.in 2008-04-04 00:09:51.000000000 +0300
69 +++ cyrus-imapd-2.3.12p2.shared/imap/Makefile.in 2008-09-23 21:44:50.591844716 +0300
72 # \Seen state database. Either 'db' (berkeley db) or
73 # 'local' (legacy flat file).
78 top_srcdir = @top_srcdir@
79 +top_builddir = @top_builddir@
88 CYRUS_USER=@cyrus_user@
89 CYRUS_GROUP=@cyrus_group@
91 IMAP_COM_ERR_LIBS = @IMAP_COM_ERR_LIBS@
93 LIBS = $(IMAP_LIBS) $(IMAP_COM_ERR_LIBS)
94 -DEPLIBS = ../lib/libcyrus.a ../lib/libcyrus_min.a @DEPLIBS@
95 +DEPLIBS = ../lib/libcyrus.la ../lib/libcyrus_min.la @DEPLIBS@
98 LDFLAGS = @LDFLAGS@ @COM_ERR_LDFLAGS@
100 cyrus_prefix = @cyrus_prefix@
101 service_path = @service_path@
103 -LOBJS= append.o mailbox.o mboxlist.o mupdate-client.o mboxname.o message.o \
104 - global.o imap_err.o mupdate_err.o proc.o setproctitle.o \
105 - convert_code.o duplicate.o saslclient.o saslserver.o signals.o \
106 - annotate.o search_engines.o squat.o squat_internal.o mbdump.o \
107 - imapparse.o telemetry.o user.o notify.o idle.o quota_db.o \
108 - sync_log.o $(SEEN) mboxkey.o backend.o tls.o message_guid.o \
110 +LOBJS= append.lo mailbox.lo mboxlist.lo mupdate-client.lo mboxname.lo message.lo \
111 + global.lo imap_err.lo mupdate_err.lo proc.lo setproctitle.lo \
112 + convert_code.lo duplicate.lo saslclient.lo saslserver.lo signals.lo \
113 + annotate.lo search_engines.lo squat.lo squat_internal.lo mbdump.lo \
114 + imapparse.lo telemetry.lo user.lo notify.lo idle.lo quota_db.lo \
115 + sync_log.lo $(SEEN) mboxkey.lo backend.lo tls.lo message_guid.lo \
118 -IMAPDOBJS=pushstats.o imapd.o proxy.o imap_proxy.o index.o version.o
119 +IMAPDOBJS=pushstats.lo imapd.lo proxy.lo imap_proxy.lo index.lo version.lo
121 -LMTPOBJS=lmtpstats.o lmtpengine.o spool.o
122 +LMTPOBJS=lmtpstats.lo lmtpengine.lo spool.lo
124 # Your typical objects for the command line utilities
125 -CLIOBJS=cli_fatal.o mutex_fake.o
126 +CLIOBJS=cli_fatal.lo mutex_fake.lo
128 -SERVICE=../master/service.o
129 -SERVICETHREAD=../master/service-thread.o
130 +SERVICE=../master/service.lo
131 +SERVICETHREAD=../master/service-thread.lo
133 PROGS = imapd lmtpd pop3d \
134 fud smmapd reconstruct quota mbpath ipurge cyr_dbtool cyr_synclog \
135 @@ -139,23 +141,21 @@
136 ln -f $(DESTDIR)$(service_path)/imapd $(DESTDIR)$(service_path)/proxyd
137 ln -f $(DESTDIR)$(service_path)/lmtpd $(DESTDIR)$(service_path)/lmtpproxyd
140 - $(CC) -c $(CPPFLAGS) $(DEFS) $(CFLAGS) \
142 + $(LIBTOOL) --mode=compile $(CC) -c $(CPPFLAGS) $(DEFS) $(CFLAGS) \
149 - ar cr libimap.a $(LOBJS)
150 - $(RANLIB) libimap.a
151 +libimap.la: $(LOBJS)
152 + $(LIBTOOL) --mode=link --tag=CC $(CC) -o libimap.la $(LOBJS)
154 ### Built Source Files
157 AWK=$(AWK) $(srcdir)/xversion.sh
159 -version.o: xversion.h
160 +version.lo: xversion.h
162 pushstats.c: pushstats.snmp $(srcdir)/../snmp/snmpgen
163 $(srcdir)/../snmp/snmpgen $(srcdir)/pushstats.snmp
164 @@ -183,179 +183,179 @@
165 mupdate_err.h: mupdate_err.c
168 -idled: idled.o mutex_fake.o libimap.a $(DEPLIBS)
169 - $(CC) $(LDFLAGS) -o idled \
170 - idled.o mutex_fake.o libimap.a $(DEPLIBS) $(LIBS)
172 -lmtpd: lmtpd.o proxy.o $(LMTPOBJS) $(SIEVE_OBJS) mutex_fake.o \
173 - libimap.a $(SIEVE_LIBS) $(DEPLIBS) $(SERVICE)
174 - $(CC) $(LDFLAGS) -o lmtpd \
175 - $(SERVICE) lmtpd.o proxy.o $(LMTPOBJS) $(SIEVE_OBJS) \
176 - mutex_fake.o libimap.a $(SIEVE_LIBS) $(DEPLIBS) $(LIBS) $(LIB_WRAP)
178 -lmtpd.pure: lmtpd.o proxy.o $(LMTPOBJS) $(SIEVE_OBJS) \
179 - mutex_fake.o libimap.a $(SIEVE_LIBS) $(DEPLIBS) $(SERVICE)
180 - $(PURIFY) $(PUREOPT) $(CC) $(LDFLAGS) -o lmtpd.pure \
181 - $(SERVICE) lmtpd.o proxy.o $(LMTPOBJS) $(SIEVE_OBJS) \
182 - mutex_fake.o libimap.a $(SIEVE_LIBS) $(DEPLIBS) $(LIBS) $(LIB_WRAP)
184 -imapd: $(IMAPDOBJS) mutex_fake.o libimap.a $(DEPLIBS) $(SERVICE)
185 - $(CC) $(LDFLAGS) -o imapd \
186 - $(SERVICE) $(IMAPDOBJS) mutex_fake.o \
187 - libimap.a $(DEPLIBS) $(LIBS) $(LIB_WRAP)
189 -imapd.pure: $(IMAPDOBJS) mutex_fake.o libimap.a $(DEPLIBS) $(SERVICE)
190 - $(PURIFY) $(PUREOPT) $(CC) $(LDFLAGS) -o imapd.pure \
191 - $(SERVICE) $(IMAPDOBJS) mutex_fake.o libimap.a \
192 +idled: idled.lo mutex_fake.lo libimap.la $(DEPLIBS)
193 + $(LIBTOOL) --mode=link --tag=CC $(CC) $(LDFLAGS) -o idled \
194 + idled.lo mutex_fake.lo libimap.la $(DEPLIBS) $(LIBS)
196 +lmtpd: lmtpd.lo proxy.lo $(LMTPOBJS) $(SIEVE_OBJS) mutex_fake.lo \
197 + libimap.la $(SIEVE_LIBS) $(DEPLIBS) $(SERVICE)
198 + $(LIBTOOL) --mode=link --tag=CC $(CC) $(LDFLAGS) -o lmtpd \
199 + $(SERVICE) lmtpd.lo proxy.lo $(LMTPOBJS) $(SIEVE_OBJS) \
200 + mutex_fake.lo libimap.la $(SIEVE_LIBS) $(DEPLIBS) $(LIBS) $(LIB_WRAP)
202 +lmtpd.pure: lmtpd.lo proxy.lo $(LMTPOBJS) $(SIEVE_OBJS) \
203 + mutex_fake.lo libimap.la $(SIEVE_LIBS) $(DEPLIBS) $(SERVICE)
204 + $(PURIFY) $(PUREOPT) $(LIBTOOL) --mode=link --tag=CC $(CC) $(LDFLAGS) -o lmtpd.pure \
205 + $(SERVICE) lmtpd.lo proxy.lo $(LMTPOBJS) $(SIEVE_OBJS) \
206 + mutex_fake.lo libimap.la $(SIEVE_LIBS) $(DEPLIBS) $(LIBS) $(LIB_WRAP)
208 +imapd: $(IMAPDOBJS) mutex_fake.lo libimap.la $(DEPLIBS) $(SERVICE)
209 + $(LIBTOOL) --mode=link --tag=CC $(CC) $(LDFLAGS) -o imapd \
210 + $(SERVICE) $(IMAPDOBJS) mutex_fake.lo \
211 + libimap.la $(DEPLIBS) $(LIBS) $(LIB_WRAP)
213 +imapd.pure: $(IMAPDOBJS) mutex_fake.lo libimap.la $(DEPLIBS) $(SERVICE)
214 + $(PURIFY) $(PUREOPT) $(LIBTOOL) --mode=link --tag=CC $(CC) $(LDFLAGS) -o imapd.pure \
215 + $(SERVICE) $(IMAPDOBJS) mutex_fake.lo libimap.la \
216 $(DEPLIBS) $(LIBS) $(LIB_WRAP)
218 -imapd.quant: $(IMAPDOBJS) mutex_fake.o libimap.a $(DEPLIBS) $(SERVICE)
219 - $(QUANTIFY) $(QUANTOPT) $(CC) $(LDFLAGS) -o imapd.quant \
220 - $(SERVICE) $(IMAPDOBJS) mutex_fake.o libimap.a \
221 +imapd.quant: $(IMAPDOBJS) mutex_fake.lo libimap.la $(DEPLIBS) $(SERVICE)
222 + $(QUANTIFY) $(QUANTOPT) $(LIBTOOL) --mode=link --tag=CC $(CC) $(LDFLAGS) -o imapd.quant \
223 + $(SERVICE) $(IMAPDOBJS) mutex_fake.lo libimap.la \
224 $(DEPLIBS) $(LIBS) $(LIB_WRAP)
226 -mupdate: mupdate.o mupdate-slave.o mupdate-client.o mutex_pthread.o tls.o \
227 - libimap.a $(DEPLIBS)
228 - $(CC) $(LDFLAGS) -o mupdate \
229 - $(SERVICETHREAD) mupdate.o mupdate-slave.o mupdate-client.o \
230 - mutex_pthread.o tls.o libimap.a \
231 +mupdate: mupdate.lo mupdate-slave.lo mupdate-client.lo mutex_pthread.lo tls.lo \
232 + libimap.la $(DEPLIBS)
233 + $(LIBTOOL) --mode=link --tag=CC $(CC) $(LDFLAGS) -o mupdate \
234 + $(SERVICETHREAD) mupdate.lo mupdate-slave.lo mupdate-client.lo \
235 + mutex_pthread.lo tls.lo libimap.la \
236 $(DEPLIBS) $(LIBS) $(LIB_WRAP) -lpthread
238 -mupdate.pure: mupdate.o mupdate-slave.o mupdate-client.o mutex_pthread.o \
239 - libimap.a $(DEPLIBS)
240 - $(PURIFY) $(PUREOPT) $(CC) $(LDFLAGS) -o mupdate.pure \
241 - $(SERVICETHREAD) mupdate.o mupdate-slave.o mupdate-client.o \
242 - mutex_pthread.o libimap.a $(DEPLIBS) $(LIBS) $(LIB_WRAP) -lpthread
243 +mupdate.pure: mupdate.lo mupdate-slave.lo mupdate-client.lo mutex_pthread.lo \
244 + libimap.la $(DEPLIBS)
245 + $(PURIFY) $(PUREOPT) $(LIBTOOL) --mode=link --tag=CC $(CC) $(LDFLAGS) -o mupdate.pure \
246 + $(SERVICETHREAD) mupdate.lo mupdate-slave.lo mupdate-client.lo \
247 + mutex_pthread.lo libimap.la $(DEPLIBS) $(LIBS) $(LIB_WRAP) -lpthread
249 -pop3d: pop3d.o proxy.o backend.o tls.o mutex_fake.o libimap.a \
250 +pop3d: pop3d.lo proxy.lo backend.lo tls.lo mutex_fake.lo libimap.la \
251 $(DEPLIBS) $(SERVICE)
252 - $(CC) $(LDFLAGS) -o pop3d pop3d.o proxy.o backend.o tls.o $(SERVICE) \
253 - mutex_fake.o libimap.a $(DEPLIBS) $(LIBS) $(LIB_WRAP)
254 + $(LIBTOOL) --mode=link --tag=CC $(CC) $(LDFLAGS) -o pop3d pop3d.lo proxy.lo backend.lo tls.lo $(SERVICE) \
255 + mutex_fake.lo libimap.la $(DEPLIBS) $(LIBS) $(LIB_WRAP)
257 -nntpd: nntpd.o proxy.o backend.o index.o smtpclient.o spool.o tls.o \
258 - mutex_fake.o nntp_err.o libimap.a $(DEPLIBS) $(SERVICE)
259 - $(CC) $(LDFLAGS) -o nntpd nntpd.o proxy.o backend.o index.o spool.o \
260 - smtpclient.o tls.o $(SERVICE) mutex_fake.o nntp_err.o \
261 - libimap.a $(DEPLIBS) $(LIBS) $(LIB_WRAP)
262 +nntpd: nntpd.lo proxy.lo backend.lo index.lo smtpclient.lo spool.lo tls.lo \
263 + mutex_fake.lo nntp_err.lo libimap.la $(DEPLIBS) $(SERVICE)
264 + $(LIBTOOL) --mode=link --tag=CC $(CC) $(LDFLAGS) -o nntpd nntpd.lo proxy.lo backend.lo index.lo spool.lo \
265 + smtpclient.lo tls.lo $(SERVICE) mutex_fake.lo nntp_err.lo \
266 + libimap.la $(DEPLIBS) $(LIBS) $(LIB_WRAP)
268 -fud: fud.o libimap.a mutex_fake.o $(DEPLIBS) $(SERVICE)
269 - $(CC) $(LDFLAGS) -o fud $(SERVICE) fud.o mutex_fake.o libimap.a \
270 +fud: fud.lo libimap.la mutex_fake.lo $(DEPLIBS) $(SERVICE)
271 + $(LIBTOOL) --mode=link --tag=CC $(CC) $(LDFLAGS) -o fud $(SERVICE) fud.lo mutex_fake.lo libimap.la \
272 $(DEPLIBS) $(LIBS) $(LIB_WRAP)
274 -smmapd: smmapd.o libimap.a mutex_fake.o $(DEPLIBS) $(SERVICE)
275 - $(CC) $(LDFLAGS) -o smmapd $(SERVICE) smmapd.o mutex_fake.o libimap.a \
276 +smmapd: smmapd.lo libimap.la mutex_fake.lo $(DEPLIBS) $(SERVICE)
277 + $(LIBTOOL) --mode=link --tag=CC $(CC) $(LDFLAGS) -o smmapd $(SERVICE) smmapd.lo mutex_fake.lo libimap.la \
278 $(DEPLIBS) $(LIBS) $(LIB_WRAP)
280 -sync_server: sync_server.o sync_support.o sync_commit.o \
281 - imapparse.o tls.o libimap.a mutex_fake.o $(DEPLIBS) $(SERVICE)
282 - $(CC) $(LDFLAGS) -o \
283 - sync_server sync_server.o sync_support.o sync_commit.o \
284 - imapparse.o tls.o $(SERVICE) libimap.a mutex_fake.o \
285 +sync_server: sync_server.lo sync_support.lo sync_commit.lo \
286 + imapparse.lo tls.lo libimap.la mutex_fake.lo $(DEPLIBS) $(SERVICE)
287 + $(LIBTOOL) --mode=link --tag=CC $(CC) $(LDFLAGS) -o \
288 + sync_server sync_server.lo sync_support.lo sync_commit.lo \
289 + imapparse.lo tls.lo $(SERVICE) libimap.la mutex_fake.lo \
290 $(DEPLIBS) $(LIBS) $(LIB_WRAP)
292 ### Command Line Utilities
293 -arbitron: arbitron.o $(CLIOBJS) libimap.a $(DEPLIBS)
294 - $(CC) $(LDFLAGS) -o arbitron arbitron.o $(CLIOBJS) \
295 - libimap.a $(DEPLIBS) $(LIBS)
297 -cyr_dbtool: cyr_dbtool.o mutex_fake.o libimap.a $(DEPLIBS)
298 - $(CC) $(LDFLAGS) -o cyr_dbtool cyr_dbtool.o $(CLIOBJS) \
299 - libimap.a $(DEPLIBS) $(LIBS)
301 -cyr_synclog: cyr_synclog.o mutex_fake.o libimap.a $(DEPLIBS)
302 - $(CC) $(LDFLAGS) -o cyr_synclog cyr_synclog.o $(CLIOBJS) \
303 - libimap.a $(DEPLIBS) $(LIBS)
305 -cvt_cyrusdb: cvt_cyrusdb.o mutex_fake.o libimap.a $(DEPLIBS)
306 - $(CC) $(LDFLAGS) -o cvt_cyrusdb cvt_cyrusdb.o $(CLIOBJS) \
307 - libimap.a $(DEPLIBS) $(LIBS)
309 -chk_cyrus: chk_cyrus.o mutex_fake.o libimap.a $(DEPLIBS)
310 - $(CC) $(LDFLAGS) -o chk_cyrus chk_cyrus.o $(CLIOBJS) \
311 - libimap.a $(DEPLIBS) $(LIBS)
313 -deliver: deliver.o $(LMTPOBJS) proxy.o mutex_fake.o libimap.a $(DEPLIBS)
314 - $(CC) $(LDFLAGS) -o deliver deliver.o $(LMTPOBJS) proxy.o \
315 - mutex_fake.o libimap.a $(DEPLIBS) $(LIBS)
317 -ctl_deliver: ctl_deliver.o $(CLIOBJS) libimap.a $(DEPLIBS)
318 - $(CC) $(LDFLAGS) -o \
319 - $@ ctl_deliver.o $(CLIOBJS) libimap.a $(DEPLIBS) $(LIBS)
321 -ctl_mboxlist: ctl_mboxlist.o mupdate-client.o $(CLIOBJS) libimap.a $(DEPLIBS)
322 - $(CC) $(LDFLAGS) -o $@ ctl_mboxlist.o mupdate-client.o $(CLIOBJS) \
323 - libimap.a $(DEPLIBS) $(LIBS)
325 -ctl_cyrusdb: ctl_cyrusdb.o $(CLIOBJS) libimap.a $(DEPLIBS)
326 - $(CC) $(LDFLAGS) -o \
327 - $@ ctl_cyrusdb.o $(CLIOBJS) libimap.a $(DEPLIBS) $(LIBS)
329 -cyr_expire: cyr_expire.o $(CLIOBJS) libimap.a $(DEPLIBS)
330 - $(CC) $(LDFLAGS) -o $@ cyr_expire.o $(CLIOBJS) \
331 - libimap.a $(DEPLIBS) $(LIBS)
333 -fetchnews: fetchnews.o $(CLIOBJS) libimap.a $(DEPLIBS)
334 - $(CC) $(LDFLAGS) -o \
335 - $@ fetchnews.o $(CLIOBJS) libimap.a $(DEPLIBS) $(LIBS)
337 -squatter: squatter.o index.o squat_build.o $(CLIOBJS) libimap.a $(DEPLIBS)
338 - $(CC) $(LDFLAGS) -o squatter squatter.o index.o squat_build.o \
339 - $(CLIOBJS) libimap.a $(DEPLIBS) $(LIBS)
340 +arbitron: arbitron.lo $(CLIOBJS) libimap.la $(DEPLIBS)
341 + $(LIBTOOL) --mode=link --tag=CC $(CC) $(LDFLAGS) -o arbitron arbitron.lo $(CLIOBJS) \
342 + libimap.la $(DEPLIBS) $(LIBS)
344 +cyr_dbtool: cyr_dbtool.lo mutex_fake.lo libimap.la $(DEPLIBS)
345 + $(LIBTOOL) --mode=link --tag=CC $(CC) $(LDFLAGS) -o cyr_dbtool cyr_dbtool.lo $(CLIOBJS) \
346 + libimap.la $(DEPLIBS) $(LIBS)
348 +cyr_synclog: cyr_synclog.lo mutex_fake.lo libimap.la $(DEPLIBS)
349 + $(LIBTOOL) --mode=link --tag=CC $(CC) $(LDFLAGS) -o cyr_synclog cyr_synclog.lo $(CLIOBJS) \
350 + libimap.la $(DEPLIBS) $(LIBS)
352 +cvt_cyrusdb: cvt_cyrusdb.lo mutex_fake.lo libimap.la $(DEPLIBS)
353 + $(LIBTOOL) --mode=link --tag=CC $(CC) $(LDFLAGS) -o cvt_cyrusdb cvt_cyrusdb.lo $(CLIOBJS) \
354 + libimap.la $(DEPLIBS) $(LIBS)
356 +chk_cyrus: chk_cyrus.lo mutex_fake.lo libimap.la $(DEPLIBS)
357 + $(LIBTOOL) --mode=link --tag=CC $(CC) $(LDFLAGS) -o chk_cyrus chk_cyrus.lo $(CLIOBJS) \
358 + libimap.la $(DEPLIBS) $(LIBS)
360 +deliver: deliver.lo $(LMTPOBJS) proxy.lo mutex_fake.lo libimap.la $(DEPLIBS)
361 + $(LIBTOOL) --mode=link --tag=CC $(CC) $(LDFLAGS) -o deliver deliver.lo $(LMTPOBJS) proxy.lo \
362 + mutex_fake.lo libimap.la $(DEPLIBS) $(LIBS)
364 +ctl_deliver: ctl_deliver.lo $(CLIOBJS) libimap.la $(DEPLIBS)
365 + $(LIBTOOL) --mode=link --tag=CC $(CC) $(LDFLAGS) -o \
366 + $@ ctl_deliver.lo $(CLIOBJS) libimap.la $(DEPLIBS) $(LIBS)
368 +ctl_mboxlist: ctl_mboxlist.lo mupdate-client.lo $(CLIOBJS) libimap.la $(DEPLIBS)
369 + $(LIBTOOL) --mode=link --tag=CC $(CC) $(LDFLAGS) -o $@ ctl_mboxlist.lo mupdate-client.lo $(CLIOBJS) \
370 + libimap.la $(DEPLIBS) $(LIBS)
372 +ctl_cyrusdb: ctl_cyrusdb.lo $(CLIOBJS) libimap.la $(DEPLIBS)
373 + $(LIBTOOL) --mode=link --tag=CC $(CC) $(LDFLAGS) -o \
374 + $@ ctl_cyrusdb.lo $(CLIOBJS) libimap.la $(DEPLIBS) $(LIBS)
376 +cyr_expire: cyr_expire.lo $(CLIOBJS) libimap.la $(DEPLIBS)
377 + $(LIBTOOL) --mode=link --tag=CC $(CC) $(LDFLAGS) -o $@ cyr_expire.lo $(CLIOBJS) \
378 + libimap.la $(DEPLIBS) $(LIBS)
380 +fetchnews: fetchnews.lo $(CLIOBJS) libimap.la $(DEPLIBS)
381 + $(LIBTOOL) --mode=link --tag=CC $(CC) $(LDFLAGS) -o \
382 + $@ fetchnews.lo $(CLIOBJS) libimap.la $(DEPLIBS) $(LIBS)
384 +squatter: squatter.lo index.lo squat_build.lo $(CLIOBJS) libimap.la $(DEPLIBS)
385 + $(LIBTOOL) --mode=link --tag=CC $(CC) $(LDFLAGS) -o squatter squatter.lo index.lo squat_build.lo \
386 + $(CLIOBJS) libimap.la $(DEPLIBS) $(LIBS)
388 -mbpath: mbpath.o $(CLIOBJS) libimap.a $(DEPLIBS)
389 - $(CC) $(LDFLAGS) -o mbpath mbpath.o $(CLIOBJS) libimap.a \
390 +mbpath: mbpath.lo $(CLIOBJS) libimap.la $(DEPLIBS)
391 + $(LIBTOOL) --mode=link --tag=CC $(CC) $(LDFLAGS) -o mbpath mbpath.lo $(CLIOBJS) libimap.la \
394 -ipurge: ipurge.o $(CLIOBJS) libimap.a $(DEPLIBS)
395 - $(CC) $(LDFLAGS) -o ipurge ipurge.o $(CLIOBJS) \
396 - libimap.a $(DEPLIBS) $(LIBS)
398 -cyrdump: cyrdump.o index.o $(CLIOBJS) libimap.a $(DEPLIBS)
399 - $(CC) $(LDFLAGS) -o cyrdump cyrdump.o index.o $(CLIOBJS) \
400 - libimap.a $(DEPLIBS) $(LIBS)
402 -mbexamine: mbexamine.o $(CLIOBJS) libimap.a $(DEPLIBS)
403 - $(CC) $(LDFLAGS) -o \
404 - mbexamine mbexamine.o $(CLIOBJS) libimap.a $(DEPLIBS) $(LIBS)
406 -reconstruct: reconstruct.o $(CLIOBJS) libimap.a $(DEPLIBS)
407 - $(CC) $(LDFLAGS) -o \
408 - reconstruct reconstruct.o $(CLIOBJS) libimap.a $(DEPLIBS) $(LIBS)
410 -quota: quota.o $(CLIOBJS) libimap.a $(DEPLIBS)
411 - $(CC) $(LDFLAGS) -o quota quota.o $(CLIOBJS) \
412 - libimap.a $(DEPLIBS) $(LIBS)
414 -tls_prune: tls_prune.o tls.o $(CLIOBJS) libimap.a $(DEPLIBS)
415 - $(CC) $(LDFLAGS) -o \
416 - $@ tls_prune.o tls.o $(CLIOBJS) libimap.a $(DEPLIBS) $(LIBS)
418 -unexpunge: unexpunge.o $(CLIOBJS) libimap.a $(DEPLIBS)
419 - $(CC) $(LDFLAGS) -o $@ unexpunge.o $(CLIOBJS) \
420 - libimap.a $(DEPLIBS) $(LIBS)
422 -make_md5: make_md5.o libimap.a mutex_fake.o $(DEPLIBS)
423 - $(CC) $(LDFLAGS) -o make_md5 make_md5.o libimap.a mutex_fake.o $(DEPLIBS) $(LIBS)
425 -make_sha1: make_sha1.o libimap.a mutex_fake.o $(DEPLIBS)
426 - $(CC) $(LDFLAGS) -o make_sha1 make_sha1.o libimap.a mutex_fake.o $(DEPLIBS) $(LIBS)
428 -sync_client: sync_client.o sync_support.o \
429 - backend.o tls.o imapparse.o libimap.a mutex_fake.o $(DEPLIBS)
430 - $(CC) $(LDFLAGS) -o \
431 - sync_client sync_client.o sync_support.o \
432 - backend.o tls.o imapparse.o libimap.a mutex_fake.o $(DEPLIBS) $(LIBS)
434 -sync_reset: sync_reset.o sync_support.o sync_commit.o \
435 - libimap.a mutex_fake.o $(DEPLIBS)
436 - $(CC) $(LDFLAGS) -o \
437 - sync_reset sync_reset.o sync_support.o sync_commit.o \
438 - libimap.a mutex_fake.o $(DEPLIBS) $(LIBS)
439 +ipurge: ipurge.lo $(CLIOBJS) libimap.la $(DEPLIBS)
440 + $(LIBTOOL) --mode=link --tag=CC $(CC) $(LDFLAGS) -o ipurge ipurge.lo $(CLIOBJS) \
441 + libimap.la $(DEPLIBS) $(LIBS)
443 +cyrdump: cyrdump.lo index.lo $(CLIOBJS) libimap.la $(DEPLIBS)
444 + $(LIBTOOL) --mode=link --tag=CC $(CC) $(LDFLAGS) -o cyrdump cyrdump.lo index.lo $(CLIOBJS) \
445 + libimap.la $(DEPLIBS) $(LIBS)
447 +mbexamine: mbexamine.lo $(CLIOBJS) libimap.la $(DEPLIBS)
448 + $(LIBTOOL) --mode=link --tag=CC $(CC) $(LDFLAGS) -o \
449 + mbexamine mbexamine.lo $(CLIOBJS) libimap.la $(DEPLIBS) $(LIBS)
451 +reconstruct: reconstruct.lo $(CLIOBJS) libimap.la $(DEPLIBS)
452 + $(LIBTOOL) --mode=link --tag=CC $(CC) $(LDFLAGS) -o \
453 + reconstruct reconstruct.lo $(CLIOBJS) libimap.la $(DEPLIBS) $(LIBS)
455 +quota: quota.lo $(CLIOBJS) libimap.la $(DEPLIBS)
456 + $(LIBTOOL) --mode=link --tag=CC $(CC) $(LDFLAGS) -o quota quota.lo $(CLIOBJS) \
457 + libimap.la $(DEPLIBS) $(LIBS)
459 +tls_prune: tls_prune.lo tls.lo $(CLIOBJS) libimap.la $(DEPLIBS)
460 + $(LIBTOOL) --mode=link --tag=CC $(CC) $(LDFLAGS) -o \
461 + $@ tls_prune.lo tls.lo $(CLIOBJS) libimap.la $(DEPLIBS) $(LIBS)
463 +unexpunge: unexpunge.lo $(CLIOBJS) libimap.la $(DEPLIBS)
464 + $(LIBTOOL) --mode=link --tag=CC $(CC) $(LDFLAGS) -o $@ unexpunge.lo $(CLIOBJS) \
465 + libimap.la $(DEPLIBS) $(LIBS)
467 +make_md5: make_md5.lo libimap.la mutex_fake.lo $(DEPLIBS)
468 + $(LIBTOOL) --mode=link --tag=CC $(CC) $(LDFLAGS) -o make_md5 make_md5.lo libimap.la mutex_fake.lo $(DEPLIBS) $(LIBS)
470 +make_sha1: make_sha1.lo libimap.la mutex_fake.lo $(DEPLIBS)
471 + $(LIBTOOL) --mode=link --tag=CC $(CC) $(LDFLAGS) -o make_sha1 make_sha1.lo libimap.la mutex_fake.lo $(DEPLIBS) $(LIBS)
473 +sync_client: sync_client.lo sync_support.lo \
474 + backend.lo tls.lo imapparse.lo libimap.la mutex_fake.lo $(DEPLIBS)
475 + $(LIBTOOL) --mode=link --tag=CC $(CC) $(LDFLAGS) -o \
476 + sync_client sync_client.lo sync_support.lo \
477 + backend.lo tls.lo imapparse.lo libimap.la mutex_fake.lo $(DEPLIBS) $(LIBS)
479 +sync_reset: sync_reset.lo sync_support.lo sync_commit.lo \
480 + libimap.la mutex_fake.lo $(DEPLIBS)
481 + $(LIBTOOL) --mode=link --tag=CC $(CC) $(LDFLAGS) -o \
482 + sync_reset sync_reset.lo sync_support.lo sync_commit.lo \
483 + libimap.la mutex_fake.lo $(DEPLIBS) $(LIBS)
485 ### Other Misc Targets
488 - rm -f *.o *.a Makefile.bak makedepend.log \
489 + rm -f *.lo *.la Makefile.bak makedepend.log \
490 $(BUILTSOURCES) $(PROGS) $(SUIDPROGS)
493 --- cyrus-imapd-2.3.12p2/imtest/Makefile.in 2008-03-24 20:55:59.000000000 +0200
494 +++ cyrus-imapd-2.3.12p2.shared/imtest/Makefile.in 2008-09-23 21:44:50.599845178 +0300
500 +top_builddir = @top_builddir@
502 DEFS = @DEFS@ @LOCALDEFS@
503 CPPFLAGS = -I.. -I$(srcdir)/../lib @COM_ERR_CPPFLAGS@ @CPPFLAGS@ @SASLFLAGS@
505 IMAP_LIBS = @IMAP_LIBS@ @LIB_RT@
506 -DEPLIBS = ../lib/libcyrus.a ../lib/libcyrus_min.a @DEPLIBS@
507 +DEPLIBS = ../lib/libcyrus.la ../lib/libcyrus_min.la @DEPLIBS@
510 LDFLAGS = @LDFLAGS@ @COM_ERR_LDFLAGS@
515 - $(INSTALL) -s -m 755 imtest $(DESTDIR)$(exec_prefix)/bin
516 + $(LIBTOOL) --mode=install $(INSTALL) imtest $(DESTDIR)$(exec_prefix)/bin
517 ln -f $(DESTDIR)$(exec_prefix)/bin/imtest $(DESTDIR)$(exec_prefix)/bin/pop3test
518 ln -f $(DESTDIR)$(exec_prefix)/bin/imtest $(DESTDIR)$(exec_prefix)/bin/nntptest
519 ln -f $(DESTDIR)$(exec_prefix)/bin/imtest $(DESTDIR)$(exec_prefix)/bin/lmtptest
521 $(CC) -c $(CPPFLAGS) $(DEFS) $(CFLAGS) $<
523 imtest: imtest.o $(DEPLIBS)
524 - $(CC) $(LDFLAGS) -o imtest imtest.o $(DEPLIBS) $(IMAP_LIBS)
525 + $(LIBTOOL) --mode=link --tag=CC $(CC) $(LDFLAGS) -o imtest imtest.o $(DEPLIBS) $(IMAP_LIBS)
527 imtest.pure: imtest.o $(DEPLIBS)
528 - $(PURIFY) $(PUREOPT) $(CC) $(LDFLAGS) -o imtest $(OBJS) $(DEPLIBS) $(LIBS) $(IMAP_LIBS)
529 + $(PURIFY) $(PUREOPT) $(LIBTOOL) --mode=link --tag=CC $(CC) $(LDFLAGS) -o imtest $(OBJS) $(DEPLIBS) $(LIBS) $(IMAP_LIBS)
532 rm -f *.o Makefile.bak makedepend.log imtest
533 --- cyrus-imapd-2.3.12p2/imtest/imtest.c 2008-04-11 15:35:18.000000000 +0300
534 +++ cyrus-imapd-2.3.12p2.shared/imtest/imtest.c 2008-09-23 21:44:50.595844947 +0300
539 +/* config.c stuff */
540 +const int config_need_data = 0;
542 int mysasl_config(void *context __attribute__((unused)),
543 const char *plugin_name,
545 --- cyrus-imapd-2.3.12p2/installsieve/Makefile.in 2008-03-24 22:33:11.000000000 +0200
546 +++ cyrus-imapd-2.3.12p2.shared/installsieve/Makefile.in 2008-09-23 21:44:50.591844716 +0300
552 +top_builddir = @top_builddir@
555 CPPFLAGS = -I. -I$(srcdir) -I$(srcdir)/../lib @CPPFLAGS@ @SASLFLAGS@
558 IMAP_LIBS = @IMAP_LIBS@
560 -DEPLIBS= ../lib/libcyrus.a @DEPLIBS@
561 +DEPLIBS= ../lib/libcyrus.la @DEPLIBS@
564 exec_prefix = @exec_prefix@
569 - $(INSTALL) -s -m 755 installsieve $(DESTDIR)$(exec_prefix)/bin
570 + $(LIBTOOL) --mode=install $(INSTALL) installsieve $(DESTDIR)$(exec_prefix)/bin
572 -OBJS=lex.o mystring.o request.o isieve.o
573 +OBJS=lex.lo mystring.lo request.lo isieve.lo
575 -libinstallsieve.a: $(OBJS)
576 - rm -f libinstallsieve.a
577 - ar cr libinstallsieve.a $(OBJS)
578 - $(RANLIB) libinstallsieve.a
579 +libinstallsieve.la: $(OBJS)
580 + $(LIBTOOL) --mode=link --tag=CC $(CC) -o libinstallsieve.la $(OBJS)
582 -installsieve: libinstallsieve.a installscript.o $(DEPLIBS)
583 - $(CC) $(LDFLAGS) -o installsieve libinstallsieve.a installscript.o $(DEPLIBS) $(IMAP_LIBS)
584 +installsieve: libinstallsieve.la installscript.lo $(DEPLIBS)
585 + $(LIBTOOL) --mode=link --tag=CC $(CC) $(LDFLAGS) -o installsieve libinstallsieve.la installscript.lo $(DEPLIBS) $(IMAP_LIBS)
588 - rm -f *.o *.a Makefile.bak makedepend.log
589 + rm -f *.lo *.la Makefile.bak makedepend.log
592 rm -f Makefile installsieve
595 ${MAKEDEPEND} $(CPPFLAGS) $(DEFS) -I$(srcdir) $(CFLAGS) *.c $(srcdir)/*.c 1>makedepend.log 2>&1
598 - $(CC) -c $(CPPFLAGS) $(DEFS) -I$(srcdir) -I. $(CFLAGS) \
600 + $(LIBTOOL) --mode=compile $(CC) -c $(CPPFLAGS) $(DEFS) -I$(srcdir) -I. $(CFLAGS) \
604 # DO NOT DELETE THIS LINE -- make depend depends on it.
605 --- cyrus-imapd-2.3.12p2/lib/Makefile.in 2008-03-24 19:43:08.000000000 +0200
606 +++ cyrus-imapd-2.3.12p2.shared/lib/Makefile.in 2008-09-23 21:44:50.599845178 +0300
610 # Authorization namespace.
611 -AUTH=auth.o auth_krb.o auth_unix.o auth_krb5.o auth_pts.o
612 +AUTH=auth.lo auth_krb.lo auth_unix.lo auth_krb5.lo auth_pts.lo
614 # ACL interpretation. Only one choice for now:
619 top_srcdir = @top_srcdir@
625 +top_builddir = @top_builddir@
627 DEFS = @DEFS@ @LOCALDEFS@
628 CPPFLAGS = -I.. @CPPFLAGS@ @COM_ERR_CPPFLAGS@ @SASLFLAGS@
631 exec_prefix = @exec_prefix@
632 cyrus_prefix = @cyrus_prefix@
638 $(srcdir)/libcyr_cfg.h $(srcdir)/byteorder64.h \
639 $(srcdir)/md5.h $(srcdir)/hmac-md5.h
641 -LIBCYR_OBJS = acl.o bsearch.o charset.o glob.o retry.o util.o \
642 - libcyr_cfg.o mkgmtime.o prot.o parseaddr.o imclient.o imparse.o \
643 - lsort.o stristr.o rfc822date.o cyrusdb.o strhash.o \
644 - chartable.o imapurl.o nonblock_@WITH_NONBLOCK@.o lock_@WITH_LOCK@.o \
645 - gmtoff_@WITH_GMTOFF@.o map_@WITH_MAP@.o $(ACL) $(AUTH) \
646 +LIBCYR_OBJS = acl.lo bsearch.lo charset.lo glob.lo retry.lo util.lo \
647 + libcyr_cfg.lo mkgmtime.lo prot.lo parseaddr.lo imclient.lo imparse.lo \
648 + lsort.lo stristr.lo rfc822date.lo cyrusdb.lo strhash.lo \
649 + chartable.lo imapurl.lo nonblock_@WITH_NONBLOCK@.lo lock_@WITH_LOCK@.lo \
650 + gmtoff_@WITH_GMTOFF@.lo map_@WITH_MAP@.lo $(ACL) $(AUTH) \
651 @LIBOBJS@ @CYRUSDB_OBJS@ @MD5OBJ@ \
652 - iptostring.o xmalloc.o wildmat.o byteorder64.o \
653 - xstrlcat.o xstrlcpy.o
654 + iptostring.lo xmalloc.lo wildmat.lo byteorder64.lo \
655 + xstrlcat.lo xstrlcpy.lo
657 LIBCYRM_HDRS = $(srcdir)/hash.h $(srcdir)/mpool.h $(srcdir)/xmalloc.h \
658 $(srcdir)/xstrlcat.h $(srcdir)/xstrlcpy.h $(srcdir)/util.h \
659 $(srcdir)/strhash.h $(srcdir)/libconfig.h $(srcdir)/assert.h \
661 -LIBCYRM_OBJS = libconfig.o imapopts.o hash.o mpool.o xmalloc.o strhash.o \
662 - xstrlcat.o xstrlcpy.o assert.o util.o @IPV6_OBJS@
663 +LIBCYRM_OBJS = libconfig.lo imapopts.lo hash.lo mpool.lo xmalloc.lo strhash.lo \
664 + xstrlcat.lo xstrlcpy.lo assert.lo util.lo @IPV6_OBJS@
666 -all: $(BUILTSOURCES) libcyrus_min.a libcyrus.a
667 +all: $(BUILTSOURCES) libcyrus_min.la libcyrus.la
670 $(srcdir)/../install-sh -d $(DESTDIR)$(libdir)
671 - $(INSTALL) -m 644 libcyrus.a $(DESTDIR)$(libdir)
672 - $(INSTALL) -m 644 libcyrus_min.a $(DESTDIR)$(libdir)
673 + $(LIBTOOL) --mode=install $(INSTALL) -m 644 libcyrus.la $(DESTDIR)$(libdir)
674 + $(LIBTOOL) --mode=install $(INSTALL) -m 644 libcyrus_min.la $(DESTDIR)$(libdir)
675 $(RANLIB) $(DESTDIR)$(libdir)/libcyrus.a
676 for file in $(LIBCYR_HDRS); \
678 @@ -122,19 +125,15 @@
679 $(INSTALL) -m 644 $$file $(DESTDIR)$(prefix)/include/cyrus || exit 1; \
683 - $(CC) -c $(CPPFLAGS) $(DEFS) $(CFLAGS) \
685 + $(LIBTOOL) --mode=compile $(CC) -c $(CPPFLAGS) $(DEFS) $(CFLAGS) \
688 -libcyrus.a: $(LIBCYR_OBJS)
690 - ar cr libcyrus.a $(LIBCYR_OBJS)
691 - $(RANLIB) libcyrus.a
693 -libcyrus_min.a: $(LIBCYRM_OBJS)
694 - rm -f libcyrus_min.a
695 - ar cr libcyrus_min.a $(LIBCYRM_OBJS)
696 - $(RANLIB) libcyrus_min.a
697 +libcyrus.la: $(LIBCYR_OBJS) libcyrus_min.la
698 + $(LIBTOOL) --mode=link --tag=CC $(CC) -o libcyrus.la $(LIBCYR_OBJS) libcyrus_min.la @LIBS@ @LIB_SASL@ -rpath $(libdir)
700 +libcyrus_min.la: $(LIBCYRM_OBJS)
701 + $(LIBTOOL) --mode=link --tag=CC $(CC) -o libcyrus_min.la $(LIBCYRM_OBJS) @IMAP_COM_ERR_LIBS@ -rpath $(libdir)
703 imapopts.c: imapoptions $(srcdir)/../tools/config2header
704 $(srcdir)/../tools/config2header CC="$(CC)" $(srcdir)/imapopts.c $(srcdir)/imapopts.h < $(srcdir)/imapoptions
705 --- cyrus-imapd-2.3.12p2/master/Makefile.in 2008-03-24 19:47:41.000000000 +0200
706 +++ cyrus-imapd-2.3.12p2.shared/master/Makefile.in 2008-09-23 21:44:50.599845178 +0300
712 +top_builddir = @top_builddir@
714 CYRUS_USER=@cyrus_user@
715 CYRUS_GROUP=@cyrus_group@
719 LDFLAGS = @LDFLAGS@ @COM_ERR_LDFLAGS@
720 -LIBS = ../lib/libcyrus_min.a @LIB_UCDSNMP@ @LIBS@ @COM_ERR_LIBS@
721 +LIBS = ../lib/libcyrus_min.la @LIB_UCDSNMP@ @LIBS@ @COM_ERR_LIBS@
724 MAKEDEPEND = @MAKEDEPEND@
726 $(srcdir)/../install-sh -d ${DESTDIR}$(service_path)
727 for file in $(PROGS); \
729 - $(INSTALL) -m 755 $$file $(DESTDIR)$(service_path) || exit 1; \
730 + $(LIBTOOL) --mode=install $(INSTALL) $$file $(DESTDIR)$(service_path) || exit 1; \
737 master: master.o masterconf.o cyrusMasterMIB.o ../lib/lock_@WITH_LOCK@.o
738 - $(CC) $(LDFLAGS) -o master master.o masterconf.o cyrusMasterMIB.o ../lib/lock_@WITH_LOCK@.o $(LIBS) $(DEPLIBS)
739 + $(LIBTOOL) --mode=link --tag=CC $(CC) $(LDFLAGS) -o master master.o masterconf.o cyrusMasterMIB.o ../lib/lock_@WITH_LOCK@.o $(LIBS) $(DEPLIBS)
742 rm -f *.o *.a Makefile.bak $(PROGS)
743 --- cyrus-imapd-2.3.12p2/netnews/Makefile.in 2008-03-24 21:06:32.000000000 +0200
744 +++ cyrus-imapd-2.3.12p2.shared/netnews/Makefile.in 2008-09-23 21:44:50.587844484 +0300
750 +top_builddir = @top_builddir@
753 CPPFLAGS = -I.. -I$(srcdir) -I$(srcdir)/../lib -I$(srcdir)/../com_err/et @CPPFLAGS@
754 LIBS = @IMAP_LIBS@ @LIB_RT@
755 -DEPLIBS = ../lib/libcyrus.a ../lib/libcyrus_min.a @DEPLIBS@
756 +DEPLIBS = ../lib/libcyrus.la ../lib/libcyrus_min.la @DEPLIBS@
764 - $(INSTALL) -s -m 755 remotepurge $(DESTDIR)$(service_path)
765 + $(LIBTOOL) --mode=install $(INSTALL) remotepurge $(DESTDIR)$(service_path)
768 $(CC) -c $(CPPFLAGS) $(DEFS) $(CFLAGS) $<
770 remotepurge: $(OBJS) $(DEPLIBS)
771 - $(CC) $(LDFLAGS) -o remotepurge $(OBJS) \
772 + $(LIBTOOL) --mode=link --tag=CC $(CC) $(LDFLAGS) -o remotepurge $(OBJS) \
776 --- cyrus-imapd-2.3.12p2/notifyd/Makefile.in 2008-03-24 21:59:32.000000000 +0200
777 +++ cyrus-imapd-2.3.12p2.shared/notifyd/Makefile.in 2008-09-23 21:44:50.599845178 +0300
783 +top_builddir = @top_builddir@
786 CYRUS_USER=@cyrus_user@
789 ${MAKEDEPEND} $(CPPFLAGS) $(DEFS) -I$(srcdir) $(CFLAGS) *.c $(srcdir)/*.c 1>makedepend.log 2>&1
792 - $(CC) -c $(CPPFLAGS) $(DEFS) $(CFLAGS) \
794 + $(LIBTOOL) --mode=compile --tag=CC $(CC) -c $(CPPFLAGS) $(DEFS) $(CFLAGS) \
797 # DO NOT DELETE THIS LINE -- make depend depends on it.
798 --- cyrus-imapd-2.3.12p2/perl/imap/IMAP.xs 2008-04-04 15:47:09.000000000 +0300
799 +++ cyrus-imapd-2.3.12p2.shared/perl/imap/IMAP.xs 2008-09-23 21:44:50.595844947 +0300
804 +const int config_need_data = 0;
807 * Decrement the refcounts of the Perl SV's in the passed rock, then free the
808 --- cyrus-imapd-2.3.12p2/perl/imap/Makefile.PL 2007-10-17 23:06:33.000000000 +0300
809 +++ cyrus-imapd-2.3.12p2.shared/perl/imap/Makefile.PL 2008-09-23 21:44:50.595844947 +0300
811 'macro' => {'IMCLIENT_LIBS' => ''}, # hack
812 'clean' => {'FILES' => 'libcyrperl.a cyradm'},
813 'OBJECT' => 'IMAP.o',
814 - 'MYEXTLIB' => '../../lib/libcyrus.a ../../lib/libcyrus_min.a',
815 - 'LIBS' => ["$BDB_LIB $SASL_LIB $OPENSSL_LIB $LIB_RT -lssl -lcrypto"],
816 + 'LIBS' => ["$BDB_LIB $SASL_LIB $OPENSSL_LIB $LIB_RT -lssl -lcrypto -L../../lib/.libs -lcyrus -lcyrus_min"],
817 'DEFINE' => '-DPERL_POLLUTE', # e.g., '-DHAVE_SOMETHING'
818 'INC' => "-I../../lib -I../.. -I../../com_err/et $SASL_INC $OPENSSL_INC",
819 'EXE_FILES' => [cyradm],
820 --- cyrus-imapd-2.3.12p2/perl/sieve/lib/Makefile.in 2008-04-04 15:47:17.000000000 +0300
821 +++ cyrus-imapd-2.3.12p2.shared/perl/sieve/lib/Makefile.in 2008-09-23 21:44:50.595844947 +0300
827 +top_builddir = @top_builddir@
829 DEFS = @DEFS@ @LOCALDEFS@ -Dbool=char -DHAS_BOOL
830 CPPFLAGS = -I. -I../../.. -I$(srcdir) -I$(srcdir)/../../../lib @CPPFLAGS@ @DYNSASLFLAGS@ @COM_ERR_CPPFLAGS@
831 -LIBS = ../../../lib/libcyrus.a ../../../lib/libcyrus_min.a @LIB_DYN_SASL@ @LIBS@
832 +LIBS = ../../../lib/libcyrus.la ../../../lib/libcyrus_min.la @LIB_DYN_SASL@ @LIBS@
833 IMAP_LIBS = @IMAP_LIBS@
834 -DEPLIBS = ../../../lib/libcyrus.a ../../../lib/libcyrus_min.a @DEPLIBS@
835 +DEPLIBS = ../../../lib/libcyrus.la ../../../lib/libcyrus_min.la @DEPLIBS@
837 MAKEDEPEND_CFLAGS = @CFLAGS@
838 CFLAGS = @CFLAGS@ @PERL_CCCDLFLAGS@
840 exec_prefix = @exec_prefix@
841 cyrus_prefix = @cyrus_prefix@
843 -OBJS=isieve.o lex.o mystring.o request.o
844 +OBJS=isieve.lo lex.lo mystring.lo request.lo
852 - $(CC) -c $(CPPFLAGS) $(DEFS) $(CFLAGS) $<
854 + $(LIBTOOL) --mode=compile $(CC) -c $(CPPFLAGS) $(DEFS) $(CFLAGS) $<
856 -libisieve.a: $(OBJS)
858 - ar cr libisieve.a $(OBJS)
859 - $(RANLIB) libisieve.a
860 +libisieve.la: $(OBJS)
861 + $(LIBTOOL) --mode=link --tag=CC $(CC) -o libisievie.la $(OBJS)
864 rm -f *.o Makefile.bak makedepend.log libisieve.a
865 --- cyrus-imapd-2.3.12p2/perl/sieve/managesieve/Makefile.PL 2008-04-04 15:47:23.000000000 +0300
866 +++ cyrus-imapd-2.3.12p2.shared/perl/sieve/managesieve/Makefile.PL 2008-09-23 21:44:50.591844716 +0300
868 'NAME' => 'Cyrus::SIEVE::managesieve',
869 'ABSTRACT' => 'Cyurs Sieve management interface',
870 'VERSION_FROM' => 'managesieve.pm', # finds $VERSION
871 - 'MYEXTLIB' => '../lib/isieve.o ../lib/lex.o ../lib/mystring.o ../lib/request.o ../../../lib/libcyrus.a ../../../lib/libcyrus_min.a',
872 - 'LIBS' => ["$BDB_LIB $SASL_LIB $OPENSSL_LIB $LIB_RT -lssl -lcrypto"],
873 + 'MYEXTLIB' => '../lib/.libs/isieve.o ../lib/.libs/lex.o ../lib/.libs/mystring.o ../lib/.libs/request.o',
874 + 'LIBS' => ["$BDB_LIB $SASL_LIB $OPENSSL_LIB $LIB_RT -lssl -lcrypto -L../../../lib/.libs -lcyrus -lcyrus_min"],
875 'DEFINE' => '-DPERL_POLLUTE', # e.g., '-DHAVE_SOMETHING'
876 'INC' => "-I../lib/ -I../../../lib/ $SASL_INC $OPENSSL_INC",
878 --- cyrus-imapd-2.3.12p2/perl/sieve/managesieve/managesieve.xs 2008-04-04 15:47:24.000000000 +0300
879 +++ cyrus-imapd-2.3.12p2.shared/perl/sieve/managesieve/managesieve.xs 2008-09-23 21:44:50.595844947 +0300
881 croak("failure: %s", s);
884 +const int config_need_data = 0;
887 perlsieve_getpass(conn, context, id, psecret)
888 --- cyrus-imapd-2.3.12p2/ptclient/Makefile.in 2008-03-24 20:34:22.000000000 +0200
889 +++ cyrus-imapd-2.3.12p2.shared/ptclient/Makefile.in 2008-09-23 21:44:50.587844484 +0300
895 +top_builddir = @top_builddir@
898 CPPFLAGS = -I.. -I$(srcdir)/../imap -I$(srcdir)/../lib @COM_ERR_CPPFLAGS@ @CPPFLAGS@ @SASLFLAGS@
900 LIBS = $(IMAP_LIBS) @COM_ERR_LIBS@
901 LIB_SASL = @LIB_SASL@
902 LIB_WRAP = @LIB_WRAP@
903 -DEPLIBS = ../imap/libimap.a ../lib/libcyrus.a ../lib/libcyrus_min.a @DEPLIBS@
904 -UTIL_LIBS = ../imap/mutex_fake.o ../imap/cli_fatal.o
905 +DEPLIBS = ../imap/libimap.la ../lib/libcyrus.la ../lib/libcyrus_min.la @DEPLIBS@
906 +UTIL_LIBS = ../imap/mutex_fake.lo ../imap/cli_fatal.lo
908 LDAP_LIBS=@LDAP_LIBS@
909 LDAP_CPPFLAGS=@LDAP_CPPFLAGS@
914 -SERVICE=../master/service.o
915 -SERVICETHREAD=../master/service-thread.o
916 +SERVICE=../master/service.lo
917 +SERVICETHREAD=../master/service-thread.lo
922 - $(INSTALL) -m 755 ptloader $(DESTDIR)$(service_path)
923 - $(INSTALL) -m 755 ptexpire $(DESTDIR)$(service_path)
924 - $(INSTALL) -m 755 ptdump $(DESTDIR)$(service_path)
925 + $(LIBTOOL) --mode=install $(INSTALL) ptloader $(DESTDIR)$(service_path)
926 + $(LIBTOOL) --mode=install $(INSTALL) ptexpire $(DESTDIR)$(service_path)
927 + $(LIBTOOL) --mode=install $(INSTALL) ptdump $(DESTDIR)$(service_path)
930 - $(CC) -c $(CPPFLAGS) $(LDAP_CPPFLAGS) $(DEFS) $(CFLAGS) $<
932 + $(LIBTOOL) --mode=compile --tag=CC $(CC) -c $(CPPFLAGS) $(LDAP_CPPFLAGS) $(DEFS) $(CFLAGS) $<
934 -ptloader: ptloader.o afskrb.o ldap.o ../imap/mutex_fake.o $(DEPLIBS)
935 - $(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)
936 +ptloader: ptloader.lo afskrb.lo ldap.lo ../imap/mutex_fake.lo $(DEPLIBS)
937 + $(LIBTOOL) --mode=link --tag=CC $(CC) $(LDFLAGS) -o $@ ptloader.lo afskrb.lo ldap.lo ../imap/mutex_fake.lo $(SERVICETHREAD) ${AFS_LDFLAGS} ${LDAP_LDFLAGS} $(AFS_LIBS) ${LDAP_LIBS} $(DEPLIBS) $(LIB_SASL) $(LIBS) $(LIB_WRAP) $(LIB_RT)
939 -ptloader.pure: ptloader.o afskrb.o ldap.o ../imap/mutex_fake.o $(DEPLIBS)
940 - $(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)
941 +ptloader.pure: ptloader.lo afskrb.lo ldap.lo ../imap/mutex_fake.lo $(DEPLIBS)
942 + $(PURIFY) $(PUREARGS) $(LIBTOOL) --mode=link --tag=CC $(CC) $(LDFLAGS) -o $@ ptloader.lo afskrb.lo ldap.lo ../imap/mutex_fake.lo $(SERVICETHREAD) ${AFS_LDFLAGS} ${LDAP_LDFLAGS} $(AFS_LIBS) ${LDAP_LIBS} $(DEPLIBS) $(LIB_SASL) $(LIBS) $(LIB_WRAP) $(LIB_RT)
944 -ptexpire: ptexpire.o $(DEPLIBS) $(UTIL_LIBS)
945 - $(CC) $(LDFLAGS) -o $@ ptexpire.o $(UTIL_LIBS) $(DEPLIBS) $(LIB_SASL) $(LIBS) $(LIB_RT)
946 +ptexpire: ptexpire.lo $(DEPLIBS) $(UTIL_LIBS)
947 + $(LIBTOOL) --mode=link --tag=CC $(CC) $(LDFLAGS) -o $@ ptexpire.lo $(UTIL_LIBS) $(DEPLIBS) $(LIB_SASL) $(LIBS) $(LIB_RT)
949 -ptexpire.pure: ptexpire.o $(DEPLIBS) $(UTIL_LIBS)
950 - $(PURIFY) $(PUREARGS) $(CC) $(LDFLAGS) -o $@ ptexpire.o $(UTIL_LIBS) $(DEPLIBS) $(LIB_SASL) $(LIBS) $(LIB_WRAP) $(LIB_RT)
951 +ptexpire.pure: ptexpire.lo $(DEPLIBS) $(UTIL_LIBS)
952 + $(PURIFY) $(PUREARGS) $(LIBTOOL) --mode=link --tag=CC $(CC) $(LDFLAGS) -o $@ ptexpire.lo $(UTIL_LIBS) $(DEPLIBS) $(LIB_SASL) $(LIBS) $(LIB_WRAP) $(LIB_RT)
954 -ptdump: ptdump.o $(DEPLIBS) $(UTIL_LIBS)
955 - $(CC) $(LDFLAGS) -o $@ ptdump.o $(UTIL_LIBS) $(DEPLIBS) $(LIB_SASL) $(LIBS) $(LIB_RT)
956 +ptdump: ptdump.lo $(DEPLIBS) $(UTIL_LIBS)
957 + $(LIBTOOL) --mode=link --tag=CC $(CC) $(LDFLAGS) -o $@ ptdump.lo $(UTIL_LIBS) $(DEPLIBS) $(LIB_SASL) $(LIBS) $(LIB_RT)
959 -ptdump.pure: ptexpire.o $(DEPLIBS) $(UTIL_LIBS)
960 - $(PURIFY) $(PUREARGS) $(CC) $(LDFLAGS) -o $@ ptdump.o $(UTIL_LIBS) $(DEPLIBS) $(LIB_SASL) $(LIBS) $(LIB_WRAP) $(LIB_RT)
961 +ptdump.pure: ptexpire.lo $(DEPLIBS) $(UTIL_LIBS)
962 + $(PURIFY) $(PUREARGS) $(LIBTOOL) --mode=link --tag=CC $(CC) $(LDFLAGS) -o $@ ptdump.lo $(UTIL_LIBS) $(DEPLIBS) $(LIB_SASL) $(LIBS) $(LIB_WRAP) $(LIB_RT)
964 -ptextract: ptextract.o $(DEPLIBS) $(UTIL_LIBS)
965 - $(CC) $(LDFLAGS) -o $@ ptextract.o $(UTIL_LIBS) $(DEPLIBS) $(LIBS)
966 +ptextract: ptextract.lo $(DEPLIBS) $(UTIL_LIBS)
967 + $(LIBTOOL) --mode=link --tag=CC $(CC) $(LDFLAGS) -o $@ ptextract.lo $(UTIL_LIBS) $(DEPLIBS) $(LIBS)
970 - rm -f *.o Makefile.bak $(PROGS) makedepend.log
971 + rm -f *.lo Makefile.bak $(PROGS) makedepend.log
975 --- cyrus-imapd-2.3.12p2/sieve/Makefile.in 2008-03-24 22:08:46.000000000 +0200
976 +++ cyrus-imapd-2.3.12p2.shared/sieve/Makefile.in 2008-09-23 21:44:50.587844484 +0300
982 +top_builddir = @top_builddir@
983 COMPILE_ET = @COMPILE_ET@
985 DEFS = @DEFS@ @LOCALDEFS@
987 IMAP_COM_ERR_LIBS = @IMAP_COM_ERR_LIBS@
988 IMAP_LIBS = @IMAP_LIBS@ @LIB_RT@
989 LIBS = libsieve.a $(IMAP_LIBS) $(IMAP_COM_ERR_LIBS)
990 -DEPLIBS=../lib/libcyrus.a ../lib/libcyrus_min.a @DEPLIBS@
991 +DEPLIBS=../lib/libcyrus.la ../lib/libcyrus_min.la @DEPLIBS@
993 BUILT_SOURCES = addr.c addr.h addr-lex.c \
994 sieve.c sieve.h sieve-lex.c \
998 $(srcdir)/../install-sh -d ${DESTDIR}$(service_path)
999 - $(srcdir)/../install-sh -c -m 755 sievec $(DESTDIR)$(service_path) || exit
1000 + $(LIBTOOL) --mode=install $(srcdir)/../install-sh -c -m 755 sievec $(DESTDIR)$(service_path) || exit
1002 test: $(DEPLIBS) libsieve.a test.o ../imap/message.o
1003 - $(CC) $(LDFLAGS) -o test test.o ../imap/message.o \
1004 + $(LIBTOOL) --mode=link --tag=CC $(CC) $(LDFLAGS) -o test test.o ../imap/message.o \
1005 libsieve.a $(DEPLIBS) $(LIBS)
1007 OBJS = sieve_err.o \
1008 @@ -123,10 +125,10 @@
1009 $(RANLIB) libsieve.a
1011 sievec: sievec.o libsieve.a
1012 - $(CC) $(LDFLAGS) -o sievec sievec.o libsieve.a $(DEPLIBS) $(LIBS)
1013 + $(LIBTOOL) --mode=link --tag=CC $(CC) $(LDFLAGS) -o sievec sievec.o libsieve.a $(DEPLIBS) $(LIBS)
1015 sieved: sieved.o libsieve.a
1016 - $(CC) $(LDFLAGS) -o sieved sieved.o libsieve.a $(DEPLIBS) $(LIBS)
1017 + $(LIBTOOL) --mode=link --tag=CC $(CC) $(LDFLAGS) -o sieved sieved.o libsieve.a $(DEPLIBS) $(LIBS)
1020 sieve_interface.h: sieve_err.h
1021 --- cyrus-imapd-2.3.12p2/timsieved/Makefile.in 2008-03-24 22:20:57.000000000 +0200
1022 +++ cyrus-imapd-2.3.12p2.shared/timsieved/Makefile.in 2008-09-23 21:44:50.587844484 +0300
1027 +LIBTOOL = @LIBTOOL@
1028 +top_builddir = @top_builddir@
1031 CYRUS_USER=@cyrus_user@
1034 ${MAKEDEPEND} $(CPPFLAGS) $(DEFS) -I$(srcdir) $(CFLAGS) *.c $(srcdir)/*.c 1>makedepend.log 2>&1
1037 - $(CC) -c $(CPPFLAGS) $(DEFS) $(CFLAGS) \
1039 + $(LIBTOOL) --mode=compile --tag=CC $(CC) -c $(CPPFLAGS) $(DEFS) $(CFLAGS) \
1042 # DO NOT DELETE THIS LINE -- make depend depends on it.