1 --- cyrus-imapd-2.3.12p2.shared/configure.in 2008-09-23 21:44:50.591844716 +0300
2 +++ cyrus-imapd-2.3.12p2/configure.in 2008-09-23 22:25:22.672454302 +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?])
51 if test "$sievedir" != "no"; then
52 - SIEVE_OBJS="lmtp_sieve.o smtpclient.o"
53 + SIEVE_OBJS="lmtp_sieve.lo smtpclient.lo"
55 - SIEVE_LIBS="../${sievedir}/libsieve.a"
56 + SIEVE_LIBS="../${sievedir}/libsieve.la"
58 SIEVE_CPPFLAGS="-I\$(srcdir)/../$sievedir"
59 AC_SUBST(SIEVE_CPPFLAGS)
61 if test $cyrus_cv_lib_syslog = no; then
62 PRE_SUBDIRS="${PRE_SUBDIRS} syslog"
63 EXTRA_OUTPUT="${EXTRA_OUTPUT} syslog/Makefile"
64 - DEPLIBS="${DEPLIBS} ../syslog/libsyslog.a"
65 + DEPLIBS="${DEPLIBS} ../syslog/libsyslog.la"
66 CPPFLAGS="$CPPFLAGS -I\$(srcdir)/../syslog"
68 AC_MSG_RESULT($cyrus_cv_lib_syslog)
70 dnl Check for MD5 functions
71 AC_FUNC_CHECK(MD5Init,,
72 AC_CHECK_LIB(md, MD5Init, LIBS="${LIBS} -lmd",
78 --- cyrus-imapd-2.3.12p2.shared/depot/Makefile.in 2008-09-23 21:44:50.599845178 +0300
79 +++ cyrus-imapd-2.3.12p2/depot/Makefile.in 2008-09-23 22:10:04.419383504 +0300
84 +top_builddir = @top_builddir@
93 CPPFLAGS = -I. -I$(srcdir) -I$(srcdir)/../lib -I$(srcdir)/../et @CPPFLAGS@
95 -DEPLIBS = ../lib/libcyrus.a ../lib/libcyrus_min.a @DEPLIBS@
96 +DEPLIBS = ../lib/libcyrus.la ../lib/libcyrus_min.la @DEPLIBS@
101 $(INSTALL) -m 644 $(srcdir)/rc.local.imap $(DESTDIR)etc
102 $(INSTALL) -m 644 $(srcdir)/rc.local.ptclient $(DESTDIR)etc
105 - $(CC) -c $(CPPFLAGS) $(DEFS) $(CFLAGS) $<
107 + $(LIBTOOL) --mode=compile --tag=CC $(CC) -c $(CPPFLAGS) $(DEFS) $(CFLAGS) $<
110 - rm -f *.o Makefile.bak makedepend.log
111 + rm -rf .libs *.o *.lo Makefile.bak makedepend.log
115 --- cyrus-imapd-2.3.12p2/imap/Makefile.in 2008-04-04 00:09:51.000000000 +0300
116 +++ cyrus-imapd-2.3.12p2.shared/imap/Makefile.in 2008-09-23 21:44:50.591844716 +0300
119 # \Seen state database. Either 'db' (berkeley db) or
120 # 'local' (legacy flat file).
125 top_srcdir = @top_srcdir@
126 +top_builddir = @top_builddir@
135 CYRUS_USER=@cyrus_user@
136 CYRUS_GROUP=@cyrus_group@
138 IMAP_COM_ERR_LIBS = @IMAP_COM_ERR_LIBS@
139 LIB_WRAP = @LIB_WRAP@
140 LIBS = $(IMAP_LIBS) $(IMAP_COM_ERR_LIBS)
141 -DEPLIBS = ../lib/libcyrus.a ../lib/libcyrus_min.a @DEPLIBS@
142 +DEPLIBS = ../lib/libcyrus.la ../lib/libcyrus_min.la @DEPLIBS@
145 LDFLAGS = @LDFLAGS@ @COM_ERR_LDFLAGS@
147 cyrus_prefix = @cyrus_prefix@
148 service_path = @service_path@
150 -LOBJS= append.o mailbox.o mboxlist.o mupdate-client.o mboxname.o message.o \
151 - global.o imap_err.o mupdate_err.o proc.o setproctitle.o \
152 - convert_code.o duplicate.o saslclient.o saslserver.o signals.o \
153 - annotate.o search_engines.o squat.o squat_internal.o mbdump.o \
154 - imapparse.o telemetry.o user.o notify.o idle.o quota_db.o \
155 - sync_log.o $(SEEN) mboxkey.o backend.o tls.o message_guid.o \
157 +LOBJS= append.lo mailbox.lo mboxlist.lo mupdate-client.lo mboxname.lo message.lo \
158 + global.lo imap_err.lo mupdate_err.lo proc.lo setproctitle.lo \
159 + convert_code.lo duplicate.lo saslclient.lo saslserver.lo signals.lo \
160 + annotate.lo search_engines.lo squat.lo squat_internal.lo mbdump.lo \
161 + imapparse.lo telemetry.lo user.lo notify.lo idle.lo quota_db.lo \
162 + sync_log.lo $(SEEN) mboxkey.lo backend.lo tls.lo message_guid.lo \
165 -IMAPDOBJS=pushstats.o imapd.o proxy.o imap_proxy.o index.o version.o
166 +IMAPDOBJS=pushstats.lo imapd.lo proxy.lo imap_proxy.lo index.lo version.lo
168 -LMTPOBJS=lmtpstats.o lmtpengine.o spool.o
169 +LMTPOBJS=lmtpstats.lo lmtpengine.lo spool.lo
171 # Your typical objects for the command line utilities
172 -CLIOBJS=cli_fatal.o mutex_fake.o
173 +CLIOBJS=cli_fatal.lo mutex_fake.lo
175 -SERVICE=../master/service.o
176 -SERVICETHREAD=../master/service-thread.o
177 +SERVICE=../master/service.lo
178 +SERVICETHREAD=../master/service-thread.lo
180 PROGS = imapd lmtpd pop3d \
181 fud smmapd reconstruct quota mbpath ipurge cyr_dbtool cyr_synclog \
182 @@ -139,23 +141,21 @@
183 ln -f $(DESTDIR)$(service_path)/imapd $(DESTDIR)$(service_path)/proxyd
184 ln -f $(DESTDIR)$(service_path)/lmtpd $(DESTDIR)$(service_path)/lmtpproxyd
187 - $(CC) -c $(CPPFLAGS) $(DEFS) $(CFLAGS) \
189 + $(LIBTOOL) --mode=compile --tag=CC $(CC) -c $(CPPFLAGS) $(DEFS) $(CFLAGS) \
196 - ar cr libimap.a $(LOBJS)
197 - $(RANLIB) libimap.a
198 +libimap.la: $(LOBJS)
199 + $(LIBTOOL) --mode=link --tag=CC $(CC) -o libimap.la $(LOBJS)
201 ### Built Source Files
204 AWK=$(AWK) $(srcdir)/xversion.sh
206 -version.o: xversion.h
207 +version.lo: xversion.h
209 pushstats.c: pushstats.snmp $(srcdir)/../snmp/snmpgen
210 $(srcdir)/../snmp/snmpgen $(srcdir)/pushstats.snmp
211 @@ -183,179 +183,179 @@
212 mupdate_err.h: mupdate_err.c
215 -idled: idled.o mutex_fake.o libimap.a $(DEPLIBS)
216 - $(CC) $(LDFLAGS) -o idled \
217 - idled.o mutex_fake.o libimap.a $(DEPLIBS) $(LIBS)
219 -lmtpd: lmtpd.o proxy.o $(LMTPOBJS) $(SIEVE_OBJS) mutex_fake.o \
220 - libimap.a $(SIEVE_LIBS) $(DEPLIBS) $(SERVICE)
221 - $(CC) $(LDFLAGS) -o lmtpd \
222 - $(SERVICE) lmtpd.o proxy.o $(LMTPOBJS) $(SIEVE_OBJS) \
223 - mutex_fake.o libimap.a $(SIEVE_LIBS) $(DEPLIBS) $(LIBS) $(LIB_WRAP)
225 -lmtpd.pure: lmtpd.o proxy.o $(LMTPOBJS) $(SIEVE_OBJS) \
226 - mutex_fake.o libimap.a $(SIEVE_LIBS) $(DEPLIBS) $(SERVICE)
227 - $(PURIFY) $(PUREOPT) $(CC) $(LDFLAGS) -o lmtpd.pure \
228 - $(SERVICE) lmtpd.o proxy.o $(LMTPOBJS) $(SIEVE_OBJS) \
229 - mutex_fake.o libimap.a $(SIEVE_LIBS) $(DEPLIBS) $(LIBS) $(LIB_WRAP)
231 -imapd: $(IMAPDOBJS) mutex_fake.o libimap.a $(DEPLIBS) $(SERVICE)
232 - $(CC) $(LDFLAGS) -o imapd \
233 - $(SERVICE) $(IMAPDOBJS) mutex_fake.o \
234 - libimap.a $(DEPLIBS) $(LIBS) $(LIB_WRAP)
236 -imapd.pure: $(IMAPDOBJS) mutex_fake.o libimap.a $(DEPLIBS) $(SERVICE)
237 - $(PURIFY) $(PUREOPT) $(CC) $(LDFLAGS) -o imapd.pure \
238 - $(SERVICE) $(IMAPDOBJS) mutex_fake.o libimap.a \
239 +idled: idled.lo mutex_fake.lo libimap.la $(DEPLIBS)
240 + $(LIBTOOL) --mode=link --tag=CC $(CC) $(LDFLAGS) -o idled \
241 + idled.lo mutex_fake.lo libimap.la $(DEPLIBS) $(LIBS)
243 +lmtpd: lmtpd.lo proxy.lo $(LMTPOBJS) $(SIEVE_OBJS) mutex_fake.lo \
244 + libimap.la $(SIEVE_LIBS) $(DEPLIBS) $(SERVICE)
245 + $(LIBTOOL) --mode=link --tag=CC $(CC) $(LDFLAGS) -o lmtpd \
246 + $(SERVICE) lmtpd.lo proxy.lo $(LMTPOBJS) $(SIEVE_OBJS) \
247 + mutex_fake.lo libimap.la $(SIEVE_LIBS) $(DEPLIBS) $(LIBS) $(LIB_WRAP)
249 +lmtpd.pure: lmtpd.lo proxy.lo $(LMTPOBJS) $(SIEVE_OBJS) \
250 + mutex_fake.lo libimap.la $(SIEVE_LIBS) $(DEPLIBS) $(SERVICE)
251 + $(PURIFY) $(PUREOPT) $(LIBTOOL) --mode=link --tag=CC $(CC) $(LDFLAGS) -o lmtpd.pure \
252 + $(SERVICE) lmtpd.lo proxy.lo $(LMTPOBJS) $(SIEVE_OBJS) \
253 + mutex_fake.lo libimap.la $(SIEVE_LIBS) $(DEPLIBS) $(LIBS) $(LIB_WRAP)
255 +imapd: $(IMAPDOBJS) mutex_fake.lo libimap.la $(DEPLIBS) $(SERVICE)
256 + $(LIBTOOL) --mode=link --tag=CC $(CC) $(LDFLAGS) -o imapd \
257 + $(SERVICE) $(IMAPDOBJS) mutex_fake.lo \
258 + libimap.la $(DEPLIBS) $(LIBS) $(LIB_WRAP)
260 +imapd.pure: $(IMAPDOBJS) mutex_fake.lo libimap.la $(DEPLIBS) $(SERVICE)
261 + $(PURIFY) $(PUREOPT) $(LIBTOOL) --mode=link --tag=CC $(CC) $(LDFLAGS) -o imapd.pure \
262 + $(SERVICE) $(IMAPDOBJS) mutex_fake.lo libimap.la \
263 $(DEPLIBS) $(LIBS) $(LIB_WRAP)
265 -imapd.quant: $(IMAPDOBJS) mutex_fake.o libimap.a $(DEPLIBS) $(SERVICE)
266 - $(QUANTIFY) $(QUANTOPT) $(CC) $(LDFLAGS) -o imapd.quant \
267 - $(SERVICE) $(IMAPDOBJS) mutex_fake.o libimap.a \
268 +imapd.quant: $(IMAPDOBJS) mutex_fake.lo libimap.la $(DEPLIBS) $(SERVICE)
269 + $(QUANTIFY) $(QUANTOPT) $(LIBTOOL) --mode=link --tag=CC $(CC) $(LDFLAGS) -o imapd.quant \
270 + $(SERVICE) $(IMAPDOBJS) mutex_fake.lo libimap.la \
271 $(DEPLIBS) $(LIBS) $(LIB_WRAP)
273 -mupdate: mupdate.o mupdate-slave.o mupdate-client.o mutex_pthread.o tls.o \
274 - libimap.a $(DEPLIBS)
275 - $(CC) $(LDFLAGS) -o mupdate \
276 - $(SERVICETHREAD) mupdate.o mupdate-slave.o mupdate-client.o \
277 - mutex_pthread.o tls.o libimap.a \
278 +mupdate: mupdate.lo mupdate-slave.lo mupdate-client.lo mutex_pthread.lo tls.lo \
279 + libimap.la $(DEPLIBS)
280 + $(LIBTOOL) --mode=link --tag=CC $(CC) $(LDFLAGS) -o mupdate \
281 + $(SERVICETHREAD) mupdate.lo mupdate-slave.lo mupdate-client.lo \
282 + mutex_pthread.lo tls.lo libimap.la \
283 $(DEPLIBS) $(LIBS) $(LIB_WRAP) -lpthread
285 -mupdate.pure: mupdate.o mupdate-slave.o mupdate-client.o mutex_pthread.o \
286 - libimap.a $(DEPLIBS)
287 - $(PURIFY) $(PUREOPT) $(CC) $(LDFLAGS) -o mupdate.pure \
288 - $(SERVICETHREAD) mupdate.o mupdate-slave.o mupdate-client.o \
289 - mutex_pthread.o libimap.a $(DEPLIBS) $(LIBS) $(LIB_WRAP) -lpthread
290 +mupdate.pure: mupdate.lo mupdate-slave.lo mupdate-client.lo mutex_pthread.lo \
291 + libimap.la $(DEPLIBS)
292 + $(PURIFY) $(PUREOPT) $(LIBTOOL) --mode=link --tag=CC $(CC) $(LDFLAGS) -o mupdate.pure \
293 + $(SERVICETHREAD) mupdate.lo mupdate-slave.lo mupdate-client.lo \
294 + mutex_pthread.lo libimap.la $(DEPLIBS) $(LIBS) $(LIB_WRAP) -lpthread
296 -pop3d: pop3d.o proxy.o backend.o tls.o mutex_fake.o libimap.a \
297 +pop3d: pop3d.lo proxy.lo backend.lo tls.lo mutex_fake.lo libimap.la \
298 $(DEPLIBS) $(SERVICE)
299 - $(CC) $(LDFLAGS) -o pop3d pop3d.o proxy.o backend.o tls.o $(SERVICE) \
300 - mutex_fake.o libimap.a $(DEPLIBS) $(LIBS) $(LIB_WRAP)
301 + $(LIBTOOL) --mode=link --tag=CC $(CC) $(LDFLAGS) -o pop3d pop3d.lo proxy.lo backend.lo tls.lo $(SERVICE) \
302 + mutex_fake.lo libimap.la $(DEPLIBS) $(LIBS) $(LIB_WRAP)
304 -nntpd: nntpd.o proxy.o backend.o index.o smtpclient.o spool.o tls.o \
305 - mutex_fake.o nntp_err.o libimap.a $(DEPLIBS) $(SERVICE)
306 - $(CC) $(LDFLAGS) -o nntpd nntpd.o proxy.o backend.o index.o spool.o \
307 - smtpclient.o tls.o $(SERVICE) mutex_fake.o nntp_err.o \
308 - libimap.a $(DEPLIBS) $(LIBS) $(LIB_WRAP)
309 +nntpd: nntpd.lo proxy.lo backend.lo index.lo smtpclient.lo spool.lo tls.lo \
310 + mutex_fake.lo nntp_err.lo libimap.la $(DEPLIBS) $(SERVICE)
311 + $(LIBTOOL) --mode=link --tag=CC $(CC) $(LDFLAGS) -o nntpd nntpd.lo proxy.lo backend.lo index.lo spool.lo \
312 + smtpclient.lo tls.lo $(SERVICE) mutex_fake.lo nntp_err.lo \
313 + libimap.la $(DEPLIBS) $(LIBS) $(LIB_WRAP)
315 -fud: fud.o libimap.a mutex_fake.o $(DEPLIBS) $(SERVICE)
316 - $(CC) $(LDFLAGS) -o fud $(SERVICE) fud.o mutex_fake.o libimap.a \
317 +fud: fud.lo libimap.la mutex_fake.lo $(DEPLIBS) $(SERVICE)
318 + $(LIBTOOL) --mode=link --tag=CC $(CC) $(LDFLAGS) -o fud $(SERVICE) fud.lo mutex_fake.lo libimap.la \
319 $(DEPLIBS) $(LIBS) $(LIB_WRAP)
321 -smmapd: smmapd.o libimap.a mutex_fake.o $(DEPLIBS) $(SERVICE)
322 - $(CC) $(LDFLAGS) -o smmapd $(SERVICE) smmapd.o mutex_fake.o libimap.a \
323 +smmapd: smmapd.lo libimap.la mutex_fake.lo $(DEPLIBS) $(SERVICE)
324 + $(LIBTOOL) --mode=link --tag=CC $(CC) $(LDFLAGS) -o smmapd $(SERVICE) smmapd.lo mutex_fake.lo libimap.la \
325 $(DEPLIBS) $(LIBS) $(LIB_WRAP)
327 -sync_server: sync_server.o sync_support.o sync_commit.o \
328 - imapparse.o tls.o libimap.a mutex_fake.o $(DEPLIBS) $(SERVICE)
329 - $(CC) $(LDFLAGS) -o \
330 - sync_server sync_server.o sync_support.o sync_commit.o \
331 - imapparse.o tls.o $(SERVICE) libimap.a mutex_fake.o \
332 +sync_server: sync_server.lo sync_support.lo sync_commit.lo \
333 + imapparse.lo tls.lo libimap.la mutex_fake.lo $(DEPLIBS) $(SERVICE)
334 + $(LIBTOOL) --mode=link --tag=CC $(CC) $(LDFLAGS) -o \
335 + sync_server sync_server.lo sync_support.lo sync_commit.lo \
336 + imapparse.lo tls.lo $(SERVICE) libimap.la mutex_fake.lo \
337 $(DEPLIBS) $(LIBS) $(LIB_WRAP)
339 ### Command Line Utilities
340 -arbitron: arbitron.o $(CLIOBJS) libimap.a $(DEPLIBS)
341 - $(CC) $(LDFLAGS) -o arbitron arbitron.o $(CLIOBJS) \
342 - libimap.a $(DEPLIBS) $(LIBS)
344 -cyr_dbtool: cyr_dbtool.o mutex_fake.o libimap.a $(DEPLIBS)
345 - $(CC) $(LDFLAGS) -o cyr_dbtool cyr_dbtool.o $(CLIOBJS) \
346 - libimap.a $(DEPLIBS) $(LIBS)
348 -cyr_synclog: cyr_synclog.o mutex_fake.o libimap.a $(DEPLIBS)
349 - $(CC) $(LDFLAGS) -o cyr_synclog cyr_synclog.o $(CLIOBJS) \
350 - libimap.a $(DEPLIBS) $(LIBS)
352 -cvt_cyrusdb: cvt_cyrusdb.o mutex_fake.o libimap.a $(DEPLIBS)
353 - $(CC) $(LDFLAGS) -o cvt_cyrusdb cvt_cyrusdb.o $(CLIOBJS) \
354 - libimap.a $(DEPLIBS) $(LIBS)
356 -chk_cyrus: chk_cyrus.o mutex_fake.o libimap.a $(DEPLIBS)
357 - $(CC) $(LDFLAGS) -o chk_cyrus chk_cyrus.o $(CLIOBJS) \
358 - libimap.a $(DEPLIBS) $(LIBS)
360 -deliver: deliver.o $(LMTPOBJS) proxy.o mutex_fake.o libimap.a $(DEPLIBS)
361 - $(CC) $(LDFLAGS) -o deliver deliver.o $(LMTPOBJS) proxy.o \
362 - mutex_fake.o libimap.a $(DEPLIBS) $(LIBS)
364 -ctl_deliver: ctl_deliver.o $(CLIOBJS) libimap.a $(DEPLIBS)
365 - $(CC) $(LDFLAGS) -o \
366 - $@ ctl_deliver.o $(CLIOBJS) libimap.a $(DEPLIBS) $(LIBS)
368 -ctl_mboxlist: ctl_mboxlist.o mupdate-client.o $(CLIOBJS) libimap.a $(DEPLIBS)
369 - $(CC) $(LDFLAGS) -o $@ ctl_mboxlist.o mupdate-client.o $(CLIOBJS) \
370 - libimap.a $(DEPLIBS) $(LIBS)
372 -ctl_cyrusdb: ctl_cyrusdb.o $(CLIOBJS) libimap.a $(DEPLIBS)
373 - $(CC) $(LDFLAGS) -o \
374 - $@ ctl_cyrusdb.o $(CLIOBJS) libimap.a $(DEPLIBS) $(LIBS)
376 -cyr_expire: cyr_expire.o $(CLIOBJS) libimap.a $(DEPLIBS)
377 - $(CC) $(LDFLAGS) -o $@ cyr_expire.o $(CLIOBJS) \
378 - libimap.a $(DEPLIBS) $(LIBS)
380 -fetchnews: fetchnews.o $(CLIOBJS) libimap.a $(DEPLIBS)
381 - $(CC) $(LDFLAGS) -o \
382 - $@ fetchnews.o $(CLIOBJS) libimap.a $(DEPLIBS) $(LIBS)
384 -squatter: squatter.o index.o squat_build.o $(CLIOBJS) libimap.a $(DEPLIBS)
385 - $(CC) $(LDFLAGS) -o squatter squatter.o index.o squat_build.o \
386 - $(CLIOBJS) libimap.a $(DEPLIBS) $(LIBS)
387 +arbitron: arbitron.lo $(CLIOBJS) libimap.la $(DEPLIBS)
388 + $(LIBTOOL) --mode=link --tag=CC $(CC) $(LDFLAGS) -o arbitron arbitron.lo $(CLIOBJS) \
389 + libimap.la $(DEPLIBS) $(LIBS)
391 +cyr_dbtool: cyr_dbtool.lo mutex_fake.lo libimap.la $(DEPLIBS)
392 + $(LIBTOOL) --mode=link --tag=CC $(CC) $(LDFLAGS) -o cyr_dbtool cyr_dbtool.lo $(CLIOBJS) \
393 + libimap.la $(DEPLIBS) $(LIBS)
395 +cyr_synclog: cyr_synclog.lo mutex_fake.lo libimap.la $(DEPLIBS)
396 + $(LIBTOOL) --mode=link --tag=CC $(CC) $(LDFLAGS) -o cyr_synclog cyr_synclog.lo $(CLIOBJS) \
397 + libimap.la $(DEPLIBS) $(LIBS)
399 +cvt_cyrusdb: cvt_cyrusdb.lo mutex_fake.lo libimap.la $(DEPLIBS)
400 + $(LIBTOOL) --mode=link --tag=CC $(CC) $(LDFLAGS) -o cvt_cyrusdb cvt_cyrusdb.lo $(CLIOBJS) \
401 + libimap.la $(DEPLIBS) $(LIBS)
403 +chk_cyrus: chk_cyrus.lo mutex_fake.lo libimap.la $(DEPLIBS)
404 + $(LIBTOOL) --mode=link --tag=CC $(CC) $(LDFLAGS) -o chk_cyrus chk_cyrus.lo $(CLIOBJS) \
405 + libimap.la $(DEPLIBS) $(LIBS)
407 +deliver: deliver.lo $(LMTPOBJS) proxy.lo mutex_fake.lo libimap.la $(DEPLIBS)
408 + $(LIBTOOL) --mode=link --tag=CC $(CC) $(LDFLAGS) -o deliver deliver.lo $(LMTPOBJS) proxy.lo \
409 + mutex_fake.lo libimap.la $(DEPLIBS) $(LIBS)
411 +ctl_deliver: ctl_deliver.lo $(CLIOBJS) libimap.la $(DEPLIBS)
412 + $(LIBTOOL) --mode=link --tag=CC $(CC) $(LDFLAGS) -o \
413 + $@ ctl_deliver.lo $(CLIOBJS) libimap.la $(DEPLIBS) $(LIBS)
415 +ctl_mboxlist: ctl_mboxlist.lo mupdate-client.lo $(CLIOBJS) libimap.la $(DEPLIBS)
416 + $(LIBTOOL) --mode=link --tag=CC $(CC) $(LDFLAGS) -o $@ ctl_mboxlist.lo mupdate-client.lo $(CLIOBJS) \
417 + libimap.la $(DEPLIBS) $(LIBS)
419 +ctl_cyrusdb: ctl_cyrusdb.lo $(CLIOBJS) libimap.la $(DEPLIBS)
420 + $(LIBTOOL) --mode=link --tag=CC $(CC) $(LDFLAGS) -o \
421 + $@ ctl_cyrusdb.lo $(CLIOBJS) libimap.la $(DEPLIBS) $(LIBS)
423 +cyr_expire: cyr_expire.lo $(CLIOBJS) libimap.la $(DEPLIBS)
424 + $(LIBTOOL) --mode=link --tag=CC $(CC) $(LDFLAGS) -o $@ cyr_expire.lo $(CLIOBJS) \
425 + libimap.la $(DEPLIBS) $(LIBS)
427 +fetchnews: fetchnews.lo $(CLIOBJS) libimap.la $(DEPLIBS)
428 + $(LIBTOOL) --mode=link --tag=CC $(CC) $(LDFLAGS) -o \
429 + $@ fetchnews.lo $(CLIOBJS) libimap.la $(DEPLIBS) $(LIBS)
431 +squatter: squatter.lo index.lo squat_build.lo $(CLIOBJS) libimap.la $(DEPLIBS)
432 + $(LIBTOOL) --mode=link --tag=CC $(CC) $(LDFLAGS) -o squatter squatter.lo index.lo squat_build.lo \
433 + $(CLIOBJS) libimap.la $(DEPLIBS) $(LIBS)
435 -mbpath: mbpath.o $(CLIOBJS) libimap.a $(DEPLIBS)
436 - $(CC) $(LDFLAGS) -o mbpath mbpath.o $(CLIOBJS) libimap.a \
437 +mbpath: mbpath.lo $(CLIOBJS) libimap.la $(DEPLIBS)
438 + $(LIBTOOL) --mode=link --tag=CC $(CC) $(LDFLAGS) -o mbpath mbpath.lo $(CLIOBJS) libimap.la \
441 -ipurge: ipurge.o $(CLIOBJS) libimap.a $(DEPLIBS)
442 - $(CC) $(LDFLAGS) -o ipurge ipurge.o $(CLIOBJS) \
443 - libimap.a $(DEPLIBS) $(LIBS)
445 -cyrdump: cyrdump.o index.o $(CLIOBJS) libimap.a $(DEPLIBS)
446 - $(CC) $(LDFLAGS) -o cyrdump cyrdump.o index.o $(CLIOBJS) \
447 - libimap.a $(DEPLIBS) $(LIBS)
449 -mbexamine: mbexamine.o $(CLIOBJS) libimap.a $(DEPLIBS)
450 - $(CC) $(LDFLAGS) -o \
451 - mbexamine mbexamine.o $(CLIOBJS) libimap.a $(DEPLIBS) $(LIBS)
453 -reconstruct: reconstruct.o $(CLIOBJS) libimap.a $(DEPLIBS)
454 - $(CC) $(LDFLAGS) -o \
455 - reconstruct reconstruct.o $(CLIOBJS) libimap.a $(DEPLIBS) $(LIBS)
457 -quota: quota.o $(CLIOBJS) libimap.a $(DEPLIBS)
458 - $(CC) $(LDFLAGS) -o quota quota.o $(CLIOBJS) \
459 - libimap.a $(DEPLIBS) $(LIBS)
461 -tls_prune: tls_prune.o tls.o $(CLIOBJS) libimap.a $(DEPLIBS)
462 - $(CC) $(LDFLAGS) -o \
463 - $@ tls_prune.o tls.o $(CLIOBJS) libimap.a $(DEPLIBS) $(LIBS)
465 -unexpunge: unexpunge.o $(CLIOBJS) libimap.a $(DEPLIBS)
466 - $(CC) $(LDFLAGS) -o $@ unexpunge.o $(CLIOBJS) \
467 - libimap.a $(DEPLIBS) $(LIBS)
469 -make_md5: make_md5.o libimap.a mutex_fake.o $(DEPLIBS)
470 - $(CC) $(LDFLAGS) -o make_md5 make_md5.o libimap.a mutex_fake.o $(DEPLIBS) $(LIBS)
472 -make_sha1: make_sha1.o libimap.a mutex_fake.o $(DEPLIBS)
473 - $(CC) $(LDFLAGS) -o make_sha1 make_sha1.o libimap.a mutex_fake.o $(DEPLIBS) $(LIBS)
475 -sync_client: sync_client.o sync_support.o \
476 - backend.o tls.o imapparse.o libimap.a mutex_fake.o $(DEPLIBS)
477 - $(CC) $(LDFLAGS) -o \
478 - sync_client sync_client.o sync_support.o \
479 - backend.o tls.o imapparse.o libimap.a mutex_fake.o $(DEPLIBS) $(LIBS)
481 -sync_reset: sync_reset.o sync_support.o sync_commit.o \
482 - libimap.a mutex_fake.o $(DEPLIBS)
483 - $(CC) $(LDFLAGS) -o \
484 - sync_reset sync_reset.o sync_support.o sync_commit.o \
485 - libimap.a mutex_fake.o $(DEPLIBS) $(LIBS)
486 +ipurge: ipurge.lo $(CLIOBJS) libimap.la $(DEPLIBS)
487 + $(LIBTOOL) --mode=link --tag=CC $(CC) $(LDFLAGS) -o ipurge ipurge.lo $(CLIOBJS) \
488 + libimap.la $(DEPLIBS) $(LIBS)
490 +cyrdump: cyrdump.lo index.lo $(CLIOBJS) libimap.la $(DEPLIBS)
491 + $(LIBTOOL) --mode=link --tag=CC $(CC) $(LDFLAGS) -o cyrdump cyrdump.lo index.lo $(CLIOBJS) \
492 + libimap.la $(DEPLIBS) $(LIBS)
494 +mbexamine: mbexamine.lo $(CLIOBJS) libimap.la $(DEPLIBS)
495 + $(LIBTOOL) --mode=link --tag=CC $(CC) $(LDFLAGS) -o \
496 + mbexamine mbexamine.lo $(CLIOBJS) libimap.la $(DEPLIBS) $(LIBS)
498 +reconstruct: reconstruct.lo $(CLIOBJS) libimap.la $(DEPLIBS)
499 + $(LIBTOOL) --mode=link --tag=CC $(CC) $(LDFLAGS) -o \
500 + reconstruct reconstruct.lo $(CLIOBJS) libimap.la $(DEPLIBS) $(LIBS)
502 +quota: quota.lo $(CLIOBJS) libimap.la $(DEPLIBS)
503 + $(LIBTOOL) --mode=link --tag=CC $(CC) $(LDFLAGS) -o quota quota.lo $(CLIOBJS) \
504 + libimap.la $(DEPLIBS) $(LIBS)
506 +tls_prune: tls_prune.lo tls.lo $(CLIOBJS) libimap.la $(DEPLIBS)
507 + $(LIBTOOL) --mode=link --tag=CC $(CC) $(LDFLAGS) -o \
508 + $@ tls_prune.lo tls.lo $(CLIOBJS) libimap.la $(DEPLIBS) $(LIBS)
510 +unexpunge: unexpunge.lo $(CLIOBJS) libimap.la $(DEPLIBS)
511 + $(LIBTOOL) --mode=link --tag=CC $(CC) $(LDFLAGS) -o $@ unexpunge.lo $(CLIOBJS) \
512 + libimap.la $(DEPLIBS) $(LIBS)
514 +make_md5: make_md5.lo libimap.la mutex_fake.lo $(DEPLIBS)
515 + $(LIBTOOL) --mode=link --tag=CC $(CC) $(LDFLAGS) -o make_md5 make_md5.lo libimap.la mutex_fake.lo $(DEPLIBS) $(LIBS)
517 +make_sha1: make_sha1.lo libimap.la mutex_fake.lo $(DEPLIBS)
518 + $(LIBTOOL) --mode=link --tag=CC $(CC) $(LDFLAGS) -o make_sha1 make_sha1.lo libimap.la mutex_fake.lo $(DEPLIBS) $(LIBS)
520 +sync_client: sync_client.lo sync_support.lo \
521 + backend.lo tls.lo imapparse.lo libimap.la mutex_fake.lo $(DEPLIBS)
522 + $(LIBTOOL) --mode=link --tag=CC $(CC) $(LDFLAGS) -o \
523 + sync_client sync_client.lo sync_support.lo \
524 + backend.lo tls.lo imapparse.lo libimap.la mutex_fake.lo $(DEPLIBS) $(LIBS)
526 +sync_reset: sync_reset.lo sync_support.lo sync_commit.lo \
527 + libimap.la mutex_fake.lo $(DEPLIBS)
528 + $(LIBTOOL) --mode=link --tag=CC $(CC) $(LDFLAGS) -o \
529 + sync_reset sync_reset.lo sync_support.lo sync_commit.lo \
530 + libimap.la mutex_fake.lo $(DEPLIBS) $(LIBS)
532 ### Other Misc Targets
535 - rm -f *.o *.a Makefile.bak makedepend.log \
536 + rm -rf .libs *.o *.lo *.a *.la Makefile.bak makedepend.log \
537 $(BUILTSOURCES) $(PROGS) $(SUIDPROGS)
540 --- cyrus-imapd-2.3.12p2.shared/imtest/Makefile.in 2008-09-23 21:44:50.599845178 +0300
541 +++ cyrus-imapd-2.3.12p2/imtest/Makefile.in 2008-09-23 22:10:57.494451435 +0300
547 +top_builddir = @top_builddir@
549 DEFS = @DEFS@ @LOCALDEFS@
550 CPPFLAGS = -I.. -I$(srcdir)/../lib @COM_ERR_CPPFLAGS@ @CPPFLAGS@ @SASLFLAGS@
552 IMAP_LIBS = @IMAP_LIBS@ @LIB_RT@
553 -DEPLIBS = ../lib/libcyrus.a ../lib/libcyrus_min.a @DEPLIBS@
554 +DEPLIBS = ../lib/libcyrus.la ../lib/libcyrus_min.la @DEPLIBS@
557 LDFLAGS = @LDFLAGS@ @COM_ERR_LDFLAGS@
562 - $(INSTALL) -s -m 755 imtest $(DESTDIR)$(exec_prefix)/bin
563 + $(LIBTOOL) --mode=install $(INSTALL) imtest $(DESTDIR)$(exec_prefix)/bin
564 ln -f $(DESTDIR)$(exec_prefix)/bin/imtest $(DESTDIR)$(exec_prefix)/bin/pop3test
565 ln -f $(DESTDIR)$(exec_prefix)/bin/imtest $(DESTDIR)$(exec_prefix)/bin/nntptest
566 ln -f $(DESTDIR)$(exec_prefix)/bin/imtest $(DESTDIR)$(exec_prefix)/bin/lmtptest
568 ln -f $(DESTDIR)$(exec_prefix)/bin/imtest $(DESTDIR)$(exec_prefix)/bin/sivtest
569 ln -f $(DESTDIR)$(exec_prefix)/bin/imtest $(DESTDIR)$(exec_prefix)/bin/synctest
572 - $(CC) -c $(CPPFLAGS) $(DEFS) $(CFLAGS) $<
574 + $(LIBTOOL) --mode=compile --tag=CC $(CC) -c $(CPPFLAGS) $(DEFS) $(CFLAGS) $<
576 -imtest: imtest.o $(DEPLIBS)
577 - $(CC) $(LDFLAGS) -o imtest imtest.o $(DEPLIBS) $(IMAP_LIBS)
578 +imtest: imtest.lo $(DEPLIBS)
579 + $(LIBTOOL) --mode=link --tag=CC $(CC) $(LDFLAGS) -o imtest imtest.lo $(DEPLIBS) $(IMAP_LIBS)
581 -imtest.pure: imtest.o $(DEPLIBS)
582 - $(PURIFY) $(PUREOPT) $(CC) $(LDFLAGS) -o imtest $(OBJS) $(DEPLIBS) $(LIBS) $(IMAP_LIBS)
583 +imtest.pure: imtest.lo $(DEPLIBS)
584 + $(PURIFY) $(PUREOPT) $(LIBTOOL) --mode=link --tag=CC $(CC) $(LDFLAGS) -o imtest $(OBJS) $(DEPLIBS) $(LIBS) $(IMAP_LIBS)
587 - rm -f *.o Makefile.bak makedepend.log imtest
588 + rm -rf .libs *.o *.lo Makefile.bak makedepend.log imtest
592 --- cyrus-imapd-2.3.12p2/imtest/imtest.c 2008-04-11 15:35:18.000000000 +0300
593 +++ cyrus-imapd-2.3.12p2.shared/imtest/imtest.c 2008-09-23 21:44:50.595844947 +0300
598 +/* config.c stuff */
599 +const int config_need_data = 0;
601 int mysasl_config(void *context __attribute__((unused)),
602 const char *plugin_name,
604 --- cyrus-imapd-2.3.12p2/installsieve/Makefile.in 2008-03-24 22:33:11.000000000 +0200
605 +++ cyrus-imapd-2.3.12p2.shared/installsieve/Makefile.in 2008-09-23 21:44:50.591844716 +0300
611 +top_builddir = @top_builddir@
614 CPPFLAGS = -I. -I$(srcdir) -I$(srcdir)/../lib @CPPFLAGS@ @SASLFLAGS@
617 IMAP_LIBS = @IMAP_LIBS@
619 -DEPLIBS= ../lib/libcyrus.a @DEPLIBS@
620 +DEPLIBS= ../lib/libcyrus.la @DEPLIBS@
623 exec_prefix = @exec_prefix@
628 - $(INSTALL) -s -m 755 installsieve $(DESTDIR)$(exec_prefix)/bin
629 + $(LIBTOOL) --mode=install $(INSTALL) installsieve $(DESTDIR)$(exec_prefix)/bin
631 -OBJS=lex.o mystring.o request.o isieve.o
632 +OBJS=lex.lo mystring.lo request.lo isieve.lo
634 -libinstallsieve.a: $(OBJS)
635 - rm -f libinstallsieve.a
636 - ar cr libinstallsieve.a $(OBJS)
637 - $(RANLIB) libinstallsieve.a
638 +libinstallsieve.la: $(OBJS)
639 + $(LIBTOOL) --mode=link --tag=CC $(CC) -o libinstallsieve.la $(OBJS)
641 -installsieve: libinstallsieve.a installscript.o $(DEPLIBS)
642 - $(CC) $(LDFLAGS) -o installsieve libinstallsieve.a installscript.o $(DEPLIBS) $(IMAP_LIBS)
643 +installsieve: libinstallsieve.la installscript.lo $(DEPLIBS)
644 + $(LIBTOOL) --mode=link --tag=CC $(CC) $(LDFLAGS) -o installsieve libinstallsieve.la installscript.lo $(DEPLIBS) $(IMAP_LIBS)
647 - rm -f *.o *.a Makefile.bak makedepend.log
648 + rm -rf .libs *.o *.lo *.a *.la Makefile.bak makedepend.log
651 rm -f Makefile installsieve
654 ${MAKEDEPEND} $(CPPFLAGS) $(DEFS) -I$(srcdir) $(CFLAGS) *.c $(srcdir)/*.c 1>makedepend.log 2>&1
657 - $(CC) -c $(CPPFLAGS) $(DEFS) -I$(srcdir) -I. $(CFLAGS) \
659 + $(LIBTOOL) --mode=compile --tag=CC $(CC) -c $(CPPFLAGS) $(DEFS) -I$(srcdir) -I. $(CFLAGS) \
663 # DO NOT DELETE THIS LINE -- make depend depends on it.
664 --- cyrus-imapd-2.3.12p2.shared/lib/Makefile.in 2008-09-23 21:44:50.599845178 +0300
665 +++ cyrus-imapd-2.3.12p2/lib/Makefile.in 2008-09-23 21:52:42.531135729 +0300
669 # Authorization namespace.
670 -AUTH=auth.o auth_krb.o auth_unix.o auth_krb5.o auth_pts.o
671 +AUTH=auth.lo auth_krb.lo auth_unix.lo auth_krb5.lo auth_pts.lo
673 # ACL interpretation. Only one choice for now:
678 top_srcdir = @top_srcdir@
684 +top_builddir = @top_builddir@
686 DEFS = @DEFS@ @LOCALDEFS@
687 CPPFLAGS = -I.. @CPPFLAGS@ @COM_ERR_CPPFLAGS@ @SASLFLAGS@
690 exec_prefix = @exec_prefix@
691 cyrus_prefix = @cyrus_prefix@
697 $(srcdir)/libcyr_cfg.h $(srcdir)/byteorder64.h \
698 $(srcdir)/md5.h $(srcdir)/hmac-md5.h
700 -LIBCYR_OBJS = acl.o bsearch.o charset.o glob.o retry.o util.o \
701 - libcyr_cfg.o mkgmtime.o prot.o parseaddr.o imclient.o imparse.o \
702 - lsort.o stristr.o rfc822date.o cyrusdb.o strhash.o \
703 - chartable.o imapurl.o nonblock_@WITH_NONBLOCK@.o lock_@WITH_LOCK@.o \
704 - gmtoff_@WITH_GMTOFF@.o map_@WITH_MAP@.o $(ACL) $(AUTH) \
705 +LIBCYR_OBJS = acl.lo bsearch.lo charset.lo glob.lo retry.lo util.lo \
706 + libcyr_cfg.lo mkgmtime.lo prot.lo parseaddr.lo imclient.lo imparse.lo \
707 + lsort.lo stristr.lo rfc822date.lo cyrusdb.lo strhash.lo \
708 + chartable.lo imapurl.lo nonblock_@WITH_NONBLOCK@.lo lock_@WITH_LOCK@.lo \
709 + gmtoff_@WITH_GMTOFF@.lo map_@WITH_MAP@.lo $(ACL) $(AUTH) \
710 @LIBOBJS@ @CYRUSDB_OBJS@ @MD5OBJ@ \
711 - iptostring.o xmalloc.o wildmat.o byteorder64.o \
712 - xstrlcat.o xstrlcpy.o
713 + iptostring.lo xmalloc.lo wildmat.lo byteorder64.lo \
714 + xstrlcat.lo xstrlcpy.lo
716 LIBCYRM_HDRS = $(srcdir)/hash.h $(srcdir)/mpool.h $(srcdir)/xmalloc.h \
717 $(srcdir)/xstrlcat.h $(srcdir)/xstrlcpy.h $(srcdir)/util.h \
718 $(srcdir)/strhash.h $(srcdir)/libconfig.h $(srcdir)/assert.h \
720 -LIBCYRM_OBJS = libconfig.o imapopts.o hash.o mpool.o xmalloc.o strhash.o \
721 - xstrlcat.o xstrlcpy.o assert.o util.o @IPV6_OBJS@
722 +LIBCYRM_OBJS = libconfig.lo imapopts.lo hash.lo mpool.lo xmalloc.lo strhash.lo \
723 + xstrlcat.lo xstrlcpy.lo assert.lo util.lo @IPV6_OBJS@
725 -all: $(BUILTSOURCES) libcyrus_min.a libcyrus.a
726 +all: $(BUILTSOURCES) libcyrus_min.la libcyrus.la
729 $(srcdir)/../install-sh -d $(DESTDIR)$(libdir)
730 - $(INSTALL) -m 644 libcyrus.a $(DESTDIR)$(libdir)
731 - $(INSTALL) -m 644 libcyrus_min.a $(DESTDIR)$(libdir)
732 - $(RANLIB) $(DESTDIR)$(libdir)/libcyrus.a
733 + $(LIBTOOL) --mode=install $(INSTALL) -m 644 libcyrus.la $(DESTDIR)$(libdir)
734 + $(LIBTOOL) --mode=install $(INSTALL) -m 644 libcyrus_min.la $(DESTDIR)$(libdir)
735 for file in $(LIBCYR_HDRS); \
737 $(INSTALL) -m 644 $$file $(DESTDIR)$(prefix)/include/cyrus || exit 1; \
738 @@ -122,19 +124,15 @@
739 $(INSTALL) -m 644 $$file $(DESTDIR)$(prefix)/include/cyrus || exit 1; \
743 - $(CC) -c $(CPPFLAGS) $(DEFS) $(CFLAGS) \
745 + $(LIBTOOL) --mode=compile --tag=CC $(CC) -c $(CPPFLAGS) $(DEFS) $(CFLAGS) \
748 -libcyrus.a: $(LIBCYR_OBJS)
750 - ar cr libcyrus.a $(LIBCYR_OBJS)
751 - $(RANLIB) libcyrus.a
753 -libcyrus_min.a: $(LIBCYRM_OBJS)
754 - rm -f libcyrus_min.a
755 - ar cr libcyrus_min.a $(LIBCYRM_OBJS)
756 - $(RANLIB) libcyrus_min.a
757 +libcyrus.la: $(LIBCYR_OBJS) libcyrus_min.la
758 + $(LIBTOOL) --mode=link --tag=CC $(CC) -o libcyrus.la $(LIBCYR_OBJS) libcyrus_min.la @LIBS@ @LIB_SASL@ -rpath $(libdir)
760 +libcyrus_min.la: $(LIBCYRM_OBJS)
761 + $(LIBTOOL) --mode=link --tag=CC $(CC) -o libcyrus_min.la $(LIBCYRM_OBJS) @IMAP_COM_ERR_LIBS@ -rpath $(libdir)
763 imapopts.c: imapoptions $(srcdir)/../tools/config2header
764 $(srcdir)/../tools/config2header CC="$(CC)" $(srcdir)/imapopts.c $(srcdir)/imapopts.h < $(srcdir)/imapoptions
765 @@ -154,11 +152,11 @@
766 # ./mkchartable -m $(srcdir)/charset/unicode.map $(srcdir)/charset/*.t >x-chartables.h
767 # mv x-chartables.h chartables.h
769 -mkchartable: mkchartable.o xstrlcpy.o xstrlcat.o xmalloc.o assert.o
770 - $(CC) $(LDFLAGS) -o mkchartable mkchartable.o xstrlcpy.o xstrlcat.o xmalloc.o assert.o
771 +mkchartable: mkchartable.lo xstrlcpy.lo xstrlcat.lo xmalloc.lo assert.lo
772 + $(LIBTOOL) --mode=link --tag=CC $(CC) $(LDFLAGS) -o mkchartable mkchartable.lo xstrlcpy.lo xstrlcat.lo xmalloc.lo assert.lo
775 - rm -f *.o *.a chartable.c Makefile.bak mkchartable makedepend.log \
776 + rm -rf .libs *.o *.lo *.a *.la chartable.c Makefile.bak mkchartable makedepend.log \
780 --- cyrus-imapd-2.3.12p2.shared/master/Makefile.in 2008-09-23 21:44:50.599845178 +0300
781 +++ cyrus-imapd-2.3.12p2/master/Makefile.in 2008-09-23 22:12:15.234944271 +0300
787 +top_builddir = @top_builddir@
789 CYRUS_USER=@cyrus_user@
790 CYRUS_GROUP=@cyrus_group@
794 LDFLAGS = @LDFLAGS@ @COM_ERR_LDFLAGS@
795 -LIBS = ../lib/libcyrus_min.a @LIB_UCDSNMP@ @LIBS@ @COM_ERR_LIBS@
796 +LIBS = ../lib/libcyrus_min.la @LIB_UCDSNMP@ @LIBS@ @COM_ERR_LIBS@
799 MAKEDEPEND = @MAKEDEPEND@
801 cyrus_prefix = @cyrus_prefix@
802 service_path = @service_path@
804 -LOBJS=service.o service-thread.o
805 +LOBJS=service.lo service-thread.lo
810 $(srcdir)/../install-sh -d ${DESTDIR}$(service_path)
811 for file in $(PROGS); \
813 - $(INSTALL) -m 755 $$file $(DESTDIR)$(service_path) || exit 1; \
814 + $(LIBTOOL) --mode=install $(INSTALL) $$file $(DESTDIR)$(service_path) || exit 1; \
818 - $(CC) -c $(CPPFLAGS) $(DEFS) $(CFLAGS) \
820 + $(LIBTOOL) --mode=compile --tag=CC $(CC) -c $(CPPFLAGS) $(DEFS) $(CFLAGS) \
823 -master: master.o masterconf.o cyrusMasterMIB.o ../lib/lock_@WITH_LOCK@.o
824 - $(CC) $(LDFLAGS) -o master master.o masterconf.o cyrusMasterMIB.o ../lib/lock_@WITH_LOCK@.o $(LIBS) $(DEPLIBS)
825 +master: master.lo masterconf.lo cyrusMasterMIB.lo ../lib/lock_@WITH_LOCK@.lo
826 + $(LIBTOOL) --mode=link --tag=CC $(CC) $(LDFLAGS) -o master master.lo masterconf.lo cyrusMasterMIB.lo ../lib/lock_@WITH_LOCK@.lo $(LIBS) $(DEPLIBS)
829 - rm -f *.o *.a Makefile.bak $(PROGS)
830 + rm -rf .libs *.lo *.a *.la Makefile.bak $(PROGS)
834 --- cyrus-imapd-2.3.12p2.shared/netnews/Makefile.in 2008-09-23 21:44:50.587844484 +0300
835 +++ cyrus-imapd-2.3.12p2/netnews/Makefile.in 2008-09-23 22:09:19.744800216 +0300
841 +top_builddir = @top_builddir@
844 CPPFLAGS = -I.. -I$(srcdir) -I$(srcdir)/../lib -I$(srcdir)/../com_err/et @CPPFLAGS@
845 LIBS = @IMAP_LIBS@ @LIB_RT@
846 -DEPLIBS = ../lib/libcyrus.a ../lib/libcyrus_min.a @DEPLIBS@
847 +DEPLIBS = ../lib/libcyrus.la ../lib/libcyrus_min.la @DEPLIBS@
852 cyrus_prefix = @cyrus_prefix@
853 service_path = @service_path@
855 -OBJS = remotepurge.o readconfig.o
856 +OBJS = remotepurge.lo readconfig.lo
861 - $(INSTALL) -s -m 755 remotepurge $(DESTDIR)$(service_path)
862 + $(LIBTOOL) --mode=install $(INSTALL) remotepurge $(DESTDIR)$(service_path)
865 - $(CC) -c $(CPPFLAGS) $(DEFS) $(CFLAGS) $<
867 + $(LIBTOOL) --mode=compile --tag=CC $(CC) -c $(CPPFLAGS) $(DEFS) $(CFLAGS) $<
869 remotepurge: $(OBJS) $(DEPLIBS)
870 - $(CC) $(LDFLAGS) -o remotepurge $(OBJS) \
871 + $(LIBTOOL) --mode=link --tag=CC $(CC) $(LDFLAGS) -o remotepurge $(OBJS) \
876 - rm -f *.o Makefile.bak remotepurge makedepend.log
877 + rm -rf .libs *.o *.lo Makefile.bak remotepurge makedepend.log
881 --- cyrus-imapd-2.3.12p2/notifyd/Makefile.in 2008-09-23 21:50:36.163828302 +0300
882 +++ cyrus-imapd-2.3.12p2/notifyd/Makefile.in 2008-09-23 22:45:04.180745070 +0300
888 +top_builddir = @top_builddir@
891 CYRUS_USER=@cyrus_user@
894 NOTIFYD_LIBS = @NOTIFYD_LIBS@
896 -SERVICE=../master/service.o
897 +SERVICE=../master/service.lo
899 IMAP_LIBS = @IMAP_LIBS@ @LIB_RT@
900 IMAP_COM_ERR_LIBS = @IMAP_COM_ERR_LIBS@
901 LIB_WRAP = @LIB_WRAP@
902 LIBS = @ZEPHYR_LIBS@ @LIBS@ $(IMAP_COM_ERR_LIBS)
903 -DEPLIBS=../imap/mutex_fake.o ../imap/libimap.a ../lib/libcyrus.a ../lib/libcyrus_min.a @DEPLIBS@
904 +DEPLIBS=../imap/mutex_fake.lo ../imap/libimap.la ../lib/libcyrus.la ../lib/libcyrus_min.la @DEPLIBS@
906 PURIFY=/usr/local/bin/purify
910 $(INSTALL) -m 755 notifyd $(DESTDIR)$(service_path)
912 -OBJS= notifyd.o notify_null.o notify_log.o notify_mailto.o notify_zephyr.o
913 +OBJS= notifyd.lo notify_null.lo notify_log.lo notify_mailto.lo notify_zephyr.lo
915 -notifytest: notifytest.o
916 - $(CC) $(LDFLAGS) -o notifytest \
917 - notifytest.o $(DEPLIBS) $(IMAP_LIBS) $(LIBS) $(LIB_WRAP)
918 +notifytest: notifytest.lo
919 + $(LIBTOOL) --mode=compile --tag=CC $(CC) $(LDFLAGS) -o notifytest \
920 + notifytest.lo $(DEPLIBS) $(IMAP_LIBS) $(LIBS) $(LIB_WRAP)
922 notifyd: $(OBJS) $(SERVICE)
923 - $(CC) $(LDFLAGS) -o notifyd \
924 + $(LIBTOOL) --mode=compile --tag=CC $(CC) $(LDFLAGS) -o notifyd \
925 $(SERVICE) $(OBJS) $(DEPLIBS) $(IMAP_LIBS) $(LIBS) $(LIB_WRAP)
927 notifyd.pure: $(OBJS) $(SERVICE)
928 $(PURIFY) $(PUREOPT) \
929 - $(CC) $(LDFLAGS) -o notifyd.pure \
930 + $(LIBTOOL) --mode=compile --tag=CC $(CC) $(LDFLAGS) -o notifyd.pure \
931 $(SERVICE) $(OBJS) $(DEPLIBS) $(IMAP_LIBS) $(LIBS) $(LIB_WRAP)
934 - rm -f notifyd notifytest *.o *.a *~ Makefile.bak makedepend.log
935 + rm -rf notifyd notifytest .libs *.o *.lo *.a *.la *~ Makefile.bak makedepend.log
941 ${MAKEDEPEND} $(CPPFLAGS) $(DEFS) -I$(srcdir) $(CFLAGS) *.c $(srcdir)/*.c 1>makedepend.log 2>&1
944 - $(CC) -c $(CPPFLAGS) $(DEFS) $(CFLAGS) \
946 + $(LIBTOOL) --mode=compile --tag=CC $(CC) -c $(CPPFLAGS) $(DEFS) $(CFLAGS) \
949 # DO NOT DELETE THIS LINE -- make depend depends on it.
950 --- cyrus-imapd-2.3.12p2/perl/imap/IMAP.xs 2008-04-04 15:47:09.000000000 +0300
951 +++ cyrus-imapd-2.3.12p2.shared/perl/imap/IMAP.xs 2008-09-23 21:44:50.595844947 +0300
956 +const int config_need_data = 0;
959 * Decrement the refcounts of the Perl SV's in the passed rock, then free the
960 --- cyrus-imapd-2.3.12p2/perl/imap/Makefile.PL 2007-10-17 23:06:33.000000000 +0300
961 +++ cyrus-imapd-2.3.12p2.shared/perl/imap/Makefile.PL 2008-09-23 21:44:50.595844947 +0300
963 'macro' => {'IMCLIENT_LIBS' => ''}, # hack
964 'clean' => {'FILES' => 'libcyrperl.a cyradm'},
965 'OBJECT' => 'IMAP.o',
966 - 'MYEXTLIB' => '../../lib/libcyrus.a ../../lib/libcyrus_min.a',
967 - 'LIBS' => ["$BDB_LIB $SASL_LIB $OPENSSL_LIB $LIB_RT -lssl -lcrypto"],
968 + 'LIBS' => ["$BDB_LIB $SASL_LIB $OPENSSL_LIB $LIB_RT -lssl -lcrypto -L../../lib/.libs -lcyrus -lcyrus_min"],
969 'DEFINE' => '-DPERL_POLLUTE', # e.g., '-DHAVE_SOMETHING'
970 'INC' => "-I../../lib -I../.. -I../../com_err/et $SASL_INC $OPENSSL_INC",
971 'EXE_FILES' => [cyradm],
972 --- cyrus-imapd-2.3.12p2.shared/perl/sieve/lib/Makefile.in 2008-09-23 21:44:50.595844947 +0300
973 +++ cyrus-imapd-2.3.12p2/perl/sieve/lib/Makefile.in 2008-09-23 22:08:41.078564354 +0300
979 +top_builddir = @top_builddir@
981 DEFS = @DEFS@ @LOCALDEFS@ -Dbool=char -DHAS_BOOL
982 CPPFLAGS = -I. -I../../.. -I$(srcdir) -I$(srcdir)/../../../lib @CPPFLAGS@ @DYNSASLFLAGS@ @COM_ERR_CPPFLAGS@
983 -LIBS = ../../../lib/libcyrus.a ../../../lib/libcyrus_min.a @LIB_DYN_SASL@ @LIBS@
984 +LIBS = ../../../lib/libcyrus.la ../../../lib/libcyrus_min.la @LIB_DYN_SASL@ @LIBS@
985 IMAP_LIBS = @IMAP_LIBS@
986 -DEPLIBS = ../../../lib/libcyrus.a ../../../lib/libcyrus_min.a @DEPLIBS@
987 +DEPLIBS = ../../../lib/libcyrus.la ../../../lib/libcyrus_min.la @DEPLIBS@
989 MAKEDEPEND_CFLAGS = @CFLAGS@
990 CFLAGS = @CFLAGS@ @PERL_CCCDLFLAGS@
992 exec_prefix = @exec_prefix@
993 cyrus_prefix = @cyrus_prefix@
995 -OBJS=isieve.o lex.o mystring.o request.o
996 +OBJS=isieve.lo lex.lo mystring.lo request.lo
1004 - $(CC) -c $(CPPFLAGS) $(DEFS) $(CFLAGS) $<
1006 + $(LIBTOOL) --mode=compile --tag=CC $(CC) -c $(CPPFLAGS) $(DEFS) $(CFLAGS) $<
1008 -libisieve.a: $(OBJS)
1010 - ar cr libisieve.a $(OBJS)
1011 - $(RANLIB) libisieve.a
1012 +libisieve.la: $(OBJS)
1013 + $(LIBTOOL) --mode=link --tag=CC $(CC) -o libisievie.la $(OBJS)
1016 - rm -f *.o Makefile.bak makedepend.log libisieve.a
1017 + rm -rf .libs *.o *.lo Makefile.bak makedepend.log libisieve.la
1021 --- cyrus-imapd-2.3.12p2/perl/sieve/managesieve/Makefile.PL 2008-04-04 15:47:23.000000000 +0300
1022 +++ cyrus-imapd-2.3.12p2.shared/perl/sieve/managesieve/Makefile.PL 2008-09-23 21:44:50.591844716 +0300
1024 'NAME' => 'Cyrus::SIEVE::managesieve',
1025 'ABSTRACT' => 'Cyurs Sieve management interface',
1026 'VERSION_FROM' => 'managesieve.pm', # finds $VERSION
1027 - 'MYEXTLIB' => '../lib/isieve.o ../lib/lex.o ../lib/mystring.o ../lib/request.o ../../../lib/libcyrus.a ../../../lib/libcyrus_min.a',
1028 - 'LIBS' => ["$BDB_LIB $SASL_LIB $OPENSSL_LIB $LIB_RT -lssl -lcrypto"],
1029 + 'MYEXTLIB' => '../lib/.libs/isieve.o ../lib/.libs/lex.o ../lib/.libs/mystring.o ../lib/.libs/request.o',
1030 + 'LIBS' => ["$BDB_LIB $SASL_LIB $OPENSSL_LIB $LIB_RT -lssl -lcrypto -L../../../lib/.libs -lcyrus -lcyrus_min"],
1031 'DEFINE' => '-DPERL_POLLUTE', # e.g., '-DHAVE_SOMETHING'
1032 'INC' => "-I../lib/ -I../../../lib/ $SASL_INC $OPENSSL_INC",
1034 --- cyrus-imapd-2.3.12p2/perl/sieve/managesieve/managesieve.xs 2008-04-04 15:47:24.000000000 +0300
1035 +++ cyrus-imapd-2.3.12p2.shared/perl/sieve/managesieve/managesieve.xs 2008-09-23 21:44:50.595844947 +0300
1037 croak("failure: %s", s);
1040 +const int config_need_data = 0;
1043 perlsieve_getpass(conn, context, id, psecret)
1044 --- cyrus-imapd-2.3.12p2/ptclient/Makefile.in 2008-03-24 20:34:22.000000000 +0200
1045 +++ cyrus-imapd-2.3.12p2.shared/ptclient/Makefile.in 2008-09-23 21:44:50.587844484 +0300
1050 +LIBTOOL = @LIBTOOL@
1051 +top_builddir = @top_builddir@
1054 CPPFLAGS = -I.. -I$(srcdir)/../imap -I$(srcdir)/../lib @COM_ERR_CPPFLAGS@ @CPPFLAGS@ @SASLFLAGS@
1056 LIBS = $(IMAP_LIBS) @COM_ERR_LIBS@
1057 LIB_SASL = @LIB_SASL@
1058 LIB_WRAP = @LIB_WRAP@
1059 -DEPLIBS = ../imap/libimap.a ../lib/libcyrus.a ../lib/libcyrus_min.a @DEPLIBS@
1060 -UTIL_LIBS = ../imap/mutex_fake.o ../imap/cli_fatal.o
1061 +DEPLIBS = ../imap/libimap.la ../lib/libcyrus.la ../lib/libcyrus_min.la @DEPLIBS@
1062 +UTIL_LIBS = ../imap/mutex_fake.lo ../imap/cli_fatal.lo
1064 LDAP_LIBS=@LDAP_LIBS@
1065 LDAP_CPPFLAGS=@LDAP_CPPFLAGS@
1070 -SERVICE=../master/service.o
1071 -SERVICETHREAD=../master/service-thread.o
1072 +SERVICE=../master/service.lo
1073 +SERVICETHREAD=../master/service-thread.lo
1078 - $(INSTALL) -m 755 ptloader $(DESTDIR)$(service_path)
1079 - $(INSTALL) -m 755 ptexpire $(DESTDIR)$(service_path)
1080 - $(INSTALL) -m 755 ptdump $(DESTDIR)$(service_path)
1081 + $(LIBTOOL) --mode=install $(INSTALL) ptloader $(DESTDIR)$(service_path)
1082 + $(LIBTOOL) --mode=install $(INSTALL) ptexpire $(DESTDIR)$(service_path)
1083 + $(LIBTOOL) --mode=install $(INSTALL) ptdump $(DESTDIR)$(service_path)
1086 - $(CC) -c $(CPPFLAGS) $(LDAP_CPPFLAGS) $(DEFS) $(CFLAGS) $<
1088 + $(LIBTOOL) --mode=compile --tag=CC $(CC) -c $(CPPFLAGS) $(LDAP_CPPFLAGS) $(DEFS) $(CFLAGS) $<
1090 -ptloader: ptloader.o afskrb.o ldap.o ../imap/mutex_fake.o $(DEPLIBS)
1091 - $(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)
1092 +ptloader: ptloader.lo afskrb.lo ldap.lo ../imap/mutex_fake.lo $(DEPLIBS)
1093 + $(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)
1095 -ptloader.pure: ptloader.o afskrb.o ldap.o ../imap/mutex_fake.o $(DEPLIBS)
1096 - $(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)
1097 +ptloader.pure: ptloader.lo afskrb.lo ldap.lo ../imap/mutex_fake.lo $(DEPLIBS)
1098 + $(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)
1100 -ptexpire: ptexpire.o $(DEPLIBS) $(UTIL_LIBS)
1101 - $(CC) $(LDFLAGS) -o $@ ptexpire.o $(UTIL_LIBS) $(DEPLIBS) $(LIB_SASL) $(LIBS) $(LIB_RT)
1102 +ptexpire: ptexpire.lo $(DEPLIBS) $(UTIL_LIBS)
1103 + $(LIBTOOL) --mode=link --tag=CC $(CC) $(LDFLAGS) -o $@ ptexpire.lo $(UTIL_LIBS) $(DEPLIBS) $(LIB_SASL) $(LIBS) $(LIB_RT)
1105 -ptexpire.pure: ptexpire.o $(DEPLIBS) $(UTIL_LIBS)
1106 - $(PURIFY) $(PUREARGS) $(CC) $(LDFLAGS) -o $@ ptexpire.o $(UTIL_LIBS) $(DEPLIBS) $(LIB_SASL) $(LIBS) $(LIB_WRAP) $(LIB_RT)
1107 +ptexpire.pure: ptexpire.lo $(DEPLIBS) $(UTIL_LIBS)
1108 + $(PURIFY) $(PUREARGS) $(LIBTOOL) --mode=link --tag=CC $(CC) $(LDFLAGS) -o $@ ptexpire.lo $(UTIL_LIBS) $(DEPLIBS) $(LIB_SASL) $(LIBS) $(LIB_WRAP) $(LIB_RT)
1110 -ptdump: ptdump.o $(DEPLIBS) $(UTIL_LIBS)
1111 - $(CC) $(LDFLAGS) -o $@ ptdump.o $(UTIL_LIBS) $(DEPLIBS) $(LIB_SASL) $(LIBS) $(LIB_RT)
1112 +ptdump: ptdump.lo $(DEPLIBS) $(UTIL_LIBS)
1113 + $(LIBTOOL) --mode=link --tag=CC $(CC) $(LDFLAGS) -o $@ ptdump.lo $(UTIL_LIBS) $(DEPLIBS) $(LIB_SASL) $(LIBS) $(LIB_RT)
1115 -ptdump.pure: ptexpire.o $(DEPLIBS) $(UTIL_LIBS)
1116 - $(PURIFY) $(PUREARGS) $(CC) $(LDFLAGS) -o $@ ptdump.o $(UTIL_LIBS) $(DEPLIBS) $(LIB_SASL) $(LIBS) $(LIB_WRAP) $(LIB_RT)
1117 +ptdump.pure: ptexpire.lo $(DEPLIBS) $(UTIL_LIBS)
1118 + $(PURIFY) $(PUREARGS) $(LIBTOOL) --mode=link --tag=CC $(CC) $(LDFLAGS) -o $@ ptdump.lo $(UTIL_LIBS) $(DEPLIBS) $(LIB_SASL) $(LIBS) $(LIB_WRAP) $(LIB_RT)
1120 -ptextract: ptextract.o $(DEPLIBS) $(UTIL_LIBS)
1121 - $(CC) $(LDFLAGS) -o $@ ptextract.o $(UTIL_LIBS) $(DEPLIBS) $(LIBS)
1122 +ptextract: ptextract.lo $(DEPLIBS) $(UTIL_LIBS)
1123 + $(LIBTOOL) --mode=link --tag=CC $(CC) $(LDFLAGS) -o $@ ptextract.lo $(UTIL_LIBS) $(DEPLIBS) $(LIBS)
1126 - rm -f *.o Makefile.bak $(PROGS) makedepend.log
1127 + rm -rf .libs *.o *.lo Makefile.bak $(PROGS) makedepend.log
1131 --- cyrus-imapd-2.3.12p2.shared/sieve/Makefile.in 2008-09-23 21:44:50.587844484 +0300
1132 +++ cyrus-imapd-2.3.12p2/sieve/Makefile.in 2008-09-23 21:57:13.302793477 +0300
1137 +LIBTOOL = @LIBTOOL@
1138 +top_builddir = @top_builddir@
1139 COMPILE_ET = @COMPILE_ET@
1141 DEFS = @DEFS@ @LOCALDEFS@
1143 IMAP_LIBS = @IMAP_LIBS@
1144 IMAP_COM_ERR_LIBS = @IMAP_COM_ERR_LIBS@
1145 IMAP_LIBS = @IMAP_LIBS@ @LIB_RT@
1146 -LIBS = libsieve.a $(IMAP_LIBS) $(IMAP_COM_ERR_LIBS)
1147 -DEPLIBS=../lib/libcyrus.a ../lib/libcyrus_min.a @DEPLIBS@
1148 +LIBS = libsieve.la $(IMAP_LIBS) $(IMAP_COM_ERR_LIBS)
1149 +DEPLIBS=../lib/libcyrus.la ../lib/libcyrus_min.la @DEPLIBS@
1151 BUILT_SOURCES = addr.c addr.h addr-lex.c \
1152 sieve.c sieve.h sieve-lex.c \
1153 sieve_err.h sieve_err.c
1155 -all: libsieve.a sievec sieved
1156 +all: libsieve.la sievec sieved
1158 dist: $(BUILT_SOURCES)
1161 $(srcdir)/../install-sh -d ${DESTDIR}$(service_path)
1162 - $(srcdir)/../install-sh -c -m 755 sievec $(DESTDIR)$(service_path) || exit
1163 + $(LIBTOOL) --mode=install $(srcdir)/../install-sh -c -m 755 sievec $(DESTDIR)$(service_path) || exit
1165 -test: $(DEPLIBS) libsieve.a test.o ../imap/message.o
1166 - $(CC) $(LDFLAGS) -o test test.o ../imap/message.o \
1167 - libsieve.a $(DEPLIBS) $(LIBS)
1169 -OBJS = sieve_err.o \
1170 - sieve.o sieve-lex.o comparator.o interp.o message.o \
1171 - bc_generate.o bc_dump.o bc_emit.o bc_eval.o \
1172 - script.o tree.o addr.o addr-lex.o
1173 +test: $(DEPLIBS) libsieve.la test.lo ../imap/message.lo
1174 + $(LIBTOOL) --mode=link --tag=CC $(CC) $(LDFLAGS) -o test test.lo ../imap/message.lo \
1175 + libsieve.la $(DEPLIBS) $(LIBS)
1177 +OBJS = sieve_err.lo \
1178 + sieve.lo sieve-lex.lo comparator.lo interp.lo message.lo \
1179 + bc_generate.lo bc_dump.lo bc_emit.lo bc_eval.lo \
1180 + script.lo tree.lo addr.lo addr-lex.lo
1182 sieve-lex.c: sieve-lex.l sieve.h
1184 @@ -112,21 +114,19 @@
1186 # This is needed because 'makedepend' leaves it out
1187 #(this is not in newer version, is it still needed?)
1192 -#libsieve.a: sieve.c sieve.h sieve_err.h sieve_err.c $(OBJS)
1193 +#libsieve.la: sieve.c sieve.h sieve_err.h sieve_err.c $(OBJS)
1195 -libsieve.a: $(OBJS)
1197 - ar cr libsieve.a $(OBJS)
1198 - $(RANLIB) libsieve.a
1199 +libsieve.la: $(OBJS)
1200 + $(LIBTOOL) --mode=link --tag=CC $(CC) -o libsieve.la $(OBJS)
1202 -sievec: sievec.o libsieve.a
1203 - $(CC) $(LDFLAGS) -o sievec sievec.o libsieve.a $(DEPLIBS) $(LIBS)
1204 +sievec: sievec.lo libsieve.la
1205 + $(LIBTOOL) --mode=link --tag=CC $(CC) $(LDFLAGS) -o sievec sievec.lo libsieve.la $(DEPLIBS) $(LIBS)
1207 -sieved: sieved.o libsieve.a
1208 - $(CC) $(LDFLAGS) -o sieved sieved.o libsieve.a $(DEPLIBS) $(LIBS)
1209 +sieved: sieved.lo libsieve.la
1210 + $(LIBTOOL) --mode=link --tag=CC $(CC) $(LDFLAGS) -o sieved sieved.lo libsieve.la $(DEPLIBS) $(LIBS)
1213 sieve_interface.h: sieve_err.h
1215 $(COMPILE_ET) $(srcdir)/sieve_err.et
1218 - rm -f sievec sieved test *~ *.o *.a Makefile.bak makedepend.log
1219 + rm -rf sievec sieved test *~ .libs *.o *.lo *.a *.la Makefile.bak makedepend.log
1222 rm -f sieve_err.c sieve_err.h
1225 ${MAKEDEPEND} $(CPPFLAGS) $(DEFS) -I$(srcdir) $(MAKEDEPEND_CFLAGS) *.c *.y $(srcdir)/*.y $(srcdir)/*.c 1>makedepend.log 2>&1
1228 - $(CC) -c $(CPPFLAGS) $(DEFS) $(CFLAGS) \
1230 + $(LIBTOOL) --mode=compile --tag=CC $(CC) -c $(CPPFLAGS) $(DEFS) $(CFLAGS) \
1233 # DO NOT DELETE THIS LINE -- make depend depends on it.
1234 --- cyrus-imapd-2.3.12p2/timsieved/Makefile.in 2008-09-23 21:51:30.334960853 +0300
1235 +++ cyrus-imapd-2.3.12p2/timsieved/Makefile.in 2008-09-23 22:45:44.807093322 +0300
1240 +LIBTOOL = @LIBTOOL@
1241 +top_builddir = @top_builddir@
1244 CYRUS_USER=@cyrus_user@
1247 TIMSIEVED_LIBS = @TIMSIEVED_LIBS@
1249 -SERVICE=../master/service.o
1250 +SERVICE=../master/service.lo
1252 IMAP_LIBS = @IMAP_LIBS@ @LIB_RT@
1253 IMAP_COM_ERR_LIBS = @IMAP_COM_ERR_LIBS@
1254 LIB_WRAP = @LIB_WRAP@
1255 LIBS = $(IMAP_COM_ERR_LIBS)
1256 -DEPLIBS=../sieve/libsieve.a ../imap/mutex_fake.o ../imap/libimap.a ../lib/libcyrus.a ../lib/libcyrus_min.a @DEPLIBS@
1257 +DEPLIBS=../sieve/libsieve.la ../imap/mutex_fake.lo ../imap/libimap.la ../lib/libcyrus.la ../lib/libcyrus_min.la @DEPLIBS@
1259 PURIFY=/usr/local/bin/purify
1260 PUREOPT=-best-effort
1263 $(INSTALL) -m 755 timsieved $(DESTDIR)$(service_path)
1265 -OBJS= actions.o lex.o mystring.o scripttest.o timsieved.o parser.o \
1267 +OBJS= actions.lo lex.lo mystring.lo scripttest.lo timsieved.lo parser.lo \
1270 timsieved: $(OBJS) $(SERVICE)
1271 - $(CC) $(LDFLAGS) -o timsieved \
1272 + $(LIBTOOL) --mode=compile --tag=CC $(CC) $(LDFLAGS) -o timsieved \
1273 $(SERVICE) $(OBJS) $(DEPLIBS) $(IMAP_LIBS) $(LIBS) $(LIB_WRAP)
1275 timsieved.pure: $(OBJS) $(SERVICE)
1276 $(PURIFY) $(PUREOPT) \
1277 - $(CC) $(LDFLAGS) -o timsieved.pure \
1278 + $(LIBTOOL) --mode=compile --tag=CC $(CC) $(LDFLAGS) -o timsieved.pure \
1279 $(SERVICE) $(OBJS) $(DEPLIBS) $(IMAP_LIBS) $(LIBS) $(LIB_WRAP)
1282 - rm -f timsieved *~ *.o *.a Makefile.bak makedepend.log
1283 + rm -rf timsieved *~ .libs *.o *.lo *.a *.la Makefile.bak makedepend.log
1289 ${MAKEDEPEND} $(CPPFLAGS) $(DEFS) -I$(srcdir) $(CFLAGS) *.c $(srcdir)/*.c 1>makedepend.log 2>&1
1292 - $(CC) -c $(CPPFLAGS) $(DEFS) $(CFLAGS) \
1294 + $(LIBTOOL) --mode=compile --tag=CC $(CC) -c $(CPPFLAGS) $(DEFS) $(CFLAGS) \
1297 # DO NOT DELETE THIS LINE -- make depend depends on it.
1298 --- cyrus-imapd-2.3.12p2/makedepend/Makefile.in 2008-09-23 21:53:54.051271496 +0300
1299 +++ cyrus-imapd-2.3.12p2/makedepend/Makefile.in 2008-09-23 21:54:30.469377429 +0300
1304 +top_builddir = @top_builddir@
1310 +LIBTOOL = @LIBTOOL@
1313 CPPFLAGS = -I. -I$(srcdir) @CPPFLAGS@
1319 - $(CC) -c $(CPPFLAGS) $(DEFS) $(CFLAGS) $<
1321 + $(LIBTOOL) --mode=compile --tag=CC $(CC) -c $(CPPFLAGS) $(DEFS) $(CFLAGS) $<
1323 -makedepend: cppsetup.o ifparser.o include.o main.o parse.o pr.o
1324 - $(CC) $(LDFLAGS) -o makedepend cppsetup.o ifparser.o include.o \
1325 - main.o parse.o pr.o $(DEPLIBS) $(LIBS)
1326 +makedepend: cppsetup.lo ifparser.lo include.lo main.lo parse.lo pr.lo
1327 + $(LIBTOOL) --mode=link --tag=CC $(CC) $(LDFLAGS) -o makedepend cppsetup.lo ifparser.lo include.lo \
1328 + main.lo parse.lo pr.lo $(DEPLIBS) $(LIBS)
1331 - rm -f *.o Makefile.bak makedepend
1332 + rm -rf .libs *.o *.lo Makefile.bak makedepend
1336 --- cyrus-imapd-2.3.12p2/com_err/et/Makefile.in~ 2008-03-24 20:53:40.000000000 +0200
1337 +++ cyrus-imapd-2.3.12p2/com_err/et/Makefile.in 2008-09-23 22:08:08.228664820 +0300
1342 +top_builddir = @top_builddir@
1348 +LIBTOOL = @LIBTOOL@
1356 -LIBOBJS= error_message.o et_name.o init_et.o com_err.o
1357 +LIBOBJS= error_message.lo et_name.lo init_et.lo com_err.lo
1358 # for et_lex.lex.c include in error_table.y
1359 LOCALINCLUDE=-I. -I.. -I$(srcdir)
1361 -all: compile_et libcom_err.a
1362 +all: compile_et libcom_err.la
1367 - $(CC) -c $(CPPFLAGS) $(DEFS) -I$(srcdir) -I$(srcdir)/../../lib -I. -I../.. $(CFLAGS) $<
1369 + $(LIBTOOL) --mode=compile --tag=CC $(CC) -c $(CPPFLAGS) $(DEFS) -I$(srcdir) -I$(srcdir)/../../lib -I. -I../.. $(CFLAGS) $<
1371 # solaris make loses on com_err.c but not on init_et.c, but this helps
1372 -com_err.o: com_err.c
1373 +com_err.lo: com_err.c
1378 $(CP) $(srcdir)/et_h.awk et_h.awk
1381 - rm -f compile_et compile_et.o error_table.o
1382 - rm -f libcom_err.a
1383 + rm -f compile_et compile_et.o compile_et.lo error_table.o error_table.lo
1384 + rm -rf .libs libcom_err.a libcom_err.la
1388 - rm -f compile_et compile_et.o error_table.o
1389 - rm -f libcom_err.a
1390 + rm -f compile_et compile_et.o compile_et.lo error_table.o error_table.lo
1391 + rm -rf .libs libcom_err.a libcom_err.la
1395 @@ -119,21 +121,15 @@
1397 ## install_library_target(com_err,$(LIBOBJS),$(LINTFILES),)
1399 -libcom_err.a: $(LIBOBJS)
1400 - rm -f libcom_err.a
1401 - $(ARCHIVE) $@ $(LIBOBJS)
1403 +libcom_err.la: $(LIBOBJS)
1404 + $(LIBTOOL) --mode=link --tag=CC $(CC) -o libcom_err.la $(LIBOBJS)
1407 -# $(INSTALLLIB) libcom_err.a $(DESTDIR)$(LIBDIR)/libcom_err.a
1408 -# $(CHMOD) 644 $(DESTDIR)$(LIBDIR)/libcom_err.a
1409 -# $(RANLIB) $(DESTDIR)$(LIBDIR)/libcom_err.a
1410 -# $(CHMOD) 444 $(DESTDIR)$(LIBDIR)/libcom_err.a
1411 +# $(LIBTOOL) --mode=install $(INSTALL) -m 644 libcom_err.la $(DESTDIR)$(LIBDIR)
1414 -libcom_err.o: $(LIBOBJS)
1415 - ld -r -s -o libcom_err.o $(LIBOBJS)
1416 - chmod -x libcom_err.o
1417 +libcom_err.lo: $(LIBOBJS)
1418 + $(LIBTOOL) --mode=link --tag=CC ld -r -o libcom_err.lo $(LIBOBJS)
1420 TAGS: et_name.c error_message.c compile_et.c error_table.c \
1422 --- cyrus-imapd-2.3.12p2/syslog/Makefile.in~ 2008-03-24 22:15:59.000000000 +0200
1423 +++ cyrus-imapd-2.3.12p2/syslog/Makefile.in 2008-09-23 22:13:49.520393331 +0300
1428 +top_builddir = @top_builddir@
1435 +LIBTOOL = @LIBTOOL@
1438 CPPFLAGS = @CPPFLAGS@
1441 MAKEDEPEND = @MAKEDEPEND@
1443 -all: libsyslog.a syslogd
1444 +all: libsyslog.la syslogd
1447 @echo "Install syslogd and syslog.conf as appropriate"
1450 - $(CC) -c $(CPPFLAGS) $(DEFS) -I$(srcdir) $(CFLAGS) $<
1452 + $(LIBTOOL) --mode=compile --tag=CC $(CC) -c $(CPPFLAGS) $(DEFS) -I$(srcdir) $(CFLAGS) $<
1454 -libsyslog.a: syslog.o
1455 - ar cr libsyslog.a syslog.o
1456 - $(RANLIB) libsyslog.a
1457 +libsyslog.la: syslog.lo
1458 + $(LIBTOOL) --mode=link --tag=CC $(CC) -o libsyslog.la syslog.lo
1461 - $(CC) $(LDFLAGS) -o syslogd syslogd.o $(LIBS)
1462 +syslogd: syslogd.lo
1463 + $(LIBTOOL) --mode=link --tag=CC $(CC) $(LDFLAGS) -o syslogd syslogd.lo $(LIBS)
1466 - rm -f *.o *.a Makefile.bak
1467 + rm -rf .libs *.o *.lo *.a *.la Makefile.bak
1471 --- cyrus-imapd-2.3.12p2/makedepend/configure.in 2008-09-23 22:16:22.353226136 +0300
1472 +++ cyrus-imapd-2.3.12p2/makedepend/configure.in 2008-09-23 22:20:08.678306577 +0300
1480 AC_CHECK_HEADERS(stdarg.h)